summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-11-10 20:29:14 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-11-10 20:29:14 +0000
commitf22d8982b41614d703b0db98264e01ef7049a4a0 (patch)
tree16e3631c5f598cdc6bad60591058f542ad50bac0 /src
parent22377c8be5548d37deee4258b315c2e5f1b42bca (diff)
visible & invisible icons added to miranda's skin
git-svn-id: http://svn.miranda-ng.org/main/trunk@2282 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src')
-rw-r--r--src/modules/extraicons/extraicons.cpp10
-rw-r--r--src/modules/skin/skinicons.cpp4
-rw-r--r--src/modules/visibility/visibility.cpp4
3 files changed, 5 insertions, 13 deletions
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);