From 503d82db45bf24f4739d126d43bfbeee4828a882 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 10 Mar 2013 19:55:33 +0000 Subject: - m_core.inc almost returned back to int_ptr - another pascal headers merged git-svn-id: http://svn.miranda-ng.org/main/trunk@3964 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/delphi/m_addcontact.inc | 2 +- include/delphi/m_api.pas | 4 +- include/delphi/m_clistint.inc | 6 +-- include/delphi/m_core.inc | 66 +++++++++++++++--------------- include/delphi/m_fontservice.inc | 2 +- include/delphi/m_helpers.inc | 24 +++++------ include/delphi/m_langpack.inc | 2 + include/delphi/m_protocols.inc | 2 +- include/delphi/m_protoint.inc | 1 - include/delphi/m_skin.inc | 87 ++++++++++++++++++++-------------------- include/delphi/m_system.inc | 8 ++-- 11 files changed, 105 insertions(+), 99 deletions(-) (limited to 'include/delphi') diff --git a/include/delphi/m_addcontact.inc b/include/delphi/m_addcontact.inc index ce74841d7e..7ec3e6b733 100644 --- a/include/delphi/m_addcontact.inc +++ b/include/delphi/m_addcontact.inc @@ -31,7 +31,7 @@ const type PADDCONTACTSTRUCT = ^TADDCONTACTSTRUCT; TADDCONTACTSTRUCT = record - handleType: Int; + handleType: int; handle : THandle; // HDBEVENT, HCONTACT, SearchResult szProto : PAnsiChar; // used by search result only psr : Pointer; // @PROTOSEARCHRESULT diff --git a/include/delphi/m_api.pas b/include/delphi/m_api.pas index df759fecf9..65b045a843 100644 --- a/include/delphi/m_api.pas +++ b/include/delphi/m_api.pas @@ -180,7 +180,7 @@ const var { has to be returned via MirandaPluginInfo and has to be statically allocated, this means only one module can return info, you shouldn't be merging them anyway! } - PLUGININFO: TPLUGININFOEX; + PluginInfo: TPLUGININFOEX; {$include m_database.inc} {$include m_db_int.inc} @@ -253,7 +253,7 @@ var implementation var - hLangpack : integer = 0; + hLangpack:int = 0; {$undef M_API_UNIT} {$include m_helpers.inc} diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc index e889f79355..c7e8d39a8f 100644 --- a/include/delphi/m_clistint.inc +++ b/include/delphi/m_clistint.inc @@ -109,7 +109,7 @@ type sortFunc : pointer; end; - PClcGroup = ^ClcGroup; + pClcGroup = ^ClcGroup; ClcGroup = record cl : ContactList; expanded : int; @@ -120,7 +120,7 @@ type totalMembers : int; end; - PClcFontInfo = ^ClcFontInfo; + pClcFontInfo = ^ClcFontInfo; ClcFontInfo = record hFont : HFONT; fontHeight : int; @@ -297,7 +297,7 @@ type isHidden:int; end; - PCLCCacheEntry = ^CLCCacheEntry; + PClcCacheEntry = ^CLCCacheEntry; CLCCacheEntry = record end; diff --git a/include/delphi/m_core.inc b/include/delphi/m_core.inc index 3461250d88..fb7d7034ba 100644 --- a/include/delphi/m_core.inc +++ b/include/delphi/m_core.inc @@ -75,9 +75,9 @@ type end; -function db_free(dbv:PDBVARIANT):uint_ptr; stdcall; +function db_free(dbv:PDBVARIANT):int_ptr; stdcall; external CoreDLL name 'db_free'; -function db_unset(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar):uint_ptr; stdcall; +function db_unset(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar):int_ptr; stdcall; external CoreDLL name 'db_unset'; function db_find_first(const szModule:pAnsiChar=nil):THANDLE; stdcall; @@ -91,34 +91,34 @@ function db_get_w(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pA external CoreDLL name 'db_get_w'; function db_get_dw(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:dword):dword; stdcall; external CoreDLL name 'db_get_dw'; -function db_get(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT):uint_ptr; stdcall; +function db_get(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT):int_ptr; stdcall; external CoreDLL name 'db_get'; -function db_get_s(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT; const nType:int):uint_ptr; stdcall; +function db_get_s(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT; const nType:int=DBVT_ASCIIZ):int_ptr; stdcall; external CoreDLL name 'db_get_s'; function db_get_sa(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar):pAnsiChar; stdcall; external CoreDLL name 'db_get_sa'; function db_get_wsa(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar):pWideChar; stdcall; external CoreDLL name 'db_get_wsa'; -function db_set_b(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:byte):uint_ptr; stdcall; +function db_set_b(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:byte):int_ptr; stdcall; external CoreDLL name 'db_set_b'; -function db_set_w(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:word):uint_ptr; stdcall; +function db_set_w(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:word):int_ptr; stdcall; external CoreDLL name 'db_set_w'; -function db_set_dw(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:dword):uint_ptr; stdcall; +function db_set_dw(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:dword):int_ptr; stdcall; external CoreDLL name 'db_set_dw'; -function db_set_s(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):uint_ptr; stdcall; +function db_set_s(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):int_ptr; stdcall; external CoreDLL name 'db_set_s'; -function db_set_ws(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pWideChar):uint_ptr; stdcall; +function db_set_ws(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pWideChar):int_ptr; stdcall; external CoreDLL name 'db_set_ws'; -function db_set_utf(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):uint_ptr; stdcall; +function db_set_utf(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):int_ptr; stdcall; external CoreDLL name 'db_set_utf'; -function db_set_blob(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:pointer; len:uint):uint_ptr; stdcall; +function db_set_blob(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:pointer; len:uint):int_ptr; stdcall; external CoreDLL name 'db_set_blob'; // Aliases -function DBFreeVariant(dbv:PDBVARIANT):uint_ptr; stdcall; +function DBFreeVariant(dbv:PDBVARIANT):int_ptr; stdcall; external CoreDLL name 'db_free'; -function DBDeleteContactSetting(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar):uint_ptr; stdcall; +function DBDeleteContactSetting(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar):int_ptr; stdcall; external CoreDLL name 'db_unset'; function DBGetContactSettingByte(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:int):int; stdcall; @@ -127,28 +127,28 @@ function DBGetContactSettingWord(hContact:THANDLE; const szModule:pAnsiChar; con external CoreDLL name 'db_get_w'; function DBGetContactSettingDWord(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:dword):dword; stdcall; external CoreDLL name 'db_get_dw'; -function DBGetContactSetting(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT):uint_ptr; stdcall; +function DBGetContactSetting(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT):int_ptr; stdcall; external CoreDLL name 'db_get'; -function DBGetContactSettingStr(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT; const nType:int):uint_ptr; stdcall; +function DBGetContactSettingStr(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT; const nType:int=DBVT_ASCIIZ):int_ptr; stdcall; external CoreDLL name 'db_get_s'; function DBGetContactSettingString(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar):pAnsiChar; stdcall; external CoreDLL name 'db_get_sa'; function DBGetContactSettingWString(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar):pWideChar; stdcall; external CoreDLL name 'db_get_wsa'; -function DBWriteContactSettingByte(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:byte):uint_ptr; stdcall; +function DBWriteContactSettingByte(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:byte):int_ptr; stdcall; external CoreDLL name 'db_set_b'; -function DBWriteContactSettingWord(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:word):uint_ptr; stdcall; +function DBWriteContactSettingWord(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:word):int_ptr; stdcall; external CoreDLL name 'db_set_w'; -function DBWriteContactSettingDWord(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:dword):uint_ptr; stdcall; +function DBWriteContactSettingDWord(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:dword):int_ptr; stdcall; external CoreDLL name 'db_set_dw'; -function DBWriteContactSettingString(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):uint_ptr; stdcall; +function DBWriteContactSettingString(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):int_ptr; stdcall; external CoreDLL name 'db_set_s'; -function DBWriteContactSettingWString(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pWideChar):uint_ptr; stdcall; +function DBWriteContactSettingWString(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pWideChar):int_ptr; stdcall; external CoreDLL name 'db_set_ws'; -function DBWriteContactSettingUTF8String(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):uint_ptr; stdcall; +function DBWriteContactSettingUTF8String(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):int_ptr; stdcall; external CoreDLL name 'db_set_utf'; -function DBWriteContactSettingBlob(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:pointer; len:uint):uint_ptr; stdcall; +function DBWriteContactSettingBlob(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:pointer; len:uint):int_ptr; stdcall; external CoreDLL name 'db_set_blob'; @@ -277,7 +277,7 @@ type procedure mir_Icon_Register(hInst:HINST; const szSection:pAnsiChar; pIcons:pIconItem; iCount:size_t; prefix:PAnsiChar; hLangpack:int); stdcall; external CoreDLL name 'Icon_Register'; -procedure mir_Icon_RegisterT(hInst:HINST; const szSection:pWideChar; pIcons:pIconItemW; +procedure mir_Icon_RegisterW(hInst:HINST; const szSection:pWideChar; pIcons:pIconItemW; iCount:size_t; prefix:PAnsiChar; hLangpack:int); stdcall; external CoreDLL name 'Icon_RegisterT'; @@ -435,7 +435,7 @@ procedure CreatePathToFile(wszFilePath:pAnsiChar); stdcall; external CoreDLL name 'CreatePathToFile'; function CreateDirectoryTree(const szDir:pAnsiChar):int; stdcall; external CoreDLL name 'CreateDirectoryTree'; -function PathToAbsolute(const pSrc:pAnsiChar; pOut:pAnsiChar; base:pAnsiChar):int; stdcall; +function PathToAbsolute(const pSrc:pAnsiChar; pOut:pAnsiChar; base:pAnsiChar=nil):int; stdcall; external CoreDLL name 'PathToAbsolute'; function PathToRelative(const pSrc:pAnsiChar; pOut:pAnsiChar):int; stdcall; external CoreDLL name 'PathToRelative'; @@ -444,7 +444,7 @@ procedure CreatePathToFileW(wszFilePath:pWideChar); stdcall; external CoreDLL name 'CreatePathToFileW'; function CreateDirectoryTreeW(const szDir:pWideChar):int; stdcall; external CoreDLL name 'CreateDirectoryTreeW'; -function PathToAbsoluteW(const pSrc:pWideChar; pOut:pWideChar; base:pWideChar):int; stdcall; +function PathToAbsoluteW(const pSrc:pWideChar; pOut:pWideChar; base:pWideChar=nil):int; stdcall; external CoreDLL name 'PathToAbsoluteW'; function PathToRelativeW(const pSrc:pWideChar; pOut:pWideChar):int; stdcall; external CoreDLL name 'PathToRelativeW'; @@ -538,9 +538,9 @@ type pThreadFuncEx = function (ptr:pointer):uint_ptr; stdcall; pThreadFuncOwner = function (owner:pointer;param:pointer):uint_ptr; cdecl; -function Thread_Push(hInst:HINST; Owner:pointer):uint_ptr; stdcall; +function Thread_Push(hInst:HINST; Owner:pointer):int_ptr; stdcall; external CoreDLL name 'Thread_Push'; -function Thread_Pop():uint_ptr; stdcall; +function Thread_Pop():int_ptr; stdcall; external CoreDLL name 'Thread_Pop'; procedure Thread_Wait(); stdcall; external CoreDLL name 'Thread_Wait'; @@ -605,16 +605,18 @@ function mir_utf8checkstring(const astr:PAnsiChar):bool;stdcall; external CoreDLL name 'Utf8CheckString'; /////////////////////////////////////////////////////////////////////////////// +// Window subclassing -procedure mir_subclassWindow(Wnd: HWND; WndProc: TWNDPROC); stdcall; +procedure mir_subclassWindow(Wnd:HWND; WndProc:TWNDPROC); stdcall; external CoreDLL name 'mir_subclassWindow'; - -procedure mir_subclassWindowFull(Wnd: HWND; WndProc, OldWndProc: TWNDPROC); stdcall; +procedure mir_subclassWindowFull(Wnd:HWND; WndProc, OldWndProc:TWNDPROC); stdcall; external CoreDLL name 'mir_subclassWindowFull'; - -function mir_callNextSubclass(Wnd: HWND; WndProc: TWNDPROC; uMsg: uint; wParam: WPARAM; lParam: LPARAM ): LRESULT; stdcall; +function mir_callNextSubclass(Wnd:HWND; WndProc:TWNDPROC; uMsg:uint; wParam:WPARAM; lParam:LPARAM ):LRESULT; stdcall; external CoreDLL name 'mir_callNextSubclass'; +procedure KillModuleSubclassing(hInst: HMODULE); + external CoreDLL name 'KillModuleSubclassing'; + /////////////////////////////////////////////////////////////////////////////// procedure UnloadCoreModule(); stdcall; diff --git a/include/delphi/m_fontservice.inc b/include/delphi/m_fontservice.inc index 4317ecf2b6..81761f0924 100644 --- a/include/delphi/m_fontservice.inc +++ b/include/delphi/m_fontservice.inc @@ -86,7 +86,7 @@ type backgroundName: array [0..63] of AnsiChar; end; TFontID = TFontID_tag; - PFontID = ^TFontID; + pFontID = ^TFontID; PFontIDW_tag = ^TFontIDW_tag; TFontIDW_tag = record diff --git a/include/delphi/m_helpers.inc b/include/delphi/m_helpers.inc index 8ea0da211d..b7dcd80bdd 100644 --- a/include/delphi/m_helpers.inc +++ b/include/delphi/m_helpers.inc @@ -25,9 +25,6 @@ function WindowList_Broadcast(hList: THandle; message: int; wParam: WPARAM; lPar function Utils_SaveWindowPosition(hWnd: THandle; hContact: THandle; const szModule, szNamePrefix: PAnsiChar): int_ptr; function Utils_RestoreWindowPosition(hWnd: THandle; hContact: THandle; Flags: int; const szModule, szNamePrefix: PAnsiChar): int_ptr; -procedure Icon_Register(hInst:HINST; const szSection:pAnsiChar; pIcons:pIconItem; iCount:size_t; prefix:PAnsiChar=nil); -procedure Icon_RegisterT(hInst:HINST; const szSection:pWideChar; pIcons:pIconItemW; iCount:size_t; prefix:PAnsiChar=nil); - function mir_hashstr(const key:pAnsiChar):uint; {inline;} function mir_hashstrW(const key:pWideChar):uint; {inline;} function lrtrim(str:pAnsiChar):pAnsiChar; {inline} @@ -63,7 +60,10 @@ function Menu_AddTrayMenuItem(mi:PCLISTMENUITEM):HGENMENU; function UserInfo_AddPage(wParam:WPARAM; odp:POPTIONSDIALOGPAGE):int_ptr; function Options_AddPage(wParam:WPARAM; odp:POPTIONSDIALOGPAGE):int_ptr; function Hotkey_Register(hk:PHOTKEYDESC):int_ptr; + function Skin_AddIcon(si:PSKINICONDESC):THANDLE; +procedure Icon_Register(hInst:HINST; const szSection:pAnsiChar; pIcons:pIconItem ; iCount:size_t; prefix:PAnsiChar=nil); +procedure Icon_RegisterW(hInst:HINST; const szSection:pWideChar; pIcons:pIconItemW; iCount:size_t; prefix:PAnsiChar=nil); procedure FontRegister(pFontID:pFontID); procedure FontRegisterW(pFontID:pFontIDW); @@ -470,23 +470,23 @@ begin result:=CallService(MS_SKIN2_ADDICON, hLangpack, LPARAM(si)); end; -procedure FontRegister(pFontID:pFontID); +procedure Icon_Register(hInst:HINST; const szSection:pAnsiChar; pIcons:pIconItem; iCount:size_t; prefix:PAnsiChar); begin - CallService(MS_FONT_REGISTERA, WPARAM(pFontID), hLangpack); + mir_Icon_Register(hInst, szSection, pIcons, iCount, prefix, hLangpack); end; -procedure FontRegisterW(pFontID:pFontIDW); + +procedure Icon_RegisterW(hInst:HINST; const szSection:pWideChar; pIcons:pIconItemW; iCount:size_t; prefix:PAnsiChar); begin - CallService(MS_FONT_REGISTERW, WPARAM(pFontID), hLangpack); + mir_Icon_RegisterW(hInst, szSection, pIcons, iCount, prefix, hLangpack); end; -procedure Icon_Register(hInst:HINST; const szSection:pAnsiChar; pIcons:pIconItem; iCount:size_t; prefix:PAnsiChar); +procedure FontRegister(pFontID:pFontID); begin - mir_Icon_Register(hInst, szSection, pIcons, iCount, prefix, hLangpack); + CallService(MS_FONT_REGISTERA, WPARAM(pFontID), hLangpack); end; - -procedure Icon_RegisterT(hInst:HINST; const szSection:pWideChar; pIcons:pIconItemW; iCount:size_t; prefix:PAnsiChar); +procedure FontRegisterW(pFontID:pFontIDW); begin - mir_Icon_RegisterT(hInst, szSection, pIcons, iCount, prefix, hLangpack); + CallService(MS_FONT_REGISTERW, WPARAM(pFontID), hLangpack); end; procedure ColourRegister(pColorID:pColourID); diff --git a/include/delphi/m_langpack.inc b/include/delphi/m_langpack.inc index 82ec483662..4aacf9ecea 100644 --- a/include/delphi/m_langpack.inc +++ b/include/delphi/m_langpack.inc @@ -112,6 +112,8 @@ const } MS_LANGPACK_RELOAD:PAnsiChar = 'LangPack/Reload'; + ME_LANGPACK_CHANGE:PAnsiChar = 'LangPack/Changed'; + { retrieves the hLangpack of a plugin by its HINSTANCE wParam = 0 (ignored) diff --git a/include/delphi/m_protocols.inc b/include/delphi/m_protocols.inc index 210215d866..3f1fea9cc1 100644 --- a/include/delphi/m_protocols.inc +++ b/include/delphi/m_protocols.inc @@ -190,7 +190,7 @@ const const PROTOTYPE_IGNORE = 50; // added during v0.3.3 PROTOTYPE_PROTOCOL = 1000; - PROTOTYPE_VIRTUAL = 1001; // added in 0.93.5 + PROTOTYPE_VIRTUAL = 1001; // virtual protocol (has no accounts) PROTOTYPE_ENCRYPTION = 2000; PROTOTYPE_FILTER = 3000; PROTOTYPE_TRANSLATION = 4000; diff --git a/include/delphi/m_protoint.inc b/include/delphi/m_protoint.inc index 58455d02b5..069c1f2ea4 100644 --- a/include/delphi/m_protoint.inc +++ b/include/delphi/m_protoint.inc @@ -46,7 +46,6 @@ type iDesiredStatus:int; iXStatus :int; iVersion :int; // version 2 or higher designate support of Unicode services - tszUserName :TChar; szModuleName :PAnsiChar; hProtoIcon :THandle; diff --git a/include/delphi/m_skin.inc b/include/delphi/m_skin.inc index 5311e27195..07c6bca22e 100644 --- a/include/delphi/m_skin.inc +++ b/include/delphi/m_skin.inc @@ -33,49 +33,50 @@ const SKINICON_OTHER_MIRANDA = 200; SKINICON_OTHER_EXIT = 201; SKINICON_OTHER_SHOWHIDE = 202; - SKINICON_OTHER_GROUPOPEN = 203; // v0.1.1.0+ - SKINICON_OTHER_USERONLINE = 204; // v0.1.0.1+ - SKINICON_OTHER_GROUPSHUT = 205; // v0.1.1.0+ - SKINICON_OTHER_CONNECTING = 206; // v0.1.0.1+ - SKINICON_OTHER_ADDCONTACT = 207; // v0.7.0.2+ - SKINICON_OTHER_USERDETAILS = 208; // v0.7.0.2+ - SKINICON_OTHER_HISTORY = 209; // v0.7.0.2+ - SKINICON_OTHER_DOWNARROW = 210; // v0.7.0.2+ - SKINICON_OTHER_FINDUSER = 211; // v0.7.0.2+ - SKINICON_OTHER_OPTIONS = 212; // v0.7.0.2+ - SKINICON_OTHER_SENDEMAIL = 213; // v0.7.0.2+ - SKINICON_OTHER_DELETE = 214; // v0.7.0.2+ - SKINICON_OTHER_RENAME = 215; // v0.7.0.2+ - SKINICON_OTHER_SMS = 216; // v0.7.0.2+ - SKINICON_OTHER_SEARCHALL = 217; // v0.7.0.2+ - SKINICON_OTHER_TICK = 218; // v0.7.0.2+ - SKINICON_OTHER_NOTICK = 219; // v0.7.0.2+ - SKINICON_OTHER_HELP = 220; // v0.7.0.2+ - SKINICON_OTHER_MIRANDAWEB = 221; // v0.7.0.2+ - SKINICON_OTHER_TYPING = 222; // v0.7.0.2+ - SKINICON_OTHER_SMALLDOT = 223; // v0.7.0.2+ - SKINICON_OTHER_FILLEDBLOB = 224; // v0.7.0.2+ - SKINICON_OTHER_EMPTYBLOB = 225; // v0.7.0.2+ - SKINICON_OTHER_UNICODE = 226; // v0.7.0.19+ - SKINICON_OTHER_ANSI = 227; // v0.7.0.19+ - SKINICON_OTHER_LOADED = 228; // v0.7.0.19+ - SKINICON_OTHER_NOTLOADED = 229; // v0.7.0.19+ - SKINICON_OTHER_UNDO = 230; // v0.8.0.4+ - SKINICON_OTHER_WINDOW = 231; // v0.8.0.4+ - SKINICON_OTHER_WINDOWS = 232; // v0.8.0.4+ - SKINICON_OTHER_ACCMGR = 233; // v0.8.0.4+ - SKINICON_OTHER_MAINMENU = 234; // v0.8.0.12+ - SKINICON_OTHER_STATUS = 235; // v0.8.0.12+ - SKINICON_CHAT_JOIN = 236; // v0.8.0.27+ - SKINICON_CHAT_LEAVE = 237; // v0.8.0.27+ - SKINICON_OTHER_STATUS_LOCKED = 238; // v0.8.0.28+ - SKINICON_OTHER_GROUP = 239; // v0.8.0.29+ - SKINICON_OTHER_ON = 240; // v0.9.0.9+ - SKINICON_OTHER_OFF = 241; // v0.9.0.9+ - SKINICON_OTHER_LOADEDGRAY = 242; // v0.10.3.1+ - SKINICON_OTHER_NOTLOADEDGRAY = 243; // v0.10.3.1+ - SKINICON_OTHER_VISIBLE_ALL = 244; // v0.93.4+ - SKINICON_OTHER_INVISIBLE_ALL = 245; // v0.93.4+ + SKINICON_OTHER_GROUPOPEN = 203; // v.0.1.1.0+ + SKINICON_OTHER_USERONLINE = 204; // v.0.1.0.1+ + SKINICON_OTHER_GROUPSHUT = 205; // v.0.1.1.0+ + SKINICON_OTHER_CONNECTING = 206; // v.0.1.0.1+ + SKINICON_OTHER_ADDCONTACT = 207; // v.0.7.0.2+ + SKINICON_OTHER_USERDETAILS = 208; // v.0.7.0.2+ + SKINICON_OTHER_HISTORY = 209; // v.0.7.0.2+ + SKINICON_OTHER_DOWNARROW = 210; // v.0.7.0.2+ + SKINICON_OTHER_FINDUSER = 211; // v.0.7.0.2+ + SKINICON_OTHER_OPTIONS = 212; // v.0.7.0.2+ + SKINICON_OTHER_SENDEMAIL = 213; // v.0.7.0.2+ + SKINICON_OTHER_DELETE = 214; // v.0.7.0.2+ + SKINICON_OTHER_RENAME = 215; // v.0.7.0.2+ + SKINICON_OTHER_SMS = 216; // v.0.7.0.2+ + SKINICON_OTHER_SEARCHALL = 217; // v.0.7.0.2+ + SKINICON_OTHER_TICK = 218; // v.0.7.0.2+ + SKINICON_OTHER_NOTICK = 219; // v.0.7.0.2+ + SKINICON_OTHER_HELP = 220; // v.0.7.0.2+ + SKINICON_OTHER_MIRANDAWEB = 221; // v.0.7.0.2+ + SKINICON_OTHER_TYPING = 222; // v.0.7.0.2+ + SKINICON_OTHER_SMALLDOT = 223; // v.0.7.0.2+ + SKINICON_OTHER_FILLEDBLOB = 224; // v.0.7.0.2+ + SKINICON_OTHER_EMPTYBLOB = 225; // v.0.7.0.2+ + SKINICON_OTHER_UNICODE = 226; // v.0.7.0.19+ + SKINICON_OTHER_ANSI = 227; // v.0.7.0.19+ + SKINICON_OTHER_LOADED = 228; // v.0.7.0.19+ + SKINICON_OTHER_NOTLOADED = 229; // v.0.7.0.19+ + SKINICON_OTHER_UNDO = 230; // v.0.8.0.4+ + SKINICON_OTHER_WINDOW = 231; // v.0.8.0.4+ + SKINICON_OTHER_WINDOWS = 232; // v.0.8.0.4+ + SKINICON_OTHER_ACCMGR = 233; // v.0.8.0.4+ + SKINICON_OTHER_MAINMENU = 234; // v.0.8.0.12+ + SKINICON_OTHER_STATUS = 235; // v.0.8.0.12+ + SKINICON_CHAT_JOIN = 236; // v.0.8.0.27+ + SKINICON_CHAT_LEAVE = 237; // v.0.8.0.27+ + SKINICON_OTHER_STATUS_LOCKED = 238; // v.0.8.0.28+ + SKINICON_OTHER_GROUP = 239; // v.0.8.0.29+ + SKINICON_OTHER_ON = 240; // v.0.9.0.9+ + SKINICON_OTHER_OFF = 241; // v.0.9.0.9+ + SKINICON_OTHER_LOADEDGRAY = 242; // v.0.10.3.1+ + SKINICON_OTHER_NOTLOADEDGRAY = 243; // v.0.10.3.1+ + SKINICON_OTHER_VISIBLE_ALL = 244; // v.0.93.4+ + SKINICON_OTHER_INVISIBLE_ALL = 245; // v.0.93.4+ + SKINICON_OTHER_FRAME = 246; // v.0.94.1+ { SKINICON_EVENT_MESSAGE_BIG = 300; diff --git a/include/delphi/m_system.inc b/include/delphi/m_system.inc index 642c7ab557..5fad959d8a 100644 --- a/include/delphi/m_system.inc +++ b/include/delphi/m_system.inc @@ -25,7 +25,7 @@ {$IFNDEF MIRANDANAME} {$DEFINE MIRANDANAME} const - MIRANDANAME = 'Miranda IM'; + MIRANDANAME = 'Miranda NG'; {$ENDIF} {$IFNDEF MIRANDACLASS} {$DEFINE MIRANDACLASS} @@ -49,8 +49,10 @@ const ME_SYSTEM_SHUTDOWN:PAnsiChar = 'Miranda/System/Shutdown'; { restarts miranda ( 0.8+ ) - wParam=0 or 1. 1 - restart with current profile, 0 - restart in default profile or profile manager - lParam=0 + wParam = 0 or 1. + 1 - restart with current profile, + 0 - restart in default profile or profile manager + lParam = 0 } MS_SYSTEM_RESTART:PAnsiChar = 'Miranda/System/Restart'; -- cgit v1.2.3