From 6a52ba7c0566911d27468e748910bd87f0035c6a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 27 Jan 2013 11:59:50 +0000 Subject: all perversions will "core_main_*" icon names removed git-svn-id: http://svn.miranda-ng.org/main/trunk@3302 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TabSRMM/src/buttonsbar.cpp | 7 +++---- plugins/TabSRMM/src/msgs.cpp | 18 +++++++++--------- 2 files changed, 12 insertions(+), 13 deletions(-) (limited to 'plugins/TabSRMM/src') diff --git a/plugins/TabSRMM/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp index 57e5a10991..8e61a94067 100644 --- a/plugins/TabSRMM/src/buttonsbar.cpp +++ b/plugins/TabSRMM/src/buttonsbar.cpp @@ -1219,14 +1219,13 @@ static int BuildMenuObjectsTree(HWND hToolBarTree) TreeView_DeleteAllItems(hToolBarTree); himgl = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 2, 2); - ImageList_AddIcon(himgl, Skin_GetIcon("core_main_24")); - HIMAGELIST himl = TreeView_GetImageList(hToolBarTree, TVSIL_NORMAL); - ImageList_Destroy(himl); + ImageList_AddIcon(himgl, LoadSkinnedIcon(SKINICON_OTHER_SMALLDOT)); + ImageList_Destroy( TreeView_GetImageList(hToolBarTree, TVSIL_NORMAL)); TreeView_SetImageList(hToolBarTree, himgl, TVSIL_NORMAL); - if ((RButtonsList->realCount + LButtonsList->realCount) == 0) return FALSE; + EnterCriticalSection(&ToolBarCS); qsort(LButtonsList->items, LButtonsList->realCount, sizeof(CustomButtonData *), sstSortButtons); diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp index ff26111ceb..a043188047 100644 --- a/plugins/TabSRMM/src/msgs.cpp +++ b/plugins/TabSRMM/src/msgs.cpp @@ -1106,17 +1106,17 @@ static int TSAPI LoadFromIconLib() } n++; } - PluginConfig.g_buttonBarIcons[0] = Skin_GetIcon("core_main_8"); - PluginConfig.g_buttonBarIcons[1] = Skin_GetIcon("core_main_10"); - PluginConfig.g_buttonBarIconHandles[0] = Skin_GetIconHandle("core_main_10"); - PluginConfig.g_buttonBarIconHandles[1] = Skin_GetIconHandle("core_main_8"); - PluginConfig.g_buttonBarIconHandles[20] = Skin_GetIconHandle("core_main_9"); + PluginConfig.g_buttonBarIcons[0] = LoadSkinnedIcon(SKINICON_OTHER_ADDCONTACT); + PluginConfig.g_buttonBarIcons[1] = LoadSkinnedIcon(SKINICON_OTHER_HISTORY); + PluginConfig.g_buttonBarIconHandles[0] = LoadSkinnedIconHandle(SKINICON_OTHER_HISTORY); + PluginConfig.g_buttonBarIconHandles[1] = LoadSkinnedIconHandle(SKINICON_OTHER_ADDCONTACT); + PluginConfig.g_buttonBarIconHandles[20] = LoadSkinnedIconHandle(SKINICON_OTHER_USERDETAILS); PluginConfig.g_buttonBarIcons[ICON_DEFAULT_TYPING] = - PluginConfig.g_buttonBarIcons[12] = Skin_GetIcon("core_main_23"); - PluginConfig.g_IconChecked = Skin_GetIcon("core_main_19"); - PluginConfig.g_IconUnchecked = Skin_GetIcon("core_main_20"); - PluginConfig.g_IconFolder = Skin_GetIcon("core_main_5"); + PluginConfig.g_buttonBarIcons[12] = LoadSkinnedIcon(SKINICON_OTHER_TYPING); + PluginConfig.g_IconChecked = LoadSkinnedIcon(SKINICON_OTHER_TICK); + PluginConfig.g_IconUnchecked = LoadSkinnedIcon(SKINICON_OTHER_NOTICK); + PluginConfig.g_IconFolder = LoadSkinnedIcon(SKINICON_OTHER_GROUPOPEN); PluginConfig.g_iconOverlayEnabled = Skin_GetIcon("tabSRMM_overlay_enabled"); PluginConfig.g_iconOverlayDisabled = Skin_GetIcon("tabSRMM_overlay_disabled"); -- cgit v1.2.3