From c5cd9533eabe06dd7cc3eda31290f8b11d09c79d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 17 Dec 2013 21:31:47 +0000 Subject: standardizing CLUIFrames file names git-svn-id: http://svn.miranda-ng.org/main/trunk@7265 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/hdr/modern_cluiframes.h | 143 --------------------- .../Clist_modern/src/hdr/modern_commonheaders.h | 2 +- .../Clist_modern/src/hdr/modern_commonprototypes.h | 2 +- plugins/Clist_modern/src/hdr/modern_skinengine.h | 2 +- plugins/Clist_modern/src/hdr/modern_skinselector.h | 22 ++-- plugins/Clist_modern/src/hdr/modern_sync.h | 2 - 6 files changed, 14 insertions(+), 159 deletions(-) delete mode 100644 plugins/Clist_modern/src/hdr/modern_cluiframes.h (limited to 'plugins/Clist_modern/src/hdr') diff --git a/plugins/Clist_modern/src/hdr/modern_cluiframes.h b/plugins/Clist_modern/src/hdr/modern_cluiframes.h deleted file mode 100644 index 75bf89a8bd..0000000000 --- a/plugins/Clist_modern/src/hdr/modern_cluiframes.h +++ /dev/null @@ -1,143 +0,0 @@ -/* -Miranda ICQ: the free icq client for MS Windows -Copyright (C) 2000-2 Richard Hughes, Roland Rabien & Tristan Van de Vreede - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#pragma once - -#ifndef _CLUIFRAMES_H_ -#define _CLUIFRAMES_H_ - -#include "../m_api/m_skin_eng.h" - -int LoadCLUIFramesModule(void); -int UnLoadCLUIFramesModule(void); -int CLUIFramesGetMinHeight(); -int CLUIFramesOnClistResize(WPARAM wParam,LPARAM lParam); -int CLUIFrames_GetTotalHeight(); - -typedef struct tagProtocolData { - char *RealName; - int protopos; - boolean show; -} ProtocolData; - -typedef struct -{ - int order; - int realpos; -}SortData; - - - - -//============ -#define CLUIFRAMESSETALIGN "CLUIFramesSetAlign" - -#define CLUIFRAMESSETALIGNALTOP "CLUIFramesSetAlignalTop" -#define CLUIFRAMESSETALIGNALCLIENT "CLUIFramesSetAlignalClient" -#define CLUIFRAMESSETALIGNALBOTTOM "CLUIFramesSetAlignalBottom" -#define CLUIFRAMESSETFLOATING "Set_Floating" - -#define CLUIFRAMESMOVEUPDOWN "CLUIFramesMoveUpDown" -#define CLUIFRAMESMOVEUP "CLUIFramesMoveUp" -#define CLUIFRAMESMOVEDOWN "CLUIFramesMoveDown" - -struct FrameMenuHandles -{ - HGENMENU MainMenuItem; - HGENMENU MIVisible,MITitle,MITBVisible,MILock,MIColl,MIFloating,MIAlignRoot; - HGENMENU MIAlignTop,MIAlignClient,MIAlignBottom; - HGENMENU MIBorder, MIPosRoot, MIPosUp, MIPosDown; -}; - -struct FrameTitleBar -{ - HWND hwnd; - HWND TitleBarbutt; - HWND hwndTip; - - TCHAR* tbname; - TCHAR* tooltip; - - char * sztbname; - char * sztooltip; - - HMENU hmenu; - HICON hicon; - - BOOLEAN ShowTitleBar; - BOOLEAN ShowTitleBarTip; - COLORREF BackColour; - COLORREF TextColour; - int oldstyles; - POINT oldpos; - RECT wndSize; -}; - -struct DockOpt -{ - HWND hwndLeft; - HWND hwndRight; -}; - -struct FRAMEWND -{ - int id; - HWND hWnd ; - RECT wndSize; - TCHAR * Name; - char * szName; - int align; - int height; - int dwFlags; - BOOLEAN Locked; - BOOLEAN visible; - BOOLEAN needhide; - BOOLEAN collapsed; - int prevvisframe; - int HeightWhenCollapsed; - FrameTitleBar TitleBar; - FrameMenuHandles MenuHandles; - int oldstyles; - BOOLEAN floating; - HWND ContainerWnd; - POINT FloatingPos; - POINT FloatingSize; - BOOLEAN minmaxenabled; - BOOLEAN UseBorder; - int order; - DockOpt dockOpt; - HWND OwnerWindow; - tPaintCallbackProc PaintCallbackProc; - sPaintRequest * PaintData; - BOOLEAN bQueued; - HRGN UpdateRgn; -}; - -#define OFFSET_PROTOPOS 200 -#define OFFSET_VISIBLE 400 - -#define CLUIFrameSubContainerClassName _T("CLUIFrameSubContainer") -#define CLUIFrameTitleBarClassName _T("CLUIFrameTitleBar") -#define CLUIFrameModule "CLUIFrames" - -#endif - - - - diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h index 982f51d51f..b040850808 100644 --- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h +++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h @@ -103,7 +103,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "modern_global_structure.h" #include "modern_clc.h" #include "modern_clist.h" -#include "modern_cluiframes.h" +#include "CLUIFrames/cluiframes.h" #include "modern_rowheight_funcs.h" #include "modern_cache_funcs.h" #include "modern_log.h" diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h index 150bb33395..449bc44caf 100644 --- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h +++ b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h @@ -9,7 +9,7 @@ #include "modern_commonheaders.h" //TO DO: Move contents of this file to commonheaders.h #include "modern_clist.h" -#include "modern_cluiframes.h" +#include "CLUIFrames/cluiframes.h" #include "modern_row.h" #include "modern_skinengine.h" #include "modern_skinselector.h" diff --git a/plugins/Clist_modern/src/hdr/modern_skinengine.h b/plugins/Clist_modern/src/hdr/modern_skinengine.h index 7ada5601b3..7811be127c 100644 --- a/plugins/Clist_modern/src/hdr/modern_skinengine.h +++ b/plugins/Clist_modern/src/hdr/modern_skinengine.h @@ -138,7 +138,7 @@ private: int ske_UnloadSkin(SKINOBJECTSLIST * Skin); -int ske_AddDescriptorToSkinObjectList (LPSKINOBJECTDESCRIPTOR lpDescr, SKINOBJECTSLIST* Skin); +int ske_AddDescriptorToSkinObjectList (SKINOBJECTDESCRIPTOR *lpDescr, SKINOBJECTSLIST* Skin); INT_PTR ske_Service_DrawGlyph(WPARAM wParam,LPARAM lParam); diff --git a/plugins/Clist_modern/src/hdr/modern_skinselector.h b/plugins/Clist_modern/src/hdr/modern_skinselector.h index 7c6226c5e5..f443663420 100644 --- a/plugins/Clist_modern/src/hdr/modern_skinselector.h +++ b/plugins/Clist_modern/src/hdr/modern_skinselector.h @@ -64,23 +64,23 @@ struct LISTMODERNMASK }; /// PROTOTYPES -int AddModernMaskToList(MODERNMASK *mm, LISTMODERNMASK * mmTemplateList); -int AddStrModernMaskToList(DWORD maskID, char * szStr, char * objectName, LISTMODERNMASK * mmTemplateList, void * pObjectList); -int SortMaskList(LISTMODERNMASK * mmList); +int AddModernMaskToList(MODERNMASK *mm, LISTMODERNMASK *mmTemplateList); +int AddStrModernMaskToList(DWORD maskID, char *szStr, char *objectName, LISTMODERNMASK *mmTemplateList, void *pObjectList); +int SortMaskList(LISTMODERNMASK *mmList); -int DeleteMaskByItID(DWORD mID,LISTMODERNMASK * mmTemplateList); -int ClearMaskList(LISTMODERNMASK * mmTemplateList); -int ExchangeMasksByID(DWORD mID1, DWORD mID2, LISTMODERNMASK * mmTemplateList); +int DeleteMaskByItID(DWORD mID,LISTMODERNMASK *mmTemplateList); +int ClearMaskList(LISTMODERNMASK *mmTemplateList); +int ExchangeMasksByID(DWORD mID1, DWORD mID2, LISTMODERNMASK *mmTemplateList); -int ParseToModernMask(MODERNMASK *mm, char * szText); +int ParseToModernMask(MODERNMASK *mm, char *szText); BOOL CompareModernMask(MODERNMASK *mmValue,MODERNMASK *mmTemplate); BOOL CompareStrWithModernMask(char * szValue,MODERNMASK *mmTemplate); MODERNMASK * FindMaskByStr(char * szValue,LISTMODERNMASK * mmTemplateList); DWORD mod_CalcHash(const char * a); -char * ModernMaskToString(MODERNMASK *mm, char * buf, UINT bufsize); -int RegisterObjectByParce(char * ObjectName, char * Params); -SKINOBJECTDESCRIPTOR * skin_FindObjectByRequest(char * szValue,LISTMODERNMASK * mmTemplateList); -SKINOBJECTDESCRIPTOR * skin_FindObjectByMask (MODERNMASK *mm,LISTMODERNMASK * mmTemplateList); +char * ModernMaskToString(MODERNMASK *mm, char *buf, UINT bufsize); +int RegisterObjectByParce(char * ObjectName, char *Params); +SKINOBJECTDESCRIPTOR* skin_FindObjectByRequest(char *szValue,LISTMODERNMASK *mmTemplateList); +SKINOBJECTDESCRIPTOR* skin_FindObjectByMask (MODERNMASK *mm,LISTMODERNMASK *mmTemplateList); TCHAR * GetParamNT(char * string, TCHAR * buf, int buflen, BYTE paramN, char Delim, BOOL SkipSpaces); int SkinDrawGlyphMask(HDC hdc, RECT *rcSize, RECT *rcClip, MODERNMASK *ModernMask); #endif diff --git a/plugins/Clist_modern/src/hdr/modern_sync.h b/plugins/Clist_modern/src/hdr/modern_sync.h index 1f583f79f2..afa11a1002 100644 --- a/plugins/Clist_modern/src/hdr/modern_sync.h +++ b/plugins/Clist_modern/src/hdr/modern_sync.h @@ -1,8 +1,6 @@ #ifndef modern_sync_h__ #define modern_sync_h__ -#include "hdr/modern_commonheaders.h" - typedef INT_PTR (*PSYNCCALLBACKPROC)(WPARAM,LPARAM); int SyncCall(void * vproc, int count, ... ); -- cgit v1.2.3