aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar universal2015-09-13 06:15:58 +0100
committerGravatar universal2015-09-13 08:21:47 +0100
commit69ca366f6befedeb35eee0b66c33a82a8878d4d2 (patch)
tree09f8fa4d2f379a007d4c411303b7e3c50c15d1f0
parentQuick fix (diff)
downloadKVIrc-69ca366f6befedeb35eee0b66c33a82a8878d4d2.tar.gz
KVIrc-69ca366f6befedeb35eee0b66c33a82a8878d4d2.tar.bz2
KVIrc-69ca366f6befedeb35eee0b66c33a82a8878d4d2.zip
Fix: icon assignments an.... zzzzzzzRonc
Diffstat
-rw-r--r--data/pics/coresmall/kcs_canvas.pngbin1182 -> 1434 bytes
-rw-r--r--data/pics/coresmall/kcs_folder.pngbin608 -> 1450 bytes
-rw-r--r--data/pics/coresmall/kcs_links.pngbin1182 -> 1337 bytes
-rw-r--r--data/pics/coresmall/kcs_list.pngbin1182 -> 1474 bytes
-rw-r--r--data/pics/coresmall/kcs_message.pngbin1182 -> 1630 bytes
-rw-r--r--data/pics/coresmall/kcs_nick.pngbin509 -> 473 bytes
-rw-r--r--data/pics/coresmall/kcs_nicknameproblem.pngbin578 -> 572 bytes
-rw-r--r--data/pics/coresmall/kcs_nickserv.pngbin637 -> 620 bytes
-rw-r--r--data/pics/coresmall/kcs_sayicon.pngbin1182 -> 541 bytes
-rw-r--r--data/pics/coresmall/kcs_spam.pngbin1182 -> 826 bytes
-rw-r--r--data/pics/coresmall/kcs_theme.pngbin1182 -> 588 bytes
-rw-r--r--data/pics/coresmall/kcs_userlist.pngbin1182 -> 1182 bytes
-rw-r--r--data/pics/coresmall/kcs_whoisidle.pngbin1182 -> 876 bytes
-rw-r--r--data/pics/kvi_bigicon_channellist.pngbin1401 -> 2310 bytes
-rw-r--r--data/pics/kvi_bigicon_codetester.pngbin967 -> 2079 bytes
-rw-r--r--data/pics/kvi_bigicon_folder.pngbin1367 -> 1893 bytes
-rw-r--r--data/pics/kvi_bigicon_networklinks.pngbin1299 -> 1628 bytes
-rw-r--r--data/pics/kvi_bigicon_sayicon.pngbin719 -> 0 bytes
-rw-r--r--data/pics/kvi_bigicon_sysmonitor.pngbin0 -> 1581 bytes
-rw-r--r--data/pics/kvi_bigicon_theme.pngbin1309 -> 2041 bytes
-rw-r--r--data/pics/kvi_bigicon_url.pngbin961 -> 1282 bytes
-rw-r--r--src/kvilib/config/kvi_sourcesdate.h4
-rw-r--r--src/kvirc/kernel/KviCoreActions.cpp4
-rw-r--r--src/kvirc/kernel/KviIconManager.cpp4
-rw-r--r--src/kvirc/kernel/KviIconManager.h2
-rw-r--r--src/modules/iograph/libkviiograph.cpp2
-rw-r--r--src/modules/options/OptionsWidget_channel.h2
-rw-r--r--src/modules/options/OptionsWidget_dcc.h6
-rw-r--r--src/modules/options/OptionsWidget_identity.h4
-rw-r--r--src/modules/options/OptionsWidget_irc.h2
-rw-r--r--src/modules/options/OptionsWidget_notify.h2
-rw-r--r--src/modules/options/OptionsWidget_servers.cpp2
-rw-r--r--src/modules/options/OptionsWidget_userList.h2
-rw-r--r--src/modules/options/OptionsWidget_windowList.h4
34 files changed, 20 insertions, 20 deletions
diff --git a/data/pics/coresmall/kcs_canvas.png b/data/pics/coresmall/kcs_canvas.png
index 50a2d725e..030ec8304 100644
--- a/data/pics/coresmall/kcs_canvas.png
+++ b/data/pics/coresmall/kcs_canvas.png
Binary files differ
diff --git a/data/pics/coresmall/kcs_folder.png b/data/pics/coresmall/kcs_folder.png
index 2989e4f42..696561afc 100644
--- a/data/pics/coresmall/kcs_folder.png
+++ b/data/pics/coresmall/kcs_folder.png
Binary files differ
diff --git a/data/pics/coresmall/kcs_links.png b/data/pics/coresmall/kcs_links.png
index 219ccfb02..ea03cdcfa 100644
--- a/data/pics/coresmall/kcs_links.png
+++ b/data/pics/coresmall/kcs_links.png
Binary files differ
diff --git a/data/pics/coresmall/kcs_list.png b/data/pics/coresmall/kcs_list.png
index 2fb1d7054..139a25eee 100644
--- a/data/pics/coresmall/kcs_list.png
+++ b/data/pics/coresmall/kcs_list.png
Binary files differ
diff --git a/data/pics/coresmall/kcs_message.png b/data/pics/coresmall/kcs_message.png
index 580ea36f2..bfc6bb5a0 100644
--- a/data/pics/coresmall/kcs_message.png
+++ b/data/pics/coresmall/kcs_message.png
Binary files differ
diff --git a/data/pics/coresmall/kcs_nick.png b/data/pics/coresmall/kcs_nick.png
index 97d0e556d..a1b21e112 100644
--- a/data/pics/coresmall/kcs_nick.png
+++ b/data/pics/coresmall/kcs_nick.png
Binary files differ
diff --git a/data/pics/coresmall/kcs_nicknameproblem.png b/data/pics/coresmall/kcs_nicknameproblem.png
index cfaa38d7c..a7e352be2 100644
--- a/data/pics/coresmall/kcs_nicknameproblem.png
+++ b/data/pics/coresmall/kcs_nicknameproblem.png
Binary files differ
diff --git a/data/pics/coresmall/kcs_nickserv.png b/data/pics/coresmall/kcs_nickserv.png
index 19045200a..b38f5fee6 100644
--- a/data/pics/coresmall/kcs_nickserv.png
+++ b/data/pics/coresmall/kcs_nickserv.png
Binary files differ
diff --git a/data/pics/coresmall/kcs_sayicon.png b/data/pics/coresmall/kcs_sayicon.png
index d1e6e99bb..ecfdd090f 100644
--- a/data/pics/coresmall/kcs_sayicon.png
+++ b/data/pics/coresmall/kcs_sayicon.png
Binary files differ
diff --git a/data/pics/coresmall/kcs_spam.png b/data/pics/coresmall/kcs_spam.png
index fe457f258..98f308824 100644
--- a/data/pics/coresmall/kcs_spam.png
+++ b/data/pics/coresmall/kcs_spam.png
Binary files differ
diff --git a/data/pics/coresmall/kcs_theme.png b/data/pics/coresmall/kcs_theme.png
index 3d0215ddf..b17fe38c2 100644
--- a/data/pics/coresmall/kcs_theme.png
+++ b/data/pics/coresmall/kcs_theme.png
Binary files differ
diff --git a/data/pics/coresmall/kcs_userlist.png b/data/pics/coresmall/kcs_userlist.png
index 6a33da55d..7dd9282b1 100644
--- a/data/pics/coresmall/kcs_userlist.png
+++ b/data/pics/coresmall/kcs_userlist.png
Binary files differ
diff --git a/data/pics/coresmall/kcs_whoisidle.png b/data/pics/coresmall/kcs_whoisidle.png
index d6d34fb89..fa29055e3 100644
--- a/data/pics/coresmall/kcs_whoisidle.png
+++ b/data/pics/coresmall/kcs_whoisidle.png
Binary files differ
diff --git a/data/pics/kvi_bigicon_channellist.png b/data/pics/kvi_bigicon_channellist.png
index 6709703c2..5e29f7c99 100644
--- a/data/pics/kvi_bigicon_channellist.png
+++ b/data/pics/kvi_bigicon_channellist.png
Binary files differ
diff --git a/data/pics/kvi_bigicon_codetester.png b/data/pics/kvi_bigicon_codetester.png
index cc1dd5ea7..096abd3ce 100644
--- a/data/pics/kvi_bigicon_codetester.png
+++ b/data/pics/kvi_bigicon_codetester.png
Binary files differ
diff --git a/data/pics/kvi_bigicon_folder.png b/data/pics/kvi_bigicon_folder.png
index c9cec7570..f58742497 100644
--- a/data/pics/kvi_bigicon_folder.png
+++ b/data/pics/kvi_bigicon_folder.png
Binary files differ
diff --git a/data/pics/kvi_bigicon_networklinks.png b/data/pics/kvi_bigicon_networklinks.png
index 64573c46b..380bcdab3 100644
--- a/data/pics/kvi_bigicon_networklinks.png
+++ b/data/pics/kvi_bigicon_networklinks.png
Binary files differ
diff --git a/data/pics/kvi_bigicon_sayicon.png b/data/pics/kvi_bigicon_sayicon.png
deleted file mode 100644
index 38d9f92ef..000000000
--- a/data/pics/kvi_bigicon_sayicon.png
+++ /dev/null
Binary files differ
diff --git a/data/pics/kvi_bigicon_sysmonitor.png b/data/pics/kvi_bigicon_sysmonitor.png
new file mode 100644
index 000000000..80712a0ca
--- /dev/null
+++ b/data/pics/kvi_bigicon_sysmonitor.png
Binary files differ
diff --git a/data/pics/kvi_bigicon_theme.png b/data/pics/kvi_bigicon_theme.png
index c15a00296..d3f93b270 100644
--- a/data/pics/kvi_bigicon_theme.png
+++ b/data/pics/kvi_bigicon_theme.png
Binary files differ
diff --git a/data/pics/kvi_bigicon_url.png b/data/pics/kvi_bigicon_url.png
index e7370268b..b0c35b59a 100644
--- a/data/pics/kvi_bigicon_url.png
+++ b/data/pics/kvi_bigicon_url.png
Binary files differ
diff --git a/src/kvilib/config/kvi_sourcesdate.h b/src/kvilib/config/kvi_sourcesdate.h
index 0974d0bff..74f8af138 100644
--- a/src/kvilib/config/kvi_sourcesdate.h
+++ b/src/kvilib/config/kvi_sourcesdate.h
@@ -36,8 +36,8 @@
* \def KVI_SOURCES_DATE Defines the sources date
* \def KVI_SOURCES_DATE_NUMERIC Defines the sources date
*/
-#define KVI_SOURCES_DATE "20150910"
-#define KVI_SOURCES_DATE_NUMERIC 0x20150910
+#define KVI_SOURCES_DATE "20150913"
+#define KVI_SOURCES_DATE_NUMERIC 0x20150913
/**
* \brief This is the date of the sources before that we should force a setup
diff --git a/src/kvirc/kernel/KviCoreActions.cpp b/src/kvirc/kernel/KviCoreActions.cpp
index 16e38be24..62ca9c817 100644
--- a/src/kvirc/kernel/KviCoreActions.cpp
+++ b/src/kvirc/kernel/KviCoreActions.cpp
@@ -381,8 +381,8 @@ void register_core_actions(KviActionManager * m)
__tr2qs("Show I/O &Traffic graph"),
__tr2qs("Shows a graph representing I/O bandwidth traffic"),
KviActionManager::categoryGeneric(),
- "kvi_bigicon_sayicon.png",
- KviIconManager::SayIcon,
+ "kvi_bigicon_sysmonitor.png",
+ KviIconManager::SysMonitor,
0,
QString());
diff --git a/src/kvirc/kernel/KviIconManager.cpp b/src/kvirc/kernel/KviIconManager.cpp
index a38e6c5e7..3b404ae93 100644
--- a/src/kvirc/kernel/KviIconManager.cpp
+++ b/src/kvirc/kernel/KviIconManager.cpp
@@ -349,7 +349,7 @@ static const char * g_szIconNames[KviIconManager::IconCount] =
"mechanunowner", // 263
"afraid", // 264
"tongue2", // 265
- "sayicon", // 266
+ "sysmonitor", // 266
"saycolors", // 267
"finger", // 268
"scriptaction", // 269
@@ -872,7 +872,7 @@ KviIconManager::SmallIcon KviIconManager::iconName(int iIcon)
case 263: return KviIconManager::MeChanUnOwner; break;
case 264: return KviIconManager::Afraid; break;
case 265: return KviIconManager::Tongue2; break;
- case 266: return KviIconManager::SayIcon; break;
+ case 266: return KviIconManager::SysMonitor; break;
case 267: return KviIconManager::SayColors; break;
case 268: return KviIconManager::Finger; break;
case 269: return KviIconManager::ScriptAction; break;
diff --git a/src/kvirc/kernel/KviIconManager.h b/src/kvirc/kernel/KviIconManager.h
index 1a0ed0da6..8b6f45b0b 100644
--- a/src/kvirc/kernel/KviIconManager.h
+++ b/src/kvirc/kernel/KviIconManager.h
@@ -431,7 +431,7 @@ public:
MeChanUnOwner = 263,
Afraid = 264,
Tongue2 = 265,
- SayIcon = 266,
+ SysMonitor = 266,
SayColors = 267,
Finger = 268,
ScriptAction = 269,
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")
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 12:04:20 +0000