From 145d0ad77f759772dc58676500d14ab6364e5da3 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 10 Feb 2013 12:03:30 +0000 Subject: added version info git-svn-id: http://svn.miranda-ng.org/main/trunk@3527 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_blind/Clist_blind_11.vcxproj | 20 +- plugins/Clist_blind/Clist_blind_11.vcxproj.filters | 6 + plugins/Clist_blind/res/Version.rc | 38 +++ plugins/Clist_blind/res/blank.ico | Bin 1150 -> 0 bytes plugins/Clist_blind/res/dragcopy.cur | Bin 326 -> 0 bytes plugins/Clist_blind/res/dropuser.cur | Bin 1086 -> 0 bytes plugins/Clist_blind/res/hyperlin.cur | Bin 326 -> 0 bytes plugins/Clist_blind/res/resource.rc | 277 ++++++++------------- plugins/Clist_blind/src/Version.h | 14 ++ plugins/Clist_blind/src/commonheaders.h | 28 +-- plugins/Clist_blind/src/init.cpp | 21 +- plugins/Clist_blind/src/resource.h | 1 - 12 files changed, 181 insertions(+), 224 deletions(-) create mode 100644 plugins/Clist_blind/res/Version.rc delete mode 100644 plugins/Clist_blind/res/blank.ico delete mode 100644 plugins/Clist_blind/res/dragcopy.cur delete mode 100644 plugins/Clist_blind/res/dropuser.cur delete mode 100644 plugins/Clist_blind/res/hyperlin.cur create mode 100644 plugins/Clist_blind/src/Version.h (limited to 'plugins') diff --git a/plugins/Clist_blind/Clist_blind_11.vcxproj b/plugins/Clist_blind/Clist_blind_11.vcxproj index 13500c4bc5..709507bd47 100644 --- a/plugins/Clist_blind/Clist_blind_11.vcxproj +++ b/plugins/Clist_blind/Clist_blind_11.vcxproj @@ -76,8 +76,8 @@ Full - ..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;BCLIST_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Use commonheaders.h Level3 @@ -105,8 +105,8 @@ Full - ..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;BCLIST_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + ..\..\include;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Use commonheaders.h Level3 @@ -134,8 +134,8 @@ Disabled - ..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;BCLIST_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -155,15 +155,15 @@ false $(IntDir)$(TargetName).lib Windows - comctl32.lib;%(AdditionalDependencies) $(ProfileDir)..\..\bin11\lib + comctl32.lib;%(AdditionalDependencies) Disabled - ..\..\include;..\ExternalAPI%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;BCLIST_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + ..\..\include;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -187,11 +187,13 @@ + + diff --git a/plugins/Clist_blind/Clist_blind_11.vcxproj.filters b/plugins/Clist_blind/Clist_blind_11.vcxproj.filters index b73361b71d..4c209502d9 100644 --- a/plugins/Clist_blind/Clist_blind_11.vcxproj.filters +++ b/plugins/Clist_blind/Clist_blind_11.vcxproj.filters @@ -18,6 +18,9 @@ Resource Files + + Resource Files + @@ -29,6 +32,9 @@ Header Files + + Header Files + diff --git a/plugins/Clist_blind/res/Version.rc b/plugins/Clist_blind/res/Version.rc new file mode 100644 index 0000000000..5bfbab4754 --- /dev/null +++ b/plugins/Clist_blind/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/Clist_blind/res/blank.ico b/plugins/Clist_blind/res/blank.ico deleted file mode 100644 index d8a5b3d80d..0000000000 Binary files a/plugins/Clist_blind/res/blank.ico and /dev/null differ diff --git a/plugins/Clist_blind/res/dragcopy.cur b/plugins/Clist_blind/res/dragcopy.cur deleted file mode 100644 index 89c7c960d5..0000000000 Binary files a/plugins/Clist_blind/res/dragcopy.cur and /dev/null differ diff --git a/plugins/Clist_blind/res/dropuser.cur b/plugins/Clist_blind/res/dropuser.cur deleted file mode 100644 index a84b19e28b..0000000000 Binary files a/plugins/Clist_blind/res/dropuser.cur and /dev/null differ diff --git a/plugins/Clist_blind/res/hyperlin.cur b/plugins/Clist_blind/res/hyperlin.cur deleted file mode 100644 index f0f548c828..0000000000 Binary files a/plugins/Clist_blind/res/hyperlin.cur and /dev/null differ diff --git a/plugins/Clist_blind/res/resource.rc b/plugins/Clist_blind/res/resource.rc index e11a281a06..0af339df8a 100644 --- a/plugins/Clist_blind/res/resource.rc +++ b/plugins/Clist_blind/res/resource.rc @@ -1,4 +1,4 @@ -//Microsoft Developer Studio generated resource script. +// Microsoft Visual C++ generated resource script. // #include "..\src\resource.h" @@ -7,21 +7,18 @@ // // Generated from the TEXTINCLUDE 2 resource. // - #include -#include "statusmodes.h" +#include ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources +// Русский (Россия) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS) +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +#pragma code_page(1251) ///////////////////////////////////////////////////////////////////////////// // @@ -29,197 +26,130 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // IDD_DELETECONTACT DIALOGEX 0, 0, 284, 90 -STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT CAPTION "Delete Contact" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Are you sure you want to delete %s?",IDC_TOPLINE,"Static", - SS_SIMPLE | SS_NOPREFIX | WS_GROUP,7,7,270,8 - LTEXT "This will erase all history and settings for this contact!", - IDC_STATIC,7,18,239,14 + CONTROL "Are you sure you want to delete %s?",IDC_TOPLINE,"Static",SS_SIMPLE | SS_NOPREFIX | WS_GROUP,7,7,270,8 + LTEXT "This will erase all history and settings for this contact!",IDC_STATIC,7,18,239,14 PUSHBUTTON "Yes",IDYES,54,38,65,14 DEFPUSHBUTTON "No",IDNO,162,38,65,14 - CONTROL "Hide from list only, in order to keep their history and ignore/visibility settings", - IDC_HIDE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | - WS_TABSTOP,7,65,270,9 - LTEXT "Use Options->Ignore (expert mode) to unhide contacts.", - IDC_STATIC,20,78,257,8 + CONTROL "Hide from list only, in order to keep their history and ignore/visibility settings",IDC_HIDE, + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,65,270,9 + LTEXT "Use Options->Ignore (expert mode) to unhide contacts.",IDC_STATIC,20,78,257,8 END IDD_OPT_HOTKEY DIALOGEX 0, 0, 238, 136 -STYLE DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Hotkeys",IDC_STATIC,4,4,230,126 - CONTROL "Show/Hide:",IDC_SHOWHIDE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,14,19,78,9 - CONTROL "HotKey1",IDC_HKSHOWHIDE,"msctls_hotkey32",WS_BORDER | - WS_TABSTOP,92,17,93,12 - CONTROL "Read Message:",IDC_READMSG,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,14,36,78,9 - CONTROL "HotKey1",IDC_HKREADMSG,"msctls_hotkey32",WS_BORDER | - WS_TABSTOP,92,34,93,12 - CONTROL "Web Search:",IDC_NETSEARCH,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,14,53,78,9 - CONTROL "HotKey1",IDC_HKSEARCH,"msctls_hotkey32",WS_BORDER | - WS_TABSTOP,92,51,93,12 + CONTROL "Show/Hide:",IDC_SHOWHIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,19,78,9 + CONTROL "HotKey1",IDC_HKSHOWHIDE,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,92,17,93,12 + CONTROL "Read Message:",IDC_READMSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,36,78,9 + CONTROL "HotKey1",IDC_HKREADMSG,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,92,34,93,12 + CONTROL "Web Search:",IDC_NETSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,53,78,9 + CONTROL "HotKey1",IDC_HKSEARCH,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,92,51,93,12 LTEXT "URL:",IDC_HOTKEYURLSTR,26,71,22,8 EDITTEXT IDC_SEARCHURL,92,69,136,12,ES_AUTOHSCROLL - CONTROL "Open in new browser window",IDC_SEARCHNEWWND,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,92,86,136,10 - CONTROL "Show Options",IDC_SHOWOPTIONS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,14,107,71,9 - CONTROL "HotKey1",IDC_HKSHOWOPTIONS,"msctls_hotkey32",WS_BORDER | - WS_TABSTOP,92,105,93,12 + CONTROL "Open in new browser window",IDC_SEARCHNEWWND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,86,136,10 + CONTROL "Show Options",IDC_SHOWOPTIONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,107,71,9 + CONTROL "HotKey1",IDC_HKSHOWOPTIONS,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,92,105,93,12 END IDD_OPT_CLIST DIALOGEX 0, 0, 314, 204 -STYLE DS_FIXEDSYS | DS_CENTER | WS_CHILD +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Hide offline users",IDC_HIDEOFFLINE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,10,17,124,10 - CONTROL "Hide empty groups",IDC_HIDEEMPTYGROUPS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,10,33,124,10 - CONTROL "Disable groups",IDC_DISABLEGROUPS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,10,50,124,10 - CONTROL "Ask before deleting contacts",IDC_CONFIRMDELETE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,10,67,124,10 - CONTROL "Sort contacts by name",IDC_SORTBYNAME,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,153,14,144,10 - CONTROL "Sort contacts by status",IDC_SORTBYSTATUS,"Button", - BS_AUTORADIOBUTTON,153,26,149,10 - CONTROL "Sort contacts by protocol",IDC_SORTBYPROTO,"Button", - BS_AUTORADIOBUTTON,153,38,151,10 - CONTROL "Single click interface",IDC_ONECLK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,152,68,150,10 - CONTROL "Always show status in tooltip",IDC_ALWAYSSTATUS,"Button", - BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,152, - 81,151,11 - CONTROL "Disable icon blinking",IDC_DISABLEBLINK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,152,95,86,9 + CONTROL "Hide offline users",IDC_HIDEOFFLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,17,124,10 + CONTROL "Hide empty groups",IDC_HIDEEMPTYGROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,33,124,10 + CONTROL "Disable groups",IDC_DISABLEGROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,50,124,10 + CONTROL "Ask before deleting contacts",IDC_CONFIRMDELETE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,67,124,10 + CONTROL "Sort contacts by name",IDC_SORTBYNAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,153,14,144,10 + CONTROL "Sort contacts by status",IDC_SORTBYSTATUS,"Button",BS_AUTORADIOBUTTON,153,26,149,10 + CONTROL "Sort contacts by protocol",IDC_SORTBYPROTO,"Button",BS_AUTORADIOBUTTON,153,38,151,10 + CONTROL "Single click interface",IDC_ONECLK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,68,150,10 + CONTROL "Always show status in tooltip",IDC_ALWAYSSTATUS,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,152,81,151,11 + CONTROL "Disable icon blinking",IDC_DISABLEBLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,95,86,9 EDITTEXT IDC_BLINKTIME,153,109,35,12,ES_NUMBER LTEXT "ms delay",IDC_STMSDELAY,192,110,113,8 - CONTROL "Show",IDC_DONTCYCLE,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,10,143,97,10 - COMBOBOX IDC_PRIMARYSTATUS,107,142,78,70,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - LTEXT "icon when statuses differ",IDC_STATIC,189,144,116,8,NOT - WS_GROUP - CONTROL "Cycle icons every",IDC_CYCLE,"Button", - BS_AUTORADIOBUTTON,10,160,97,10 + CONTROL "Show",IDC_DONTCYCLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,143,97,10 + COMBOBOX IDC_PRIMARYSTATUS,107,142,78,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "icon when statuses differ",IDC_STATIC,189,144,116,8,NOT WS_GROUP + CONTROL "Cycle icons every",IDC_CYCLE,"Button",BS_AUTORADIOBUTTON,10,160,97,10 EDITTEXT IDC_CYCLETIME,107,159,30,12,ES_RIGHT | ES_NUMBER - CONTROL "Spin1",IDC_CYCLETIMESPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | - UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,127,158, - 10,14 - LTEXT "seconds, when statuses differ",IDC_STATIC,140,161,165,8, - NOT WS_GROUP - CONTROL "Show multiple icons",IDC_MULTITRAY,"Button", - BS_AUTORADIOBUTTON,10,177,98,10 - CONTROL "Only when statuses differ",IDC_ALWAYSMULTI,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,108,177,198,10 + CONTROL "Spin1",IDC_CYCLETIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,127,158,10,14 + LTEXT "seconds, when statuses differ",IDC_STATIC,140,161,165,8,NOT WS_GROUP + CONTROL "Show multiple icons",IDC_MULTITRAY,"Button",BS_AUTORADIOBUTTON,10,177,98,10 + CONTROL "Only when statuses differ",IDC_ALWAYSMULTI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,177,198,10 GROUPBOX "Contact List",IDC_STCLISTGROUP,2,2,135,126 GROUPBOX "System tray icon",IDC_STATIC,143,57,169,70 - GROUPBOX "System tray icon when using multiple protocols", - IDC_STATIC,2,131,310,66 + GROUPBOX "System tray icon when using multiple protocols",IDC_STATIC,2,131,310,66 GROUPBOX "Contact List Sorting",IDC_STATIC,143,2,169,54,WS_GROUP - CONTROL "Spin5",IDC_BLINKSPIN,"msctls_updown32",UDS_SETBUDDYINT | - UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | - UDS_HOTTRACK,173,97,11,21 + CONTROL "Spin5",IDC_BLINKSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,173,97,11,21 END IDD_OPT_CLUI DIALOGEX 0, 0, 313, 245 -STYLE DS_FIXEDSYS | DS_CENTER | WS_CHILD +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Window",IDC_STWINDOWGROUP,4,4,305,154 - CONTROL "Always on top",IDC_ONTOP,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,13,18,128,10 - CONTROL "Tool style main window",IDC_TOOLWND,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,13,32,128,10 - CONTROL "Minimize to tray",IDC_MIN2TRAY,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,13,46,128,10 - CONTROL "Hide contact list after it has been idle for", - IDC_AUTOHIDE,"Button",BS_AUTOCHECKBOX | BS_TOP | - BS_MULTILINE | WS_TABSTOP,141,18,162,10 + CONTROL "Always on top",IDC_ONTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,18,128,10 + CONTROL "Tool style main window",IDC_TOOLWND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,32,128,10 + CONTROL "Minimize to tray",IDC_MIN2TRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,46,128,10 + CONTROL "Hide contact list after it has been idle for",IDC_AUTOHIDE, + "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,141,18,162,10 EDITTEXT IDC_HIDETIME,151,33,30,12,ES_RIGHT | ES_NUMBER - CONTROL "Spin1",IDC_HIDETIMESPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | - UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,172,32,10, - 14 + CONTROL "Spin1",IDC_HIDETIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,172,32,10,14 LTEXT "seconds",IDC_STATIC01,186,35,56,8 - CONTROL "Automatically resize window to height of list", - IDC_AUTOSIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,141, - 55,162,10 + CONTROL "Automatically resize window to height of list",IDC_AUTOSIZE, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,141,55,162,10 LTEXT "maximum",IDC_STATIC21,151,71,45,8 - EDITTEXT IDC_MAXSIZEHEIGHT,197,69,31,12,ES_RIGHT | ES_AUTOHSCROLL | - ES_NUMBER - CONTROL "Spin1",IDC_MAXSIZESPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | - UDS_ARROWKEYS | UDS_HOTTRACK,218,68,10,14 + EDITTEXT IDC_MAXSIZEHEIGHT,197,69,31,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER + CONTROL "Spin1",IDC_MAXSIZESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_HOTTRACK,218,68,10,14 LTEXT "% of screen",IDC_STATIC22,230,71,69,8 - CONTROL "Size upwards",IDC_AUTOSIZEUPWARD,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,151,86,147,10 + CONTROL "Size upwards",IDC_AUTOSIZEUPWARD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,86,147,10 LTEXT "Title bar text:",IDC_STATIC,12,106,51,8 - GROUPBOX "Translucency options (Windows 2000/XP only)",IDC_STATIC, - 4,161,305,80 - CONTROL "Fade contact list in/out",IDC_FADEINOUT,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,13,174,163,10 - CONTROL "Transparent contact list",IDC_TRANSPARENT,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,13,191,151,9 + GROUPBOX "Translucency options (Windows 2000/XP only)",IDC_STATIC,4,161,305,80 + CONTROL "Fade contact list in/out",IDC_FADEINOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,174,163,10 + CONTROL "Transparent contact list",IDC_TRANSPARENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,191,151,9 LTEXT "Inactive opacity:",IDC_STATIC11,23,206,89,8 - CONTROL "Slider2",IDC_TRANSINACTIVE,"msctls_trackbar32",TBS_TOP | - TBS_NOTICKS | WS_TABSTOP,112,205,130,11 + CONTROL "Slider2",IDC_TRANSINACTIVE,"msctls_trackbar32",TBS_TOP | TBS_NOTICKS | WS_TABSTOP,112,205,130,11 LTEXT "Active opacity:",IDC_STATIC12,23,221,89,8 - CONTROL "Slider2",IDC_TRANSACTIVE,"msctls_trackbar32",TBS_TOP | - TBS_NOTICKS | WS_TABSTOP,112,221,130,11 + CONTROL "Slider2",IDC_TRANSACTIVE,"msctls_trackbar32",TBS_TOP | TBS_NOTICKS | WS_TABSTOP,112,221,130,11 LTEXT "000%",IDC_INACTIVEPERC,246,206,29,8,SS_NOPREFIX LTEXT "000%",IDC_ACTIVEPERC,246,222,29,8,SS_NOPREFIX - CONTROL "Show menu bar",IDC_SHOWMAINMENU,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,13,60,128,10 - CONTROL "Easy move",IDC_CLIENTDRAG,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,13,74,128,10 - CONTROL "Show title bar",IDC_SHOWCAPTION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,13,88,128,10 - CONTROL "If window is partially covered, bring to front instead of hiding", - IDC_BRINGTOFRONT,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | - WS_TABSTOP,141,102,162,16 + CONTROL "Show menu bar",IDC_SHOWMAINMENU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,60,128,10 + CONTROL "Easy move",IDC_CLIENTDRAG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,74,128,10 + CONTROL "Show title bar",IDC_SHOWCAPTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,88,128,10 + CONTROL "If window is partially covered, bring to front instead of hiding",IDC_BRINGTOFRONT, + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,141,102,162,16 EDITTEXT IDC_TITLETEXT,63,104,72,12,ES_AUTOHSCROLL CONTROL "Show drop shadow (restart required)",IDC_DROPSHADOW, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,122,138,10 - CONTROL "Pin to desktop",IDC_ONDESKTOP,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,13,137,128,10 + CONTROL "Pin to desktop",IDC_ONDESKTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,137,128,10 END IDD_OPT_CLC DIALOGEX 0, 0, 314, 242 -STYLE DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Items",IDC_STATIC,2,2,310,88 LTEXT "'Hide Offline' means to hide:",IDC_STATIC,191,10,112,8 - CONTROL "Tree1",IDC_HIDEOFFLINEOPTS,"SysTreeView32", - TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_NONEVENHEIGHT | - WS_BORDER | WS_TABSTOP,191,20,112,63 + CONTROL "Tree1",IDC_HIDEOFFLINEOPTS,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_NONEVENHEIGHT | WS_BORDER | WS_TABSTOP,191,20,112,63 GROUPBOX "Groups",IDC_STATIC,2,93,310,67 - CONTROL "Show counts of number of contacts in a group", - IDC_SHOWGROUPCOUNTS,"Button",BS_AUTOCHECKBOX | - BS_MULTILINE | WS_TABSTOP,11,106,292,11 - CONTROL "Hide group counts when there are none online", - IDC_HIDECOUNTSWHENEMPTY,"Button",BS_AUTOCHECKBOX | - BS_MULTILINE | WS_TABSTOP,11,119,292,11 - CONTROL "Sort groups alphabetically",IDC_SORTGROUPSALPHA,"Button", - BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,132,131, - 11 + CONTROL "Show counts of number of contacts in a group",IDC_SHOWGROUPCOUNTS, + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,106,292,11 + CONTROL "Hide group counts when there are none online",IDC_HIDECOUNTSWHENEMPTY, + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,119,292,11 + CONTROL "Sort groups alphabetically",IDC_SORTGROUPSALPHA,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,132,131,11 CONTROL "Quicksearch in open groups only",IDC_QUICKSEARCHVISONLY, - "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11, - 145,131,11 + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,145,131,11 GROUPBOX "Templates",IDC_STATIC,2,163,310,77 LTEXT "Contact:",IDC_STATIC,11,178,42,10 EDITTEXT IDC_T_CONTACT,57,176,246,13,ES_AUTOHSCROLL @@ -232,29 +162,21 @@ BEGIN END IDD_OPT_SBAR DIALOGEX 0, 0, 178, 212 -STYLE DS_FIXEDSYS | DS_CENTER | WS_CHILD +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Status Bar",IDC_STATIC,4,4,170,204 - CONTROL "Show status bar",IDC_SHOWSBAR,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,12,17,152,10 - CONTROL "Show icons",IDC_SHOWICON,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,22,33,142,10 - CONTROL "Show protocol names",IDC_SHOWPROTO,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,22,48,142,10 - CONTROL "Show status text",IDC_SHOWSTATUS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,22,63,142,10 - CONTROL "Right click opens status menu",IDC_RIGHTSTATUS,"Button", - BS_AUTORADIOBUTTON,22,160,142,10 + CONTROL "Show status bar",IDC_SHOWSBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,17,152,10 + CONTROL "Show icons",IDC_SHOWICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,33,142,10 + CONTROL "Show protocol names",IDC_SHOWPROTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,48,142,10 + CONTROL "Show status text",IDC_SHOWSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,63,142,10 + CONTROL "Right click opens status menu",IDC_RIGHTSTATUS,"Button",BS_AUTORADIOBUTTON,22,160,142,10 CONTROL "Right click opens Miranda NG menu",IDC_RIGHTMIRANDA, "Button",BS_AUTORADIOBUTTON,22,147,142,10 - CONTROL "Make sections equal width",IDC_EQUALSECTIONS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,22,78,142,10 - CONTROL "Show bevels on panels",IDC_SBPANELBEVEL,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,22,94,107,10 - CONTROL "Show resize grip indicator",IDC_SHOWGRIP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,22,110,96,10 + CONTROL "Make sections equal width",IDC_EQUALSECTIONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,78,142,10 + CONTROL "Show bevels on panels",IDC_SBPANELBEVEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,94,107,10 + CONTROL "Show resize grip indicator",IDC_SHOWGRIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,110,96,10 END @@ -264,7 +186,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO MOVEABLE PURE +GUIDELINES DESIGNINFO BEGIN IDD_DELETECONTACT, DIALOG BEGIN @@ -348,20 +270,19 @@ END // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN - "resource.h\0" + "..\\src\\resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN - "#include \r\n" "#include \r\n" "#include \r\n" "\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\n" "\0" @@ -377,25 +298,25 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_RENAME ICON DISCARDABLE "res\\rename.ico" -IDI_BLANK ICON DISCARDABLE "res\\blank.ico" -IDI_DELETE ICON DISCARDABLE "res\\delete.ico" +IDI_RENAME ICON "rename.ico" +IDI_BLANK ICON "..\\..\\..\\src\\res\\_blank.ico" +IDI_DELETE ICON "delete.ico" ///////////////////////////////////////////////////////////////////////////// // // Cursor // -IDC_HYPERLINKHAND CURSOR DISCARDABLE "res\\hyperlin.cur" -IDC_DROP CURSOR DISCARDABLE "res\\dragcopy.cur" -IDC_DROPUSER CURSOR DISCARDABLE "res\\dropuser.cur" +IDC_HYPERLINKHAND CURSOR "..\\..\\..\\src\\res\\cursor_hyperlink.cur" +IDC_DROP CURSOR "..\\..\\..\\src\\res\\cursor_drag_copy.cur" +IDC_DROPUSER CURSOR "..\\..\\..\\src\\res\\cursor_drop_user.cur" ///////////////////////////////////////////////////////////////////////////// // // Menu // -IDR_CLISTMENU MENU DISCARDABLE +IDR_CLISTMENU MENU BEGIN POPUP "&¤" BEGIN @@ -417,7 +338,7 @@ BEGIN END END -IDR_CONTEXT MENU DISCARDABLE +IDR_CONTEXT MENU BEGIN POPUP "Tray" BEGIN @@ -446,7 +367,7 @@ BEGIN END END -#endif // English (U.S.) resources +#endif // Русский (Россия) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/Clist_blind/src/Version.h b/plugins/Clist_blind/src/Version.h new file mode 100644 index 0000000000..3777609f59 --- /dev/null +++ b/plugins/Clist_blind/src/Version.h @@ -0,0 +1,14 @@ +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 8 +#define __RELEASE_NUM 0 +#define __BUILD_NUM 1 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM + +#define __PLUGIN_NAME "BClist" +#define __FILENAME "Clist_blind.dll" +#define __DESCRIPTION "A contact list for blind folks." +#define __AUTHOR "Ricardo Pescuma Domenecci, based on previous work from Miranda IM project" +#define __AUTHOREMAIL "" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "Copyright 2000-2009 Miranda IM project, Ricardo Pescuma Domenecci, 2013 Miranda NG project, George Hazan" diff --git a/plugins/Clist_blind/src/commonheaders.h b/plugins/Clist_blind/src/commonheaders.h index 9aef2da53b..7fe4329c30 100644 --- a/plugins/Clist_blind/src/commonheaders.h +++ b/plugins/Clist_blind/src/commonheaders.h @@ -21,46 +21,24 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define MIRANDA_VER 0x0A00 - #define _WIN32_WINNT 0x0600 #define _WIN32_IE 0x0501 -#include "m_stdhdr.h" - #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include "resource.h" #include -#include -#include #include #include -#include #include #include -#include #include -#include #include -#include -#include -#include -#include -#include -#include - #include +#include "resource.h" +#include "Version.h" + struct ClcContact : public ClcContactBase {}; struct ClcData : public ClcDataBase diff --git a/plugins/Clist_blind/src/init.cpp b/plugins/Clist_blind/src/init.cpp index 8146574a30..70fb9e2865 100644 --- a/plugins/Clist_blind/src/init.cpp +++ b/plugins/Clist_blind/src/init.cpp @@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "commonheaders.h" -#include int hLangpack; HINSTANCE g_hInst = 0; @@ -77,17 +76,17 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD dwReason, LPVOID reserved) // returns the plugin information PLUGININFOEX pluginInfo = { - sizeof(pluginInfo ), - "BClist", - PLUGIN_MAKE_VERSION(0, 8, 0, 1), - "A contact list for blind folks.", - "Ricardo Pescuma Domenecci, based on previous work from Miranda IM project", - "", - "Copyright 2000-2009 Miranda IM project, Ricardo Pescuma Domenecci, 2013 Miranda NG project, George Hazan", - "http://pescuma.org/miranda/bclist", + sizeof(pluginInfo), + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, UNICODE_AWARE, - // {53E095A3-2695-490a-9DAD-D20479093831} - { 0x53e095a3, 0x2695, 0x490a, { 0x9d, 0xad, 0xd2, 0x4, 0x79, 0x9, 0x38, 0x31 } } + // {53E095A3-2695-490A-9DAD-D20479093831} + {0x53e095a3, 0x2695, 0x490a, {0x9d, 0xad, 0xd2, 0x4, 0x79, 0x9, 0x38, 0x31}} }; extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion) diff --git a/plugins/Clist_blind/src/resource.h b/plugins/Clist_blind/src/resource.h index 03fef64694..1e2641be4e 100644 --- a/plugins/Clist_blind/src/resource.h +++ b/plugins/Clist_blind/src/resource.h @@ -148,7 +148,6 @@ #define POPUP_NEWGROUP 40050 #define POPUP_RENAMEGROUP 40052 #define POPUP_DELETEGROUP 40053 -#define IDC_STATIC -1 // Next default values for new objects // -- cgit v1.2.3