diff options
| author |  uNiversaI | 2015-09-18 01:48:45 +0100 |
|---|---|---|
| committer | uNiversaI | 2015-09-18 01:48:45 +0100 |
| commit | 50798aefe179ed6da830bcdfc98a7b4355bf2182 (patch) | |
| tree | c89732515e033c4ed663087ba2e4b0cc2e1795ac /src | |
| parent | Merge pull request #1606 from uNiversaI/Cizzle-and-Burn (diff) | |
| parent | Rename icon and redefine (diff) | |
| download | KVIrc-50798aefe179ed6da830bcdfc98a7b4355bf2182.tar.gz KVIrc-50798aefe179ed6da830bcdfc98a7b4355bf2182.tar.bz2 KVIrc-50798aefe179ed6da830bcdfc98a7b4355bf2182.zip | |
Merge pull request #1608 from uNiversaI/Cizzle-and-Burn
fix texticons (for new emotes) and popups and redefine icon name and usage.
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/kernel/KviIconManager.cpp | 4 | ||||
| -rw-r--r-- | src/kvirc/kernel/KviIconManager.h | 2 | ||||
| -rw-r--r-- | src/kvirc/kernel/KviTextIconManager.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/kvirc/kernel/KviIconManager.cpp b/src/kvirc/kernel/KviIconManager.cpp index 2e0be7081..8b541e9be 100644 --- a/src/kvirc/kernel/KviIconManager.cpp +++ b/src/kvirc/kernel/KviIconManager.cpp @@ -261,7 +261,7 @@ static const char * g_szIconNames[KviIconManager::IconCount] = "halfdeop", // 175 "invite", // 176 "multimedia", // 177 - "look", // 178 + "user", // 178 "input", // 179 "messages", // 180 "querytrace", // 181 @@ -789,7 +789,7 @@ KviIconManager::SmallIcon KviIconManager::iconName(int iIcon) case 175: return KviIconManager::HalfDeOp; break; case 176: return KviIconManager::Invite; break; case 177: return KviIconManager::MultiMedia; break; - case 178: return KviIconManager::Look; break; + case 178: return KviIconManager::User; break; case 179: return KviIconManager::Input; break; case 180: return KviIconManager::Messages; break; case 181: return KviIconManager::QueryTrace; break; diff --git a/src/kvirc/kernel/KviIconManager.h b/src/kvirc/kernel/KviIconManager.h index 1bf7a047b..ed13fe8bf 100644 --- a/src/kvirc/kernel/KviIconManager.h +++ b/src/kvirc/kernel/KviIconManager.h @@ -343,7 +343,7 @@ public: HalfDeOp = 175, Invite = 176, MultiMedia = 177, - Look = 178, + User = 178, Input = 179, Messages = 180, QueryTrace = 181, diff --git a/src/kvirc/kernel/KviTextIconManager.h b/src/kvirc/kernel/KviTextIconManager.h index 994ee7559..16f5bb533 100644 --- a/src/kvirc/kernel/KviTextIconManager.h +++ b/src/kvirc/kernel/KviTextIconManager.h @@ -40,7 +40,7 @@ #include <QPixmap> -#define TEXTICONMANAGER_CURRENT_CONFIG_UPDATE 6 +#define TEXTICONMANAGER_CURRENT_CONFIG_UPDATE 7 /** * \typedef KviTextIconAssocEntry |