summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/TopToolBar/res/version.rc44
-rw-r--r--plugins/TopToolBar/src/InternalButtons.cpp2
-rw-r--r--plugins/TopToolBar/src/common.h41
-rw-r--r--plugins/TopToolBar/src/main.cpp12
-rw-r--r--plugins/TopToolBar/src/version.h48
5 files changed, 40 insertions, 107 deletions
diff --git a/plugins/TopToolBar/res/version.rc b/plugins/TopToolBar/res/version.rc
index 2c82256ade..5bfbab4754 100644
--- a/plugins/TopToolBar/res/version.rc
+++ b/plugins/TopToolBar/res/version.rc
@@ -4,55 +4,31 @@
#error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
+#include "afxres.h"
#include "..\src\version.h"
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include <winres.h>
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
VS_VERSION_INFO VERSIONINFO
FILEVERSION __FILEVERSION_STRING
PRODUCTVERSION __FILEVERSION_STRING
- FILEFLAGSMASK 0x3fL
+ FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
+ FILEOS 0x4L
+ FILETYPE 0x0L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "000004b0"
BEGIN
- VALUE "FileDescription", __PLUGIN_DESC
- VALUE "FileVersion", __VERSION_STRING
- VALUE "InternalName", __PLUGIN_SHORTNAME
- VALUE "LegalCopyright", __PLUGIN_RIGHTS
- VALUE "OriginalFilename", __PLUGIN_FILE
- VALUE "ProductName", __PLUGIN_SHORTNAME
- VALUE "ProductVersion", __VERSION_STRING
+ VALUE "FileDescription", __DESCRIPTION
+ VALUE "InternalName", __PLUGIN_NAME
+ VALUE "LegalCopyright", __COPYRIGHT
+ VALUE "OriginalFilename", __FILENAME
+ VALUE "ProductName", __PLUGIN_NAME
END
END
BLOCK "VarFileInfo"
@@ -60,5 +36,3 @@ BEGIN
VALUE "Translation", 0x0, 1200
END
END
-
-#endif
diff --git a/plugins/TopToolBar/src/InternalButtons.cpp b/plugins/TopToolBar/src/InternalButtons.cpp
index eaf07853b6..5ee174c7e1 100644
--- a/plugins/TopToolBar/src/InternalButtons.cpp
+++ b/plugins/TopToolBar/src/InternalButtons.cpp
@@ -5,8 +5,6 @@
#define TTBI_SOUNDSONOFF "TTBInternal/SoundsOnOFF"
#define TTBI_MAINMENUBUTT "TTBInternal/MainMenuBUTT"
-extern HINSTANCE hInst;
-
static HWND hwndContactTree;
struct
diff --git a/plugins/TopToolBar/src/common.h b/plugins/TopToolBar/src/common.h
index 64e15fcad4..ffadf7ef7c 100644
--- a/plugins/TopToolBar/src/common.h
+++ b/plugins/TopToolBar/src/common.h
@@ -6,32 +6,25 @@
#include <windows.h>
#include <commctrl.h>
-#include <time.h>
#include <stddef.h>
-#include <process.h>
-#include <math.h>
-#include <vsstyle.h>
-
-#include "win2k.h"
-#include "newpluginapi.h"
-#include "m_system.h"
-#include "m_system_cpp.h"
-#include "m_database.h"
-#include "m_clist.h"
-#include "m_skin.h"
-#include "m_utils.h"
-#include "m_cluiframes.h"
-#include "m_clui.h"
-#include "m_clc.h"
-#include "m_findadd.h"
-#include "m_langpack.h"
-#include "m_options.h"
+
+#include <win2k.h>
+#include <newpluginapi.h>
+#include <m_database.h>
+#include <m_skin.h>
+#include <m_cluiframes.h>
+#include <m_clui.h>
+#include <m_clc.h>
+#include <m_findadd.h>
+#include <m_langpack.h>
+#include <m_options.h>
+#include <m_button.h>
+#include <m_icolib.h>
+
+#include <m_toptoolbar.h>
+
#include "resource.h"
-#include "m_protocols.h"
-#include "m_protosvc.h"
-#include "m_toptoolbar.h"
-#include "m_button.h"
-#include "m_icolib.h"
+#include "version.h"
#include "BkgrCfg.h"
#define TTB_BUTTON_CLASS _T("TopToolbarButtonClass")
diff --git a/plugins/TopToolBar/src/main.cpp b/plugins/TopToolBar/src/main.cpp
index 601de36408..de9d0a528c 100644
--- a/plugins/TopToolBar/src/main.cpp
+++ b/plugins/TopToolBar/src/main.cpp
@@ -1,6 +1,5 @@
#include "common.h"
-#include "version.h"
HINSTANCE hInst;
int hLangpack;
@@ -10,12 +9,13 @@ PLUGININFOEX pluginInfo =
sizeof(PLUGININFOEX),
__PLUGIN_NAME,
PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
- __PLUGIN_DESC,
- __PLUGIN_AUTHOR,
- __PLUGIN_EMAIL,
- __PLUGIN_RIGHTS,
- __PLUGIN_AUTHORWEB,
+ __DESCRIPTION,
+ __AUTHOR,
+ __AUTHOREMAIL,
+ __COPYRIGHT,
+ __AUTHORWEB,
UNICODE_AWARE,
+ // {F593C752-51D8-4D46-BA27-37577953F55C}
{0xf593c752, 0x51d8, 0x4d46, {0xba, 0x27, 0x37, 0x57, 0x79, 0x53, 0xf5, 0x5c}}
};
diff --git a/plugins/TopToolBar/src/version.h b/plugins/TopToolBar/src/version.h
index f32fd595eb..cb2873e045 100644
--- a/plugins/TopToolBar/src/version.h
+++ b/plugins/TopToolBar/src/version.h
@@ -1,46 +1,14 @@
-/*
-
-Miranda IM: the free IM client for Microsoft* Windows*
-
-Copyright 2000-2008 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
-listed in contributors.txt.
-
-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.
-*/
-
#define __MAJOR_VERSION 0
#define __MINOR_VERSION 8
#define __RELEASE_NUM 0
#define __BUILD_NUM 3
-// other stuff for Version resource
-#define __STRINGIFY_IMPL(x) #x
-#define __STRINGIFY(x) __STRINGIFY_IMPL(x)
-
-#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
-#define __FILEVERSION_STRING_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
-#define __VERSION_STRING __STRINGIFY(__FILEVERSION_STRING_DOTS)
-
-#define __PLUGIN_DESC "ToptoolBar adds buttons in top frame for fast access."
-#define __PLUGIN_LONGDESC __PLUGIN_DESC
-#define __PLUGIN_AUTHOR "Bethoven"
-#define __PLUGIN_AUTHORWEB "http://miranda-ng.org/"
-#define __PLUGIN_EMAIL "Bethoven@mailgate.ru"
-#define __PLUGIN_RIGHTS "© 2003-2008 Bethoven"
-#define __PLUGIN_FILE "TopToolbar.dll"
-#define __PLUGIN_SHORTNAME "TopToolBar"
+#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
-#define __PLUGIN_NAME __PLUGIN_SHORTNAME
+#define __PLUGIN_NAME "TopToolBar"
+#define __FILENAME "TopToolbar.dll"
+#define __DESCRIPTION "ToptoolBar adds buttons in top frame for fast access."
+#define __AUTHOR "Bethoven"
+#define __AUTHOREMAIL "Bethoven@mailgate.ru"
+#define __AUTHORWEB "http://miranda-ng.org/"
+#define __COPYRIGHT "© 2003-2008 Bethoven"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 07:44:39 +0000