diff options
| -rw-r--r-- | include/m_skin.h | 4 | ||||
| -rw-r--r-- | src/modules/extraicons/extraicons.cpp | 10 | ||||
| -rw-r--r-- | src/modules/skin/skinicons.cpp | 4 | ||||
| -rw-r--r-- | src/modules/visibility/visibility.cpp | 4 |
4 files changed, 8 insertions, 14 deletions
diff --git a/include/m_skin.h b/include/m_skin.h index b881ad73b8..00babc8822 100644 --- a/include/m_skin.h +++ b/include/m_skin.h @@ -81,12 +81,14 @@ __forceinline HICON LoadSkinnedIconBig(int id) {return (HICON)CallService(MS_SKI #define SKINICON_OTHER_STATUS 235 //v0.8.0.12+
#define SKINICON_CHAT_JOIN 236 //v0.8.0.27+
#define SKINICON_CHAT_LEAVE 237 //v0.8.0.27+
-#define SKINICON_OTHER_STATUS_LOCKED 238 //v0.8.0.28+
+#define SKINICON_OTHER_STATUS_LOCKED 238 //v0.8.0.28+
#define SKINICON_OTHER_GROUP 239 //v0.8.0.29+
#define SKINICON_OTHER_ON 240 //v0.9.0.9+
#define SKINICON_OTHER_OFF 241 //v0.9.0.9+
#define SKINICON_OTHER_LOADEDGRAY 242 //v0.10.3.1+
#define SKINICON_OTHER_NOTLOADEDGRAY 243 //v0.10.3.1+
+#define SKINICON_OTHER_VISIBLE_ALL 244 //v0.93.4+
+#define SKINICON_OTHER_INVISIBLE_ALL 245 //v0.93.4+
//menu icons are owned by the module that uses them so are not and should not
//be skinnable. Except exit and show/hide
diff --git a/src/modules/extraicons/extraicons.cpp b/src/modules/extraicons/extraicons.cpp index 5119034c79..4c2db55aa4 100644 --- a/src/modules/extraicons/extraicons.cpp +++ b/src/modules/extraicons/extraicons.cpp @@ -503,16 +503,6 @@ void LoadExtraIconsModule() sid.ptszDefaultFile = tszFile;
sid.pszSection = "Contact List";
- sid.pszName = "AlwaysVis";
- sid.pszDescription = LPGEN("Always Visible");
- sid.iDefaultIndex = -IDI_ALWAYSVIS;
- Skin_AddIcon(&sid);
-
- sid.pszName = "NeverVis";
- sid.pszDescription = LPGEN("Never Visible");
- sid.iDefaultIndex = -IDI_NEVERVIS;
- Skin_AddIcon(&sid);
-
sid.pszName = "ChatActivity";
sid.pszDescription = LPGEN("Chat Activity");
sid.iDefaultIndex = -IDI_CHAT;
diff --git a/src/modules/skin/skinicons.cpp b/src/modules/skin/skinicons.cpp index 2cbef87a94..b948151dac 100644 --- a/src/modules/skin/skinicons.cpp +++ b/src/modules/skin/skinicons.cpp @@ -79,7 +79,9 @@ static const struct StandardIconDescription mainIcons[] = { SKINICON_OTHER_ON, LPGEN("On"), -IDI_ON },
{ SKINICON_OTHER_OFF, LPGEN("Off"), -IDI_OFF },
{ SKINICON_OTHER_LOADEDGRAY, LPGEN("Running core plugin"), -IDI_LOADED_GRAY },
- { SKINICON_OTHER_NOTLOADEDGRAY, LPGEN("Non-loadable plugin"), -IDI_NOTLOADED_GRAY },
+ { SKINICON_OTHER_NOTLOADEDGRAY, LPGEN("Non-loadable plugin"), -IDI_NOTLOADED_GRAY },
+ { SKINICON_OTHER_VISIBLE_ALL, LPGEN("Always visible"), -IDI_ALWAYSVIS, 0, "Contact List" },
+ { SKINICON_OTHER_INVISIBLE_ALL, LPGEN("Always invisible"), -IDI_NEVERVIS, 0, "Contact List" },
{ SKINICON_OTHER_STATUS_LOCKED, LPGEN("Locked status"), -IDI_STATUS_LOCKED, 0, "Status Icons" },
};
diff --git a/src/modules/visibility/visibility.cpp b/src/modules/visibility/visibility.cpp index 10a89ce628..dbf547ae69 100644 --- a/src/modules/visibility/visibility.cpp +++ b/src/modules/visibility/visibility.cpp @@ -146,8 +146,8 @@ static INT_PTR CALLBACK DlgProcVisibilityOpts(HWND hwndDlg, UINT msg, WPARAM, LP hIml = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), (IsWinVerXPPlus()?ILC_COLOR32:ILC_COLOR16)|ILC_MASK, 3, 3);
ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_SMALLDOT);
- ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_STATUS_INVISIBLE);
- ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_STATUS_OFFLINE);
+ ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_VISIBLE_ALL);
+ ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_INVISIBLE_ALL);
SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_SETEXTRAIMAGELIST, 0, (LPARAM)hIml);
hVisibleIcon = ImageList_GetIcon(hIml, 1, ILD_NORMAL);
SendDlgItemMessage(hwndDlg, IDC_VISIBLEICON, STM_SETICON, (WPARAM)hVisibleIcon, 0);
|