summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/AvatarHistory/src/icolib.cpp4
-rw-r--r--plugins/Dbx_mmap_SA/src/commonheaders.h1
-rw-r--r--plugins/Dbx_mmap_SA/src/dialogs.cpp61
-rw-r--r--plugins/TabSRMM/src/buttonsbar.cpp7
-rw-r--r--plugins/TabSRMM/src/msgs.cpp18
5 files changed, 42 insertions, 49 deletions
diff --git a/plugins/AvatarHistory/src/icolib.cpp b/plugins/AvatarHistory/src/icolib.cpp
index 12497d1009..cc971b8d6e 100644
--- a/plugins/AvatarHistory/src/icolib.cpp
+++ b/plugins/AvatarHistory/src/icolib.cpp
@@ -8,13 +8,13 @@ enum IconIndex
static IconItem iconList[] =
{
- { LPGEN("History"), "core_main_10", IDI_AVATARHIST },
+ { LPGEN("History"), "", IDI_AVATARHIST },
{ LPGEN("Avatar Overlay"), "avh_overlay", IDI_AVATAROVERLAY }
};
static HICON LoadIconEx(IconIndex i)
{
- return Skin_GetIcon(iconList[(int)i].szName);
+ return Skin_GetIconByHandle(iconList[(int)i].hIcolib);
}
static void ReleaseIconEx(HICON hIcon)
diff --git a/plugins/Dbx_mmap_SA/src/commonheaders.h b/plugins/Dbx_mmap_SA/src/commonheaders.h
index a322878055..b1e5602a90 100644
--- a/plugins/Dbx_mmap_SA/src/commonheaders.h
+++ b/plugins/Dbx_mmap_SA/src/commonheaders.h
@@ -55,6 +55,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_langpack.h>
#include <m_utils.h>
#include <m_options.h>
+#include <m_skin.h>
//non-official miranda-plugins sdk
#include "m_folders.h"
diff --git a/plugins/Dbx_mmap_SA/src/dialogs.cpp b/plugins/Dbx_mmap_SA/src/dialogs.cpp
index 1d5c4fe4df..90c0fdbbab 100644
--- a/plugins/Dbx_mmap_SA/src/dialogs.cpp
+++ b/plugins/Dbx_mmap_SA/src/dialogs.cpp
@@ -113,54 +113,47 @@ void CDbxMmapSA::InitDialogs()
CreateServiceFunctionObj(MS_DB_CHANGEPASSWORD, ChangePassword, this);
}
-int ImageList_AddIcon_IconLibLoaded(HIMAGELIST hIml, char* name)
-{
- HICON hIcon = Skin_GetIcon(name);
- int res = ImageList_AddIcon(hIml, hIcon);
- return res;
-}
-
INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
HWND hwndList = GetDlgItem(hwndDlg, IDC_MODULES);
CDbxMmapSA *p_Db = (CDbxMmapSA*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
- LVCOLUMN col;
LVITEM item;
int i, iRow, iIndex;
NMLISTVIEW * hdr = (NMLISTVIEW *) lParam;
WORD uid;
- HIMAGELIST hIml;
switch ( msg ) {
case WM_INITDIALOG:
- hIml = ImageList_Create(16, 16, ILC_MASK | (IsWinVerXPPlus()? ILC_COLOR32 : ILC_COLOR16), 2, 0);
TranslateDialogDefault( hwndDlg );
SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);
p_Db = (CDbxMmapSA*)lParam;
-
- ImageList_AddIcon_IconLibLoaded( hIml, "core_main_29" );
- ImageList_AddIcon_IconLibLoaded( hIml, "core_main_30" );
- ListView_SetImageList( hwndList, hIml, LVSIL_SMALL );
-
- col.pszText = NULL;
- col.mask = LVCF_TEXT | LVCF_WIDTH;
- col.fmt = LVCFMT_LEFT;
- col.cx = 50;
- ListView_InsertColumn(hwndList, 1, &col);
-
- col.pszText = TranslateT("Dll");
- col.mask = LVCF_TEXT | LVCF_WIDTH;
- col.fmt = LVCFMT_LEFT;
- col.cx = 1000;
- ListView_InsertColumn(hwndList, 2, &col);
-
- col.pszText = TranslateT("Name");
- col.cx = 1000;
- ListView_InsertColumn(hwndList, 3, &col);
-
- col.pszText = TranslateT("Version");
- col.cx = 1000;
- ListView_InsertColumn(hwndList, 4, &col);
+ {
+ HIMAGELIST hIml = ImageList_Create(16, 16, ILC_MASK | (IsWinVerXPPlus()? ILC_COLOR32 : ILC_COLOR16), 2, 0);
+ ImageList_AddIcon(hIml, LoadSkinnedIcon(SKINICON_OTHER_LOADED));
+ ImageList_AddIcon(hIml, LoadSkinnedIcon(SKINICON_OTHER_NOTLOADED));
+ ListView_SetImageList( hwndList, hIml, LVSIL_SMALL );
+
+ LVCOLUMN col;
+ col.pszText = NULL;
+ col.mask = LVCF_TEXT | LVCF_WIDTH;
+ col.fmt = LVCFMT_LEFT;
+ col.cx = 50;
+ ListView_InsertColumn(hwndList, 1, &col);
+
+ col.pszText = TranslateT("Dll");
+ col.mask = LVCF_TEXT | LVCF_WIDTH;
+ col.fmt = LVCFMT_LEFT;
+ col.cx = 1000;
+ ListView_InsertColumn(hwndList, 2, &col);
+
+ col.pszText = TranslateT("Name");
+ col.cx = 1000;
+ ListView_InsertColumn(hwndList, 3, &col);
+
+ col.pszText = TranslateT("Version");
+ col.cx = 1000;
+ ListView_InsertColumn(hwndList, 4, &col);
+ }
ListView_SetExtendedListViewStyleEx(hwndList, 0, LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT | LVS_EX_SUBITEMIMAGES);
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");
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-03 23:48:08 +0000