diff options
| author | George Hazan <ghazan@miranda.im> | 2019-06-04 19:41:41 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-06-04 19:42:35 +0300 |
| commit | 4b8a74d9f8b6e9b891c6d81f57e3d92f482d0df9 (patch) | |
| tree | 1c547520cb2994231b2eadb1a50456e453beff58 /plugins/Clist_nicer | |
| parent | 1b084ebf8f809354d9dcc90b90f46aea244896a0 (diff) | |
fixes #1963 (third portion)
Diffstat (limited to 'plugins/Clist_nicer')
| -rw-r--r-- | plugins/Clist_nicer/res/overlay/lunch.ico | bin | 1150 -> 0 bytes | |||
| -rw-r--r-- | plugins/Clist_nicer/res/overlay/phone.ico | bin | 1150 -> 0 bytes | |||
| -rw-r--r-- | plugins/Clist_nicer/res/resource.rc | 4 | ||||
| -rw-r--r-- | plugins/Clist_nicer/src/clui.cpp | 6 | ||||
| -rw-r--r-- | plugins/Clist_nicer/src/resource.h | 2 |
5 files changed, 3 insertions, 9 deletions
diff --git a/plugins/Clist_nicer/res/overlay/lunch.ico b/plugins/Clist_nicer/res/overlay/lunch.ico Binary files differdeleted file mode 100644 index 1a5abaaa0e..0000000000 --- a/plugins/Clist_nicer/res/overlay/lunch.ico +++ /dev/null diff --git a/plugins/Clist_nicer/res/overlay/phone.ico b/plugins/Clist_nicer/res/overlay/phone.ico Binary files differdeleted file mode 100644 index 3aad71f13a..0000000000 --- a/plugins/Clist_nicer/res/overlay/phone.ico +++ /dev/null diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc index 5f1474bf7d..7f4918c797 100644 --- a/plugins/Clist_nicer/res/resource.rc +++ b/plugins/Clist_nicer/res/resource.rc @@ -501,10 +501,6 @@ IDI_OVL_OCCUPIED ICON "overlay/occupied.ico" IDI_OVL_INVISIBLE ICON "overlay/invisible.ico"
-IDI_OVL_ONTHEPHONE ICON "overlay/phone.ico"
-
-IDI_OVL_OUTTOLUNCH ICON "overlay/lunch.ico"
-
IDI_HIDEOFFLINE ICON "online.ico"
IDI_HIDEGROUPS ICON "groups.ico"
diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index 182e2970be..eecf002363 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -227,7 +227,7 @@ static HICON hIconSaved = nullptr; void ClearIcons(int mode) { - for (int i = IDI_OVL_OFFLINE; i <= IDI_OVL_OUTTOLUNCH; i++) { + for (int i = IDI_OVL_OFFLINE; i <= IDI_OVL_INVISIBLE; i++) { if (overlayicons[i - IDI_OVL_OFFLINE] != nullptr) { if (mode) DestroyIcon(overlayicons[i - IDI_OVL_OFFLINE]); @@ -240,7 +240,7 @@ static void CacheClientIcons() { ClearIcons(0); - for (int i = IDI_OVL_OFFLINE; i <= IDI_OVL_OUTTOLUNCH; i++) { + for (int i = IDI_OVL_OFFLINE; i <= IDI_OVL_INVISIBLE; i++) { char szBuffer[128]; mir_snprintf(szBuffer, "cln_ovl_%d", ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE)); overlayicons[i - IDI_OVL_OFFLINE] = IcoLib_GetIcon(szBuffer); @@ -251,7 +251,7 @@ static void InitIcoLib() { g_plugin.registerIcon(LPGEN("Contact list") "/" LPGEN("Default"), myIcons); - for (int i = IDI_OVL_OFFLINE; i <= IDI_OVL_OUTTOLUNCH; i++) { + for (int i = IDI_OVL_OFFLINE; i <= IDI_OVL_INVISIBLE; i++) { char szBuffer[128]; mir_snprintf(szBuffer, "cln_ovl_%d", ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE)); IconItemT icon[] = { { Clist_GetStatusModeDescription(ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE), 0), szBuffer, i } }; diff --git a/plugins/Clist_nicer/src/resource.h b/plugins/Clist_nicer/src/resource.h index 57072d9256..c530f2f768 100644 --- a/plugins/Clist_nicer/src/resource.h +++ b/plugins/Clist_nicer/src/resource.h @@ -260,8 +260,6 @@ #define IDI_OVL_NA 2054
#define IDI_OVL_OCCUPIED 2055
#define IDI_OVL_INVISIBLE 2057
-#define IDI_OVL_ONTHEPHONE 2058
-#define IDI_OVL_OUTTOLUNCH 2059
#define IDI_HIDEOFFLINE 2100
#define IDI_HIDEGROUPS 2101
#define IDI_SOUNDSON 2102
|