diff options
| author | Dmitry Kuzkin <bio@ktaspb.ru> | 2015-06-18 12:36:07 +0000 |
|---|---|---|
| committer | Dmitry Kuzkin <bio@ktaspb.ru> | 2015-06-18 12:36:07 +0000 |
| commit | 1bb9a86b26d3a9964844d42fa25690ce0a028258 (patch) | |
| tree | 6c0645ade07ec6b4d36e38a1ba77e457e8cf6ade /plugins/DbEditorPP/src/icons.cpp | |
| parent | a27ae3e0c1f1f17596db3abeae16ec3fc4b4ba80 (diff) | |
true unicode build (ansi build is possible but useless)
new search/replace dialog
edit improvements (type check)
resident settings support (fully resident modules are still invisible)
remove obsolete things
code cleanup
git-svn-id: http://svn.miranda-ng.org/main/trunk@14243 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/DbEditorPP/src/icons.cpp')
| -rw-r--r-- | plugins/DbEditorPP/src/icons.cpp | 128 |
1 files changed, 72 insertions, 56 deletions
diff --git a/plugins/DbEditorPP/src/icons.cpp b/plugins/DbEditorPP/src/icons.cpp index 48d0f079fa..9492738125 100644 --- a/plugins/DbEditorPP/src/icons.cpp +++ b/plugins/DbEditorPP/src/icons.cpp @@ -1,27 +1,54 @@ #include "headers.h"
-HIMAGELIST himl;
+
+int dbeIcons[] = {
+ ICO_EMPTY,
+ ICO_BINARY,
+ ICO_BYTE,
+ ICO_WORD,
+ ICO_DWORD,
+ ICO_STRING,
+ ICO_UNICODE,
+ ICO_HANDLE,
+ ICO_SETTINGS,
+ ICO_CLOSED,
+ ICO_OPENED,
+ ICO_CONTACTS,
+ ICO_ONLINE,
+ ICO_OFFLINE
+};
+
IconItem iconList[] = {
- { LPGENT("Main icon"), "DBE++_0", ICO_DBE_BUTT },
- { LPGENT("Closed known module"), "DBE++_1", ICO_KNOWN },
- { LPGENT("Open known module"), "DBE++_2", ICO_KNOWNOPEN },
- { LPGENT("Settings"), "DBE++_5", ICO_SETTINGS },
- { LPGENT("Contacts group"), "DBE++_6", ICO_CONTACTS },
- { LPGENT("Unknown contact"), "DBE++_7", ICO_OFFLINE },
- { LPGENT("Known contact"), "DBE++_8", ICO_ONLINE },
- { LPGENT("Open user tree"), "DBE++_9", ICO_REGUSER },
-
- { LPGENT("BLOB setting"), "DBE++_BINARY", ICO_BINARY },
- { LPGENT("Byte setting"), "DBE++_BYTE", ICO_BYTE },
- { LPGENT("Word setting"), "DBE++_WORD", ICO_WORD },
- { LPGENT("Dword setting"), "DBE++_DWORD", ICO_DWORD },
- { LPGENT("String setting"), "DBE++_STRING", ICO_STRING },
- { LPGENT("Unicode setting"), "DBE++_UNICODE", ICO_UNICODE },
- { LPGENT("Handle"), "DBE++_HANDLE", ICO_HANDLE }
+ { LPGEN("Main icon"), "DBE++_0", ICO_DBE_BUTT },
+ { LPGEN("Closed module"), "DBE++_1", ICO_CLOSED },
+ { LPGEN("Open module"), "DBE++_2", ICO_OPENED },
+ { LPGEN("Settings"), "DBE++_5", ICO_SETTINGS },
+ { LPGEN("Contacts group"), "DBE++_6", ICO_CONTACTS },
+ { LPGEN("Unknown contact"), "DBE++_7", ICO_OFFLINE },
+ { LPGEN("Known contact"), "DBE++_8", ICO_ONLINE },
+ { LPGEN("Open user tree"), "DBE++_9", ICO_REGUSER },
+ { LPGEN("Empty setting"), "DBE++10", ICO_EMPTY },
+ { LPGEN("BLOB setting"), "DBE++_BINARY", ICO_BINARY },
+ { LPGEN("Byte setting"), "DBE++_BYTE", ICO_BYTE },
+ { LPGEN("Word setting"), "DBE++_WORD", ICO_WORD },
+ { LPGEN("Dword setting"), "DBE++_DWORD", ICO_DWORD },
+ { LPGEN("String setting"), "DBE++_STRING", ICO_STRING },
+ { LPGEN("Unicode setting"), "DBE++_UNICODE", ICO_UNICODE },
+ { LPGEN("Handle"), "DBE++_HANDLE", ICO_HANDLE }
};
-void addIcons(void)
+
+
+HANDLE GetIcoLibHandle(int icon)
+{
+ for (int i = 0; i < SIZEOF(iconList); i++)
+ if (iconList[i].defIconID == icon)
+ return iconList[i].hIcolib;
+ return INVALID_HANDLE_VALUE;
+}
+
+void IcoLibRegister(void)
{
Icon_Register(hInst, modFullname, iconList, SIZEOF(iconList));
}
@@ -35,57 +62,46 @@ HICON LoadSkinnedDBEIcon(int icon) return LoadIcon(hInst, MAKEINTRESOURCE(icon));
}
-int AddIconToList(HIMAGELIST hil, HICON hIcon)
-{
- if (!hIcon || !hil)
- return 0;
-
- ImageList_AddIcon(hil, hIcon);
- return 1;
-}
-
static PROTOACCOUNT **protocols = NULL;
static int protoCount = 0;
-static int shift = 0;
-void AddProtoIconsToList(HIMAGELIST hil, int newshift)
+HIMAGELIST LoadIcons()
{
- shift = newshift;
+ HICON hIcon;
+ HIMAGELIST hil = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, SIZEOF(dbeIcons), 5);
+
+ if (!hil) return NULL;
+
+ for(int i = 0; i < SIZEOF(dbeIcons); i++)
+ ImageList_AddIcon(hil, LoadSkinnedDBEIcon(dbeIcons[i]));
ProtoEnumAccounts(&protoCount, &protocols);
for (int i = 0; i < protoCount; i++) {
- HICON hIcon;
+ if (!Proto_IsProtocolLoaded(protocols[i]->szModuleName))
+ ImageList_AddIcon(hil, LoadSkinnedDBEIcon(ICO_OFFLINE));
+ else
if (hIcon = Skin_LoadProtoIcon(protocols[i]->szModuleName, ID_STATUS_ONLINE))
- AddIconToList(hil, hIcon);
+ ImageList_AddIcon(hil, hIcon);
else
- AddIconToList(himl, LoadSkinnedDBEIcon(ICO_ONLINE));
- }
-}
-
-int GetProtoIcon(char *szProto)
-{
- if (!protoCount || !protocols || !szProto)
- return DEF_ICON;
-
- int n = 0;
-
- for (int i = 0; i < protoCount; i++) {
- if (!mir_strcmp(protocols[i]->szModuleName, szProto))
- return n + shift;
-
- n++;
+ ImageList_AddIcon(hil, LoadSkinnedDBEIcon(ICO_ONLINE));
}
- return DEF_ICON;
+ return hil;
}
-BOOL IsProtocolLoaded(char *pszProtocolName)
-{
- if (protoCount)
- for (int i = 0; i < protoCount; i++)
- if (!mir_strcmp(protocols[i]->szModuleName, pszProtocolName))
- return TRUE;
- return FALSE;
+int GetProtoIconIndex(const char *szProto)
+{
+ if (szProto && szProto[0]) {
+ if (protoCount && protocols) {
+ for (int i = 0; i < protoCount; i++) {
+ if (!mir_strcmp(protocols[i]->szModuleName, szProto))
+ return i + SIZEOF(dbeIcons);
+ }
+ if (Proto_IsProtocolLoaded(szProto))
+ return SIZEOF(dbeIcons) - 2; // ICO_ONLINE;
+ }
+ }
+ return SIZEOF(dbeIcons) - 1; // ICO_OFFLINE;
}
|