From a33833212f040272fc6c97047c8cb335b6f5405a Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Tue, 24 Jul 2012 06:41:19 +0000 Subject: SimpleAR, SimpleStatusMsg, SmileyAdd, SpellChecker: changed folder structure git-svn-id: http://svn.miranda-ng.org/main/trunk@1149 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SimpleAR/Res/Resource.rc | 93 ++++++++++++++++++++++++++ plugins/SimpleAR/Res/Version.rc | 42 ++++++++++++ plugins/SimpleAR/Resource.h | 25 ------- plugins/SimpleAR/Resource.rc | 93 -------------------------- plugins/SimpleAR/SimpleAR_10.vcxproj | 30 +++------ plugins/SimpleAR/SimpleAR_10.vcxproj.filters | 28 +++----- plugins/SimpleAR/Src/Common.h | 5 +- plugins/SimpleAR/Src/Resource.h | 25 +++++++ plugins/SimpleAR/Src/Version.h | 21 ++++++ plugins/SimpleAR/Version.h | 21 ------ plugins/SimpleAR/Version.rc | 42 ------------ plugins/SimpleAR/docs/simplear-translation.txt | 17 +++++ plugins/SimpleAR/simplear-translation.txt | 17 ----- 13 files changed, 222 insertions(+), 237 deletions(-) create mode 100644 plugins/SimpleAR/Res/Resource.rc create mode 100644 plugins/SimpleAR/Res/Version.rc delete mode 100644 plugins/SimpleAR/Resource.h delete mode 100644 plugins/SimpleAR/Resource.rc create mode 100644 plugins/SimpleAR/Src/Resource.h create mode 100644 plugins/SimpleAR/Src/Version.h delete mode 100644 plugins/SimpleAR/Version.h delete mode 100644 plugins/SimpleAR/Version.rc create mode 100644 plugins/SimpleAR/docs/simplear-translation.txt delete mode 100644 plugins/SimpleAR/simplear-translation.txt (limited to 'plugins/SimpleAR') diff --git a/plugins/SimpleAR/Res/Resource.rc b/plugins/SimpleAR/Res/Resource.rc new file mode 100644 index 0000000000..4a43561be7 --- /dev/null +++ b/plugins/SimpleAR/Res/Resource.rc @@ -0,0 +1,93 @@ +// Microsoft Visual C++ generated resource script. +// +#include "..\src\resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +//resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "..\\src\\resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_OPTION DIALOGEX 0, 0, 295, 158 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +EXSTYLE WS_EX_CONTROLPARENT +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "Enable Auto Replier",IDC_ENABLEREPLIER,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,9,7,79,10 + LTEXT "Reply Message Heading:",IDC_STATIC,9,22,85,8 + EDITTEXT IDC_HEADING,96,21,190,12,ES_AUTOHSCROLL + LTEXT "Reply Message when",IDC_STATIC,9,42,73,8 + COMBOBOX IDC_STATUSMODE,96,40,77,30,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + EDITTEXT IDC_MESSAGE,9,59,277,54,ES_MULTILINE | ES_AUTOHSCROLL + LTEXT "No-repeat Interval:",IDC_STATIC,96,7,64,8 + EDITTEXT IDC_INTERVAL,163,5,36,12,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "mins",IDC_STATIC,201,7,30,9 + PUSHBUTTON "&Default",IDC_DEFAULT,226,40,60,13 +END + +#endif //resources +///////////////////////////////////////////////////////////////////////////// + +// Icon +// remains consistent on all systems. +IDI_ON ICON "On.ico" +IDI_OFF ICON "Off.ico" +///////////////////////////////////////////////////////////////////////////// + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/plugins/SimpleAR/Res/Version.rc b/plugins/SimpleAR/Res/Version.rc new file mode 100644 index 0000000000..d741488c4f --- /dev/null +++ b/plugins/SimpleAR/Res/Version.rc @@ -0,0 +1,42 @@ +// 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" + +#ifdef _WIN32 +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#endif //_WIN32 + +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/SimpleAR/Resource.h b/plugins/SimpleAR/Resource.h deleted file mode 100644 index 384930dd39..0000000000 --- a/plugins/SimpleAR/Resource.h +++ /dev/null @@ -1,25 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by resource.rc -// -#define IDD_OPTION 102 -#define IDC_ENABLEREPLIER 1001 -#define IDC_HEADING 1002 -#define IDC_STATUSMODE 1004 -#define IDC_MESSAGE 1005 -#define IDC_INTERVAL 1006 -#define IDC_DEFAULT 1007 -#define IDI_ON 103 -#define IDI_OFF 104 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NO_MFC 1 -#define _APS_NEXT_RESOURCE_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1008 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/plugins/SimpleAR/Resource.rc b/plugins/SimpleAR/Resource.rc deleted file mode 100644 index 9a3b32351f..0000000000 --- a/plugins/SimpleAR/Resource.rc +++ /dev/null @@ -1,93 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -//resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_OPTION DIALOGEX 0, 0, 295, 158 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE -EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - CONTROL "Enable Auto Replier",IDC_ENABLEREPLIER,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,9,7,79,10 - LTEXT "Reply Message Heading:",IDC_STATIC,9,22,85,8 - EDITTEXT IDC_HEADING,96,21,190,12,ES_AUTOHSCROLL - LTEXT "Reply Message when",IDC_STATIC,9,42,73,8 - COMBOBOX IDC_STATUSMODE,96,40,77,30,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - EDITTEXT IDC_MESSAGE,9,59,277,54,ES_MULTILINE | ES_AUTOHSCROLL - LTEXT "No-repeat Interval:",IDC_STATIC,96,7,64,8 - EDITTEXT IDC_INTERVAL,163,5,36,12,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "mins",IDC_STATIC,201,7,30,9 - PUSHBUTTON "&Default",IDC_DEFAULT,226,40,60,13 -END - -#endif //resources -///////////////////////////////////////////////////////////////////////////// - -// Icon -// remains consistent on all systems. -IDI_ON ICON "Res/On.ico" -IDI_OFF ICON "Res/Off.ico" -///////////////////////////////////////////////////////////////////////////// - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/plugins/SimpleAR/SimpleAR_10.vcxproj b/plugins/SimpleAR/SimpleAR_10.vcxproj index 9f3318be48..e0f8f32914 100644 --- a/plugins/SimpleAR/SimpleAR_10.vcxproj +++ b/plugins/SimpleAR/SimpleAR_10.vcxproj @@ -73,12 +73,11 @@ Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;SAR_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Use Common.h Level3 EditAndContinue - 4996;%(DisableSpecificWarnings) MultiThreadedDebugDLL @@ -99,12 +98,11 @@ AnySuitable Size ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;SAR_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true Use Common.h Level3 - 4996;%(DisableSpecificWarnings) Windows @@ -124,11 +122,10 @@ Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;SAR_EXPORTS;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Use Common.h Level3 - 4996;%(DisableSpecificWarnings) MultiThreadedDebugDLL @@ -149,12 +146,11 @@ AnySuitable Size ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;SAR_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true Use Common.h Level3 - 4996;%(DisableSpecificWarnings) Windows @@ -171,23 +167,19 @@ - + Create - + - - - + + + - - - - - - + + diff --git a/plugins/SimpleAR/SimpleAR_10.vcxproj.filters b/plugins/SimpleAR/SimpleAR_10.vcxproj.filters index 11860e6f80..5e00533b00 100644 --- a/plugins/SimpleAR/SimpleAR_10.vcxproj.filters +++ b/plugins/SimpleAR/SimpleAR_10.vcxproj.filters @@ -1,51 +1,43 @@  - + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - + {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hpp;hxx;hm;inl;inc;xsd - + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - + Source - + Source - + Header - + Header - + Header - - Resource - - - Resource - - - - + Resource - + Resource diff --git a/plugins/SimpleAR/Src/Common.h b/plugins/SimpleAR/Src/Common.h index 085786d869..ca873cb2ae 100644 --- a/plugins/SimpleAR/Src/Common.h +++ b/plugins/SimpleAR/Src/Common.h @@ -1,4 +1,5 @@ #define MIRANDA_VER 0x0A00 +#define _CRT_SECURE_NO_WARNINGS // Windows Header Files #include @@ -30,8 +31,8 @@ #include "m_clc.h" #include -#include "..\Resource.h" -#include "..\Version.h" +#include "Resource.h" +#include "Version.h" #define protocolname "SimpleAutoReplier" //no spaces here :) diff --git a/plugins/SimpleAR/Src/Resource.h b/plugins/SimpleAR/Src/Resource.h new file mode 100644 index 0000000000..384930dd39 --- /dev/null +++ b/plugins/SimpleAR/Src/Resource.h @@ -0,0 +1,25 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by resource.rc +// +#define IDD_OPTION 102 +#define IDC_ENABLEREPLIER 1001 +#define IDC_HEADING 1002 +#define IDC_STATUSMODE 1004 +#define IDC_MESSAGE 1005 +#define IDC_INTERVAL 1006 +#define IDC_DEFAULT 1007 +#define IDI_ON 103 +#define IDI_OFF 104 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NO_MFC 1 +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1008 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/plugins/SimpleAR/Src/Version.h b/plugins/SimpleAR/Src/Version.h new file mode 100644 index 0000000000..76395a436a --- /dev/null +++ b/plugins/SimpleAR/Src/Version.h @@ -0,0 +1,21 @@ +#define __MAJOR_VERSION 2 +#define __MINOR_VERSION 0 +#define __RELEASE_NUM 2 +#define __BUILD_NUM 6 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM +#define __FILEVERSION_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM + +#define __STRINGIFY_IMPL(x) #x +#define __STRINGIFY(x) __STRINGIFY_IMPL(x) +#define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) + + +#define __PLUGIN_NAME "SimpleAR" +#define __INTERNAL_NAME "Simple Auto Replier" +#define __FILENAME "SimpleAR.dll" +#define __DESCRIPTION "Simple Auto Replier." +#define __AUTHOR "Stark Wong, Mataes, Mikel-Ard-Ri" +#define __AUTHOREMAIL "mikelardri@gmail.com" +#define __AUTHORWEB "http://nightly.miranda.im/" +#define __COPYRIGHT "© 2012" diff --git a/plugins/SimpleAR/Version.h b/plugins/SimpleAR/Version.h deleted file mode 100644 index 76395a436a..0000000000 --- a/plugins/SimpleAR/Version.h +++ /dev/null @@ -1,21 +0,0 @@ -#define __MAJOR_VERSION 2 -#define __MINOR_VERSION 0 -#define __RELEASE_NUM 2 -#define __BUILD_NUM 6 - -#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM -#define __FILEVERSION_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM - -#define __STRINGIFY_IMPL(x) #x -#define __STRINGIFY(x) __STRINGIFY_IMPL(x) -#define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) - - -#define __PLUGIN_NAME "SimpleAR" -#define __INTERNAL_NAME "Simple Auto Replier" -#define __FILENAME "SimpleAR.dll" -#define __DESCRIPTION "Simple Auto Replier." -#define __AUTHOR "Stark Wong, Mataes, Mikel-Ard-Ri" -#define __AUTHOREMAIL "mikelardri@gmail.com" -#define __AUTHORWEB "http://nightly.miranda.im/" -#define __COPYRIGHT "© 2012" diff --git a/plugins/SimpleAR/Version.rc b/plugins/SimpleAR/Version.rc deleted file mode 100644 index d1da5e8d6a..0000000000 --- a/plugins/SimpleAR/Version.rc +++ /dev/null @@ -1,42 +0,0 @@ -// 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 "version.h" - -#ifdef _WIN32 -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#endif //_WIN32 - -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/SimpleAR/docs/simplear-translation.txt b/plugins/SimpleAR/docs/simplear-translation.txt new file mode 100644 index 0000000000..215cfdcb9d --- /dev/null +++ b/plugins/SimpleAR/docs/simplear-translation.txt @@ -0,0 +1,17 @@ +; Common strings that belong to many files +;[] + +; ../../plugins/SimpleAR/Resource.rc +;[&Default] +;[Enable Auto Replier] +;[No-repeat Interval:] +;[Reply Message Heading:] +;[Reply Message when] +;[mins] + +; ../../plugins/SimpleAR/Src/Main.cpp +;[Dear %user%, the owner left the following message:] + +; ../../plugins/SimpleAR/Src/Options.cpp +;[Plugins] +;[Simple Auto Replier] diff --git a/plugins/SimpleAR/simplear-translation.txt b/plugins/SimpleAR/simplear-translation.txt deleted file mode 100644 index 215cfdcb9d..0000000000 --- a/plugins/SimpleAR/simplear-translation.txt +++ /dev/null @@ -1,17 +0,0 @@ -; Common strings that belong to many files -;[] - -; ../../plugins/SimpleAR/Resource.rc -;[&Default] -;[Enable Auto Replier] -;[No-repeat Interval:] -;[Reply Message Heading:] -;[Reply Message when] -;[mins] - -; ../../plugins/SimpleAR/Src/Main.cpp -;[Dear %user%, the owner left the following message:] - -; ../../plugins/SimpleAR/Src/Options.cpp -;[Plugins] -;[Simple Auto Replier] -- cgit v1.2.3