From 5e3d3e76ed1d3cae5c651b2cdb4dfed4dde5c498 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 8 Mar 2013 15:40:42 +0000 Subject: added version info git-svn-id: http://svn.miranda-ng.org/main/trunk@3923 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Scriver/res/Version.rc | 38 ++++++++++++++++++++ plugins/Scriver/res/resource.rc | 49 +++---------------------- plugins/Scriver/scriver_10.vcxproj | 2 ++ plugins/Scriver/scriver_10.vcxproj.filters | 6 ++++ plugins/Scriver/scriver_11.vcxproj | 2 ++ plugins/Scriver/scriver_11.vcxproj.filters | 6 ++++ plugins/Scriver/src/Version.h | 14 ++++++++ plugins/Scriver/src/chat/clist.cpp | 1 - plugins/Scriver/src/chat/colorchooser.cpp | 2 -- plugins/Scriver/src/chat/log.cpp | 3 -- plugins/Scriver/src/chat/main.cpp | 3 -- plugins/Scriver/src/chat/manager.cpp | 7 ---- plugins/Scriver/src/chat/message.cpp | 2 -- plugins/Scriver/src/chat/options.cpp | 5 --- plugins/Scriver/src/chat/services.cpp | 4 --- plugins/Scriver/src/chat/tools.cpp | 6 ---- plugins/Scriver/src/chat/window.cpp | 13 ------- plugins/Scriver/src/cmdlist.cpp | 4 +-- plugins/Scriver/src/commonheaders.h | 57 +++++++++++++++++++----------- plugins/Scriver/src/globals.cpp | 2 +- plugins/Scriver/src/globals.h | 3 -- plugins/Scriver/src/infobar.cpp | 3 +- plugins/Scriver/src/input.cpp | 1 + plugins/Scriver/src/msgdialog.cpp | 3 +- plugins/Scriver/src/msglog.cpp | 1 + plugins/Scriver/src/msgoptions.cpp | 5 +-- plugins/Scriver/src/msgs.cpp | 2 +- plugins/Scriver/src/msgs.h | 4 --- plugins/Scriver/src/msgtimedout.cpp | 3 +- plugins/Scriver/src/msgwindow.cpp | 5 --- plugins/Scriver/src/richutil.cpp | 2 +- plugins/Scriver/src/sendqueue.cpp | 1 + plugins/Scriver/src/sendqueue.h | 2 -- plugins/Scriver/src/srmm.cpp | 17 ++++----- plugins/Scriver/src/statusicon.cpp | 2 +- plugins/Scriver/src/statusicon.h | 2 -- plugins/Scriver/src/utils.cpp | 1 + 37 files changed, 131 insertions(+), 152 deletions(-) create mode 100644 plugins/Scriver/res/Version.rc create mode 100644 plugins/Scriver/src/Version.h (limited to 'plugins') diff --git a/plugins/Scriver/res/Version.rc b/plugins/Scriver/res/Version.rc new file mode 100644 index 0000000000..5bfbab4754 --- /dev/null +++ b/plugins/Scriver/res/Version.rc @@ -0,0 +1,38 @@ +// Microsoft Visual C++ generated resource script. +// +#ifdef APSTUDIO_INVOKED +#error this file is not editable by Microsoft Visual C++ +#endif //APSTUDIO_INVOKED + +#include "afxres.h" +#include "..\src\version.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION __FILEVERSION_STRING + PRODUCTVERSION __FILEVERSION_STRING + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x0L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "FileDescription", __DESCRIPTION + VALUE "InternalName", __PLUGIN_NAME + VALUE "LegalCopyright", __COPYRIGHT + VALUE "OriginalFilename", __FILENAME + VALUE "ProductName", __PLUGIN_NAME + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END diff --git a/plugins/Scriver/res/resource.rc b/plugins/Scriver/res/resource.rc index b156fcd51d..62d332ea6a 100644 --- a/plugins/Scriver/res/resource.rc +++ b/plugins/Scriver/res/resource.rc @@ -1,13 +1,10 @@ #include "..\src\resource.h" -#include +#include #undef RICHEDIT_CLASS #define RICHEDIT_CLASS "RichEdit20W" -#ifndef IDC_STATIC -#define IDC_STATIC (-1) -#endif #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -172,7 +169,7 @@ BEGIN UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK | WS_DISABLED,290,79,10,12 - CONTROL "Customize fonts and colors",IDC_FONTSCOLORS,"Hyperlink", 0,8,91,200,8 + CONTROL "Customize fonts and colors",IDC_FONTSCOLORS,"Hyperlink", 0,8,91,200,8 CONTROL "",IDC_LOG,RICHEDIT_CLASS, WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY,8,105,288,68,WS_EX_STATICEDGE @@ -504,7 +501,7 @@ END 2 TEXTINCLUDE BEGIN - "#include \r\n" + "#include \r\n" "\0" END @@ -592,7 +589,7 @@ IDC_DRAGCURSOR CURSOR "dragcopy.cur" // Menu // -IDR_CONTEXT MENU DISCARDABLE +IDR_CONTEXT MENU BEGIN POPUP "Log" BEGIN @@ -671,44 +668,6 @@ BEGIN END END -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,10,0,2 - PRODUCTVERSION 2,10,0,2 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "041504e3" - BEGIN - VALUE "Comments", "http://miranda-ng.org/" - VALUE "CompanyName", "Miranda NG Development Team" - VALUE "FileDescription", "Scriver - send and receive instant messages" - VALUE "FileVersion", "2.10.0.2" - VALUE "InternalName", "scriver" - VALUE "LegalCopyright", "Copyright (c) 2000-2012 Miranda IM Project, 2012-2013 Miranda NG Project" - VALUE "OriginalFilename", "scriver.dll" - VALUE "ProductName", "Scriver" - VALUE "ProductVersion", "2.10.0.2" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x415, 1251 - END -END #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/Scriver/scriver_10.vcxproj b/plugins/Scriver/scriver_10.vcxproj index eeb7398155..de25f4720c 100644 --- a/plugins/Scriver/scriver_10.vcxproj +++ b/plugins/Scriver/scriver_10.vcxproj @@ -257,9 +257,11 @@ + + diff --git a/plugins/Scriver/scriver_10.vcxproj.filters b/plugins/Scriver/scriver_10.vcxproj.filters index 67edc8cb9e..7c1cca3200 100644 --- a/plugins/Scriver/scriver_10.vcxproj.filters +++ b/plugins/Scriver/scriver_10.vcxproj.filters @@ -143,10 +143,16 @@ Header Files\chat + + Header Files + Resource Files + + Resource Files + \ No newline at end of file diff --git a/plugins/Scriver/scriver_11.vcxproj b/plugins/Scriver/scriver_11.vcxproj index a8d07b32a6..412627ffbe 100644 --- a/plugins/Scriver/scriver_11.vcxproj +++ b/plugins/Scriver/scriver_11.vcxproj @@ -261,9 +261,11 @@ + + diff --git a/plugins/Scriver/scriver_11.vcxproj.filters b/plugins/Scriver/scriver_11.vcxproj.filters index 67edc8cb9e..7c1cca3200 100644 --- a/plugins/Scriver/scriver_11.vcxproj.filters +++ b/plugins/Scriver/scriver_11.vcxproj.filters @@ -143,10 +143,16 @@ Header Files\chat + + Header Files + Resource Files + + Resource Files + \ No newline at end of file diff --git a/plugins/Scriver/src/Version.h b/plugins/Scriver/src/Version.h new file mode 100644 index 0000000000..d46242db35 --- /dev/null +++ b/plugins/Scriver/src/Version.h @@ -0,0 +1,14 @@ +#define __MAJOR_VERSION 2 +#define __MINOR_VERSION 10 +#define __RELEASE_NUM 0 +#define __BUILD_NUM 2 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM + +#define __PLUGIN_NAME "Scriver" +#define __FILENAME "Scriver.dll" +#define __DESCRIPTION "Scriver - send and receive instant messages." +#define __AUTHOR "Miranda NG Development Team" +#define __AUTHOREMAIL "the_leech@users.berlios.de" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "© 2000-2012 Miranda IM Project, 2012-2013 Miranda NG Project" diff --git a/plugins/Scriver/src/chat/clist.cpp b/plugins/Scriver/src/chat/clist.cpp index 8e89ab671d..9beff76bcf 100644 --- a/plugins/Scriver/src/chat/clist.cpp +++ b/plugins/Scriver/src/chat/clist.cpp @@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "../commonheaders.h" -#include "chat.h" extern HANDLE hJoinMenuItem, hLeaveMenuItem; diff --git a/plugins/Scriver/src/chat/colorchooser.cpp b/plugins/Scriver/src/chat/colorchooser.cpp index 67dc78a90d..c9e51e9be8 100644 --- a/plugins/Scriver/src/chat/colorchooser.cpp +++ b/plugins/Scriver/src/chat/colorchooser.cpp @@ -22,8 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // this color chooser window is inspired by PeaCow's smiley chooser window for the Smileyadd plugin #include "../commonheaders.h" -#include "chat.h" -#include static int CalculateCoordinatesToButton(COLORCHOOSER * pCC, POINT pt) { diff --git a/plugins/Scriver/src/chat/log.cpp b/plugins/Scriver/src/chat/log.cpp index 984ac85397..d3a73352fb 100644 --- a/plugins/Scriver/src/chat/log.cpp +++ b/plugins/Scriver/src/chat/log.cpp @@ -20,9 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "../commonheaders.h" -#include "chat.h" -#include -#include #ifndef EM_GETSCROLLPOS #define EM_GETSCROLLPOS (WM_USER+221) diff --git a/plugins/Scriver/src/chat/main.cpp b/plugins/Scriver/src/chat/main.cpp index 3f0e54753e..d6e5895a02 100644 --- a/plugins/Scriver/src/chat/main.cpp +++ b/plugins/Scriver/src/chat/main.cpp @@ -20,12 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "../commonheaders.h" -#include "chat.h" void RegisterChatFonts( void ); -extern struct GlobalMessageData *g_dat; -extern CRITICAL_SECTION cs; //globals HMENU g_hMenu = NULL; HANDLE hJoinMenuItem, hLeaveMenuItem; diff --git a/plugins/Scriver/src/chat/manager.cpp b/plugins/Scriver/src/chat/manager.cpp index 69713b8980..0807ea9f7e 100644 --- a/plugins/Scriver/src/chat/manager.cpp +++ b/plugins/Scriver/src/chat/manager.cpp @@ -20,13 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "../commonheaders.h" -#include "chat.h" - -extern TCHAR* pszActiveWndID ; -extern char* pszActiveWndModule ; -extern struct MM_INTERFACE mmi ; - -extern struct GlobalMessageData *g_dat; void LoadModuleIcons(MODULEINFO * mi); diff --git a/plugins/Scriver/src/chat/message.cpp b/plugins/Scriver/src/chat/message.cpp index 7739e1acef..3103d279c2 100644 --- a/plugins/Scriver/src/chat/message.cpp +++ b/plugins/Scriver/src/chat/message.cpp @@ -20,8 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "../commonheaders.h" -#include "chat.h" -#include static int RTFColorToIndex(int *pIndex, int iCol, SESSION_INFO* si) { diff --git a/plugins/Scriver/src/chat/options.cpp b/plugins/Scriver/src/chat/options.cpp index 84437d2979..a22618c363 100644 --- a/plugins/Scriver/src/chat/options.cpp +++ b/plugins/Scriver/src/chat/options.cpp @@ -20,14 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "../commonheaders.h" -#include "chat.h" #define UM_CHECKSTATECHANGE (WM_USER+100) -extern HBRUSH hListBkgBrush; -extern HBRUSH hListSelectedBkgBrush; -extern FONTINFO aFonts[OPTIONS_FONTCOUNT]; - static HWND hPathTip = 0; struct branch_t diff --git a/plugins/Scriver/src/chat/services.cpp b/plugins/Scriver/src/chat/services.cpp index c332375871..bd55310277 100644 --- a/plugins/Scriver/src/chat/services.cpp +++ b/plugins/Scriver/src/chat/services.cpp @@ -20,10 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "../commonheaders.h" -#include "chat.h" -#include "../msgwindow.h" - -extern HICON hIcons[30]; HANDLE hSendEvent; HANDLE hBuildMenuEvent ; diff --git a/plugins/Scriver/src/chat/tools.cpp b/plugins/Scriver/src/chat/tools.cpp index a8ff09e1b4..a25a436964 100644 --- a/plugins/Scriver/src/chat/tools.cpp +++ b/plugins/Scriver/src/chat/tools.cpp @@ -20,12 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "../commonheaders.h" -#include "chat.h" - -extern FONTINFO aFonts[OPTIONS_FONTCOUNT]; -extern HMENU g_hMenu; -extern HANDLE hBuildMenuEvent ; -extern HANDLE hSendEvent; TCHAR* RemoveFormatting(const TCHAR* pszWord) { diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp index dea51e672a..50716c13f6 100644 --- a/plugins/Scriver/src/chat/window.cpp +++ b/plugins/Scriver/src/chat/window.cpp @@ -20,24 +20,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "../commonheaders.h" -#include "chat.h" -#include "../utils.h" -#include "../statusicon.h" #ifndef WM_UNICHAR #define WM_UNICHAR 0x0109 #endif -extern HBRUSH hListBkgBrush; -extern HBRUSH hListSelectedBkgBrush; -extern HANDLE hSendEvent; -extern HMENU g_hMenu; -extern TABLIST *g_TabList; -extern HANDLE hHookWinPopup; -extern HCURSOR hCurSplitNS, hCurSplitWE; - -extern CREOleCallback reOleCallback; - static ToolbarButton toolbarButtons[] = { {LPGENT("Bold"), IDC_CHAT_BOLD, 0, 4, 24}, {LPGENT("Italic"), IDC_CHAT_ITALICS, 0, 0, 24}, diff --git a/plugins/Scriver/src/cmdlist.cpp b/plugins/Scriver/src/cmdlist.cpp index 8f8d5b1524..85297d0430 100644 --- a/plugins/Scriver/src/cmdlist.cpp +++ b/plugins/Scriver/src/cmdlist.cpp @@ -20,9 +20,7 @@ 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. */ -#include -#include -#include + #include "commonheaders.h" TCmdList *tcmdlist_append(TCmdList *list, const char *data, int maxSize, BOOL temporary) { diff --git a/plugins/Scriver/src/commonheaders.h b/plugins/Scriver/src/commonheaders.h index 1818bfd546..2ea1687547 100644 --- a/plugins/Scriver/src/commonheaders.h +++ b/plugins/Scriver/src/commonheaders.h @@ -26,41 +26,32 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define _CRT_SECURE_NO_WARNINGS -#define MIRANDA_VER 0x0A00 - #define COMPILE_MULTIMON_STUBS #define _WIN32_WINNT 0x0501 #define _WIN32_IE 0x0501 #define WIN32_LEAN_AND_MEAN -#include - #include #include #include #include -#include -#include -#include - #include #include - #include +#include +#include +#include #include - +#include #include -#include #include #include #include #include #include #include -#include #include -#include #include #include #include @@ -75,20 +66,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -#include "m_ieview.h" +#include +#include +#include +#include #include "resource.h" -#include "globals.h" +#include "Version.h" +#include "infobar.h" +#include "cmdlist.h" +#include "sendqueue.h" #include "msgs.h" +#include "globals.h" #include "msgwindow.h" #include "utils.h" #include "input.h" -#include "sendqueue.h" - -#include "m_smileyadd.h" -#include "m_metacontacts.h" -#include "m_historyevents.h" #include "richutil.h" +#include "statusicon.h" +#include "chat/chat.h" #ifndef IMF_AUTOFONTSIZEADJUST #define IMF_AUTOFONTSIZEADJUST 0x0010 @@ -108,6 +103,28 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern HWND SM_FindWindowByContact(HANDLE hContact); extern HINSTANCE g_hInst; +extern CREOleCallback reOleCallback; +extern void ChangeStatusIcons(); +extern void LoadInfobarFonts(); +extern HCURSOR hDragCursor; +extern ITaskbarList3 * pTaskbarInterface; +extern struct GlobalMessageData *g_dat; +extern CRITICAL_SECTION cs; +extern TCHAR* pszActiveWndID ; +extern char* pszActiveWndModule ; +extern struct MM_INTERFACE mmi ; +extern HBRUSH hListBkgBrush; +extern HBRUSH hListSelectedBkgBrush; +extern FONTINFO aFonts[OPTIONS_FONTCOUNT]; +extern HICON hIcons[30]; +extern HMENU g_hMenu; +extern HANDLE hBuildMenuEvent; +extern HANDLE hSendEvent; +extern TABLIST *g_TabList; +extern HANDLE hHookWinPopup; +extern HCURSOR hCurSplitNS, hCurSplitWE; + +extern CREOleCallback reOleCallback; #define SPLITTER_HEIGHT 4 #define TOOLBAR_HEIGHT 24 diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp index b30f9cfc9f..36e0be464a 100644 --- a/plugins/Scriver/src/globals.cpp +++ b/plugins/Scriver/src/globals.cpp @@ -20,8 +20,8 @@ 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. */ + #include "commonheaders.h" -#include "m_ieview.h" struct GlobalMessageData *g_dat=NULL; extern PSLWA pSetLayeredWindowAttributes; diff --git a/plugins/Scriver/src/globals.h b/plugins/Scriver/src/globals.h index dd3e07d595..3c13eb37a3 100644 --- a/plugins/Scriver/src/globals.h +++ b/plugins/Scriver/src/globals.h @@ -23,9 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef SRMM_GLOBALS_H #define SRMM_GLOBALS_H -#include "cmdlist.h" -#include "msgs.h" - #define SMF_AUTOPOPUP 0x00000001 #define SMF_STAYMINIMIZED 0x00000002 #define SMF_CLOSEONSEND 0x00000004 diff --git a/plugins/Scriver/src/infobar.cpp b/plugins/Scriver/src/infobar.cpp index 4d244d82d2..9af2c54c49 100644 --- a/plugins/Scriver/src/infobar.cpp +++ b/plugins/Scriver/src/infobar.cpp @@ -20,9 +20,8 @@ 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. */ + #include "commonheaders.h" -#include "infobar.h" -#include "richutil.h" void SetupInfobar(InfobarWindowData* idat) { HWND hwnd = idat->hWnd; diff --git a/plugins/Scriver/src/input.cpp b/plugins/Scriver/src/input.cpp index 8539f8f3af..836c9be876 100644 --- a/plugins/Scriver/src/input.cpp +++ b/plugins/Scriver/src/input.cpp @@ -20,6 +20,7 @@ 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. */ + #include "commonheaders.h" extern HANDLE hHookWinPopup; diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 391a0ea16b..1daa25b359 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -20,9 +20,8 @@ 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. */ + #include "commonheaders.h" -#include "statusicon.h" -#include "infobar.h" #define TIMERID_MSGSEND 0 #define TIMERID_FLASHWND 1 diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp index 6bd33e9264..22bf09d128 100644 --- a/plugins/Scriver/src/msglog.cpp +++ b/plugins/Scriver/src/msglog.cpp @@ -20,6 +20,7 @@ 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. */ + #include "commonheaders.h" #define MIRANDA_0_5 diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp index 611817275e..fde75c3562 100644 --- a/plugins/Scriver/src/msgoptions.cpp +++ b/plugins/Scriver/src/msgoptions.cpp @@ -20,11 +20,8 @@ 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. */ + #include "commonheaders.h" -#include "chat/chat.h" -extern CREOleCallback reOleCallback; -extern void ChangeStatusIcons(); -extern void LoadInfobarFonts(); static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index d17cd0626d..c68a2397b7 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -20,8 +20,8 @@ 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. */ + #include "commonheaders.h" -#include "statusicon.h" HCURSOR hCurSplitNS, hCurSplitWE, hCurHyperlinkHand, hDragCursor; diff --git a/plugins/Scriver/src/msgs.h b/plugins/Scriver/src/msgs.h index a28dcb963f..72d521b69e 100644 --- a/plugins/Scriver/src/msgs.h +++ b/plugins/Scriver/src/msgs.h @@ -23,10 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef SRMM_MSGS_H #define SRMM_MSGS_H -#include -#include -#include "sendqueue.h" -#include "infobar.h" #define MSGERROR_CANCEL 0 #define MSGERROR_RETRY 1 #define MSGERROR_DONE 2 diff --git a/plugins/Scriver/src/msgtimedout.cpp b/plugins/Scriver/src/msgtimedout.cpp index 4a63acfa3a..dc9bfbfd1c 100644 --- a/plugins/Scriver/src/msgtimedout.cpp +++ b/plugins/Scriver/src/msgtimedout.cpp @@ -20,9 +20,8 @@ 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. */ -#include "commonheaders.h" -#include "msgs.h" +#include "commonheaders.h" INT_PTR CALLBACK ErrorDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { diff --git a/plugins/Scriver/src/msgwindow.cpp b/plugins/Scriver/src/msgwindow.cpp index 93b08a0085..08d4d2e104 100644 --- a/plugins/Scriver/src/msgwindow.cpp +++ b/plugins/Scriver/src/msgwindow.cpp @@ -22,11 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "commonheaders.h" -#include "statusicon.h" -#include "chat/chat.h" - -extern HCURSOR hDragCursor; -extern ITaskbarList3 * pTaskbarInterface; #define SB_CHAR_WIDTH 40 #define SB_SENDING_WIDTH 25 diff --git a/plugins/Scriver/src/richutil.cpp b/plugins/Scriver/src/richutil.cpp index d5fe537adb..4a50df057b 100644 --- a/plugins/Scriver/src/richutil.cpp +++ b/plugins/Scriver/src/richutil.cpp @@ -17,8 +17,8 @@ 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. */ + #include "commonheaders.h" -#include "richutil.h" /* To initialize this library, call: diff --git a/plugins/Scriver/src/sendqueue.cpp b/plugins/Scriver/src/sendqueue.cpp index fe02397c6e..de081b0776 100644 --- a/plugins/Scriver/src/sendqueue.cpp +++ b/plugins/Scriver/src/sendqueue.cpp @@ -20,6 +20,7 @@ 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. */ + #include "commonheaders.h" static MessageSendQueueItem *global_sendQueue = NULL; diff --git a/plugins/Scriver/src/sendqueue.h b/plugins/Scriver/src/sendqueue.h index e92de4293b..b2d89f5caf 100644 --- a/plugins/Scriver/src/sendqueue.h +++ b/plugins/Scriver/src/sendqueue.h @@ -24,8 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef SRMM_SENDQUEUE_H #define SRMM_SENDQUEUE_H -#include "msgs.h" - typedef struct MessageSendQueueItemStruct { HWND hwndSender; diff --git a/plugins/Scriver/src/srmm.cpp b/plugins/Scriver/src/srmm.cpp index 2f6204da9c..f7da293973 100644 --- a/plugins/Scriver/src/srmm.cpp +++ b/plugins/Scriver/src/srmm.cpp @@ -20,6 +20,7 @@ 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. */ + #include "commonheaders.h" int OnLoadModule(void); @@ -35,15 +36,15 @@ ITaskbarList3 * pTaskbarInterface; PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), - "Scriver", - PLUGIN_MAKE_VERSION(2, 10, 0, 2), - "Scriver - send and receive instant messages.", - "Miranda IM Development Team", - "the_leech@users.berlios.de", - "Copyright (c) 2000-2012 Miranda IM Project, 2012-2013 Miranda NG Project", - "http://miranda-ng.org/", + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, UNICODE_AWARE, - //{84636F78-2057-4302-8A65-23A16D46844C} + // {84636F78-2057-4302-8A65-23A16D46844C} {0x84636f78, 0x2057, 0x4302, {0x8a, 0x65, 0x23, 0xa1, 0x6d, 0x46, 0x84, 0x4c}} }; diff --git a/plugins/Scriver/src/statusicon.cpp b/plugins/Scriver/src/statusicon.cpp index 6b053b8adc..554f847ef8 100644 --- a/plugins/Scriver/src/statusicon.cpp +++ b/plugins/Scriver/src/statusicon.cpp @@ -20,8 +20,8 @@ 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. */ + #include "commonheaders.h" -#include "statusicon.h" struct StatusIconListNode { StatusIconData sid; diff --git a/plugins/Scriver/src/statusicon.h b/plugins/Scriver/src/statusicon.h index d7333129c6..c606cf6291 100644 --- a/plugins/Scriver/src/statusicon.h +++ b/plugins/Scriver/src/statusicon.h @@ -23,8 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef _STATUS_ICON_INC #define _STATUS_ICON_INC -#include - int InitStatusIcons(); int DeinitStatusIcons(); diff --git a/plugins/Scriver/src/utils.cpp b/plugins/Scriver/src/utils.cpp index 6c7de9de2b..8a69febd79 100644 --- a/plugins/Scriver/src/utils.cpp +++ b/plugins/Scriver/src/utils.cpp @@ -20,6 +20,7 @@ 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. */ + #include "commonheaders.h" #ifndef TTI_NONE -- cgit v1.2.3