diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-05-27 14:57:44 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-05-27 14:57:44 +0000 |
| commit | 09cace2f7d8fdbfb047eba9a6396d79d59422443 (patch) | |
| tree | cca8e0062d7403b9c6a7a87849a50a4ccd89ff9a /plugins/Scriver/src/globals.cpp | |
| parent | d4feadd097aff1815404597953c3c59527b96598 (diff) | |
massive ansi cleaning for Scriver
git-svn-id: http://svn.miranda-ng.org/main/trunk@13860 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Scriver/src/globals.cpp')
| -rw-r--r-- | plugins/Scriver/src/globals.cpp | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp index aa3d58ea1f..8a35da30a5 100644 --- a/plugins/Scriver/src/globals.cpp +++ b/plugins/Scriver/src/globals.cpp @@ -45,16 +45,14 @@ static IconItem iconList[] = { LPGEN("Send message"), "scriver_SEND", IDI_SEND }, // 4
{ LPGEN("Smiley button"), "scriver_SMILEY", IDI_SMILEY }, // 5
{ LPGEN("User is typing"), "scriver_TYPING", IDI_TYPING }, // 6
- { LPGEN("Typing notification off"), "scriver_TYPINGOFF", IDI_TYPINGOFF }, // 7
- { LPGEN("Unicode is on"), "scriver_UNICODEON", IDI_UNICODEON }, // 8
- { LPGEN("Unicode is off"), "scriver_UNICODEOFF", IDI_UNICODEOFF }, // 9
- { LPGEN("Sending"), "scriver_DELIVERING", IDI_TIMESTAMP }, // 10
- { LPGEN("Quote button"), "scriver_QUOTE", IDI_QUOTE }, // 11
- { LPGEN("Close button"), "scriver_CLOSEX", IDI_CLOSEX }, // 12
- { LPGEN("Icon overlay"), "scriver_OVERLAY", IDI_OVERLAY }, // 13
- { LPGEN("Incoming message (10x10)"),"scriver_INCOMING", IDI_INCOMING, 10}, // 14
- { LPGEN("Outgoing message (10x10)"),"scriver_OUTGOING", IDI_OUTGOING, 10}, // 15
- { LPGEN("Notice (10x10)"), "scriver_NOTICE", IDI_NOTICE, 10}, // 16
+ { LPGEN("Typing notification off"), "scriver_TYPINGOFF", IDI_TYPINGOFF }, // 7
+ { LPGEN("Sending"), "scriver_DELIVERING", IDI_TIMESTAMP }, // 8
+ { LPGEN("Quote button"), "scriver_QUOTE", IDI_QUOTE }, // 9
+ { LPGEN("Close button"), "scriver_CLOSEX", IDI_CLOSEX }, // 10
+ { LPGEN("Icon overlay"), "scriver_OVERLAY", IDI_OVERLAY }, // 11
+ { LPGEN("Incoming message (10x10)"),"scriver_INCOMING", IDI_INCOMING, 10}, // 12
+ { LPGEN("Outgoing message (10x10)"),"scriver_OUTGOING", IDI_OUTGOING, 10}, // 13
+ { LPGEN("Notice (10x10)"), "scriver_NOTICE", IDI_NOTICE, 10}, // 14
{ LPGEN("Window Icon"), "chat_window", IDI_CHANMGR }, // 1
{ LPGEN("Text color"), "chat_fgcol", IDI_COLOR }, // 2
@@ -97,9 +95,9 @@ void RegisterIcons(void) {
HookEvent(ME_SKIN2_ICONSCHANGED, IconsChanged);
- Icon_Register(g_hInst, LPGEN("Single Messaging"), iconList, 16);
- Icon_Register(g_hInst, LPGEN("Group chats"), iconList+16, 20);
- Icon_Register(g_hInst, LPGEN("Single Messaging"), iconList+36, 14);
+ Icon_Register(g_hInst, LPGEN("Single Messaging"), iconList, 14);
+ Icon_Register(g_hInst, LPGEN("Group chats"), iconList+14, 20);
+ Icon_Register(g_hInst, LPGEN("Single Messaging"), iconList+34, 14);
}
/////////////////////////////////////////////////////////////////////////////////////////
@@ -302,7 +300,6 @@ void InitGlobals() g_dat.hTabIconList = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 0, 0);
g_dat.hHelperIconList = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 0, 0);
g_dat.hSearchEngineIconList = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 0, 0);
- g_dat.draftList = NULL;
g_dat.logPixelSX = GetDeviceCaps(hdc, LOGPIXELSX);
g_dat.logPixelSY = GetDeviceCaps(hdc, LOGPIXELSY);
LoadInfobarFonts();
@@ -313,8 +310,6 @@ void FreeGlobals() {
if (g_dat.hInfobarBrush != NULL)
DeleteObject(g_dat.hInfobarBrush);
- if (g_dat.draftList != NULL)
- tcmdlist_free(g_dat.draftList);
if (g_dat.hTabIconList)
ImageList_Destroy(g_dat.hTabIconList);
if (g_dat.hButtonIconList)
@@ -325,8 +320,6 @@ void FreeGlobals() ImageList_Destroy(g_dat.hHelperIconList);
if (g_dat.hSearchEngineIconList)
ImageList_Destroy(g_dat.hSearchEngineIconList);
- if (g_dat.hMenuANSIEncoding)
- DestroyMenu(g_dat.hMenuANSIEncoding);
mir_free(g_dat.tabIconListUsage);
WindowList_Destroy(g_dat.hMessageWindowList);
|