summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Volinsky <mataes2007@gmail.com>2013-02-10 14:54:43 +0000
committerKirill Volinsky <mataes2007@gmail.com>2013-02-10 14:54:43 +0000
commit864f900f46c6cf643fe44b413432cd47f2a23c90 (patch)
tree0310335b7fa73140a398105b671d590dbb3b801f
parent3267fed9ad218524f78b5bcbf9feb7348902b80b (diff)
added version info
git-svn-id: http://svn.miranda-ng.org/main/trunk@3531 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/Clist_mw/clist_mw_11.vcxproj18
-rw-r--r--plugins/Clist_mw/clist_mw_11.vcxproj.filters6
-rw-r--r--plugins/Clist_mw/res/Version.rc38
-rw-r--r--plugins/Clist_mw/res/blank.icobin1150 -> 0 bytes
-rw-r--r--plugins/Clist_mw/res/dragcopy.curbin326 -> 0 bytes
-rw-r--r--plugins/Clist_mw/res/dropuser.curbin1086 -> 0 bytes
-rw-r--r--plugins/Clist_mw/res/hyperlin.curbin326 -> 0 bytes
-rw-r--r--plugins/Clist_mw/res/resource.rc573
-rw-r--r--plugins/Clist_mw/src/Version.h14
-rw-r--r--plugins/Clist_mw/src/commonheaders.h36
-rw-r--r--plugins/Clist_mw/src/init.cpp19
-rw-r--r--plugins/Clist_mw/src/resource.h4
12 files changed, 258 insertions, 450 deletions
diff --git a/plugins/Clist_mw/clist_mw_11.vcxproj b/plugins/Clist_mw/clist_mw_11.vcxproj
index 681acba2d3..bd85afd6c9 100644
--- a/plugins/Clist_mw/clist_mw_11.vcxproj
+++ b/plugins/Clist_mw/clist_mw_11.vcxproj
@@ -77,7 +77,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;clist_mw_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>false</StringPooling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -90,7 +90,7 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -107,7 +107,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;clist_mw_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>false</StringPooling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -119,7 +119,7 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -138,7 +138,7 @@
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;clist_mw_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -150,7 +150,7 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -172,7 +172,7 @@
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;clist_mw_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -184,7 +184,7 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -241,9 +241,11 @@
<ClInclude Include="src\clist.h" />
<ClInclude Include="src\commonheaders.h" />
<ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\Version.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\resource.rc" />
+ <ResourceCompile Include="res\Version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Clist_mw/clist_mw_11.vcxproj.filters b/plugins/Clist_mw/clist_mw_11.vcxproj.filters
index 5127f25ac5..c117a63633 100644
--- a/plugins/Clist_mw/clist_mw_11.vcxproj.filters
+++ b/plugins/Clist_mw/clist_mw_11.vcxproj.filters
@@ -107,10 +107,16 @@
<ClInclude Include="src\CLUIFrames\cluiframes.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="src\Version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
+ <ResourceCompile Include="res\Version.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/plugins/Clist_mw/res/Version.rc b/plugins/Clist_mw/res/Version.rc
new file mode 100644
index 0000000000..5bfbab4754
--- /dev/null
+++ b/plugins/Clist_mw/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_mw/res/blank.ico b/plugins/Clist_mw/res/blank.ico
deleted file mode 100644
index d8a5b3d80d..0000000000
--- a/plugins/Clist_mw/res/blank.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/Clist_mw/res/dragcopy.cur b/plugins/Clist_mw/res/dragcopy.cur
deleted file mode 100644
index 89c7c960d5..0000000000
--- a/plugins/Clist_mw/res/dragcopy.cur
+++ /dev/null
Binary files differ
diff --git a/plugins/Clist_mw/res/dropuser.cur b/plugins/Clist_mw/res/dropuser.cur
deleted file mode 100644
index a84b19e28b..0000000000
--- a/plugins/Clist_mw/res/dropuser.cur
+++ /dev/null
Binary files differ
diff --git a/plugins/Clist_mw/res/hyperlin.cur b/plugins/Clist_mw/res/hyperlin.cur
deleted file mode 100644
index f0f548c828..0000000000
--- a/plugins/Clist_mw/res/hyperlin.cur
+++ /dev/null
Binary files differ
diff --git a/plugins/Clist_mw/res/resource.rc b/plugins/Clist_mw/res/resource.rc
index 4c2646ad27..4f72cbb8eb 100644
--- a/plugins/Clist_mw/res/resource.rc
+++ b/plugins/Clist_mw/res/resource.rc
@@ -8,19 +8,17 @@
// Generated from the TEXTINCLUDE 2 resource.
//
#include <winres.h>
-#include "statusmodes.h"
+#include <statusmodes.h>
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Russian resources
+// Русский (Россия) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
-#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
@@ -29,6 +27,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
+IDI_GLOBUS ICON "globus.ico"
IDI_SMS ICON "sms.ico"
IDI_ICQC1 ICON "1.ico"
IDI_ICQC2 ICON "2.ico"
@@ -40,6 +39,20 @@ IDI_ICQC7 ICON "7.ico"
IDI_ICQC8 ICON "8.ico"
IDI_EMAIL ICON "sendmail.ico"
IDI_NEWGROUP2 ICON "addgoupp.ico"
+IDI_RENAME ICON "rename.ico"
+IDI_DELETE ICON "delete.ico"
+IDI_NOTICK ICON "..\\..\\..\\src\\res\\check_off.ico"
+IDI_TICK ICON "..\\..\\..\\src\\res\\check_on.ico"
+IDI_BLANK ICON "..\\..\\..\\src\\res\\_blank.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Cursor
+//
+
+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"
/////////////////////////////////////////////////////////////////////////////
//
@@ -52,123 +65,55 @@ EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Settings",IDC_STATIC,4,19,226,141
- LTEXT "Background colour:",IDC_BC_STATIC,12,35,72,8,NOT
- WS_GROUP
+ LTEXT "Background colour:",IDC_BC_STATIC,12,35,72,8,NOT WS_GROUP
CONTROL "",IDC_BKGCOLOUR,"ColourPicker",WS_TABSTOP,84,34,32,10
LTEXT "Selection colour:",IDC_SC_STATIC,12,51,72,8
CONTROL "",IDC_SELCOLOUR,"ColourPicker",WS_TABSTOP,84,50,32,10
- CONTROL "Use background bitmap",IDC_BITMAP,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,12,68,161,10
+ CONTROL "Use background bitmap",IDC_BITMAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,68,161,10
EDITTEXT IDC_FILENAME,22,82,184,12,ES_AUTOHSCROLL
PUSHBUTTON "...",IDC_BROWSE,208,82,15,11
- CONTROL "Stretch to width",IDC_STRETCHH,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,22,99,98,10
- CONTROL "Stretch to height",IDC_STRETCHV,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,121,99,101,10
- CONTROL "Tile horizontally",IDC_TILEH,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,22,112,98,10
- CONTROL "Tile vertically",IDC_TILEV,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,22,125,98,10
- CONTROL "Scroll with text",IDC_SCROLL,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,121,125,100,10
- CONTROL "Stretch proportionally",IDC_PROPORTIONAL,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,121,112,101,10
+ CONTROL "Stretch to width",IDC_STRETCHH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,99,98,10
+ CONTROL "Stretch to height",IDC_STRETCHV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,121,99,101,10
+ CONTROL "Tile horizontally",IDC_TILEH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,112,98,10
+ CONTROL "Tile vertically",IDC_TILEV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,125,98,10
+ CONTROL "Scroll with text",IDC_SCROLL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,121,125,100,10
+ CONTROL "Stretch proportionally",IDC_PROPORTIONAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,121,112,101,10
CONTROL "Tile vertically according to Row Height",IDC_TILEVROWH,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,140,205,10
- COMBOBOX IDC_BKGRLIST,4,5,226,155,CBS_DROPDOWNLIST | CBS_SORT |
- WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_BKGRLIST,4,5,226,155,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
END
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
- IDD_OPT_CLCBKG2, DIALOG
- BEGIN
- BOTTOMMARGIN, 149
- END
-END
-#endif // APSTUDIO_INVOKED
-
-#endif // Russian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// 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
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_GLOBUS ICON "globus.ico"
-IDI_RENAME ICON "rename.ico"
-IDI_DELETE ICON "delete.ico"
-IDI_NOTICK ICON "notick.ico"
-IDI_TICK ICON "notick1.ico"
-IDI_BLANK ICON "blank.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
IDD_OPT_GENMENU DIALOGEX 0, 0, 306, 241
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "Tree1",IDC_MENUITEMS,"SysTreeView32",TVS_SHOWSELALWAYS |
- WS_DISABLED | WS_BORDER | WS_TABSTOP,155,15,134,200
- CONTROL "Tree2",IDC_MENUOBJECTS,"SysTreeView32",
- TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,10,15,119,80
- LTEXT "Warning!\r\nThis MenuObject not support user defined options.",
- IDC_NOTSUPPORTWARNING,10,110,130,31,NOT WS_VISIBLE
+ CONTROL "Tree1",IDC_MENUITEMS,"SysTreeView32",TVS_SHOWSELALWAYS | WS_DISABLED | WS_BORDER | WS_TABSTOP,155,15,134,200
+ CONTROL "Tree2",IDC_MENUOBJECTS,"SysTreeView32",TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,10,15,119,80
+ LTEXT "Warning!\r\nThis MenuObject not support user defined options.",IDC_NOTSUPPORTWARNING,10,110,130,31,NOT WS_VISIBLE
GROUPBOX "MenuObjects",IDC_STATIC,5,5,133,95
GROUPBOX "MenuItems",IDC_STATIC,148,5,147,215
- PUSHBUTTON "InsertSeparator",IDC_INSERTSEPARATOR,90,146,54,14,
- WS_DISABLED
+ PUSHBUTTON "InsertSeparator",IDC_INSERTSEPARATOR,90,146,54,14,WS_DISABLED
LTEXT "Service:",IDC_STATIC,0,166,27,8
- EDITTEXT IDC_GENMENU_SERVICE,29,164,115,14,ES_AUTOHSCROLL |
- WS_DISABLED
+ EDITTEXT IDC_GENMENU_SERVICE,29,164,115,14,ES_AUTOHSCROLL | WS_DISABLED
LTEXT "Name:",IDC_STATIC,0,183,28,8
- EDITTEXT IDC_GENMENU_CUSTOMNAME,29,180,116,14,ES_AUTOHSCROLL |
- WS_DISABLED
+ EDITTEXT IDC_GENMENU_CUSTOMNAME,29,180,116,14,ES_AUTOHSCROLL | WS_DISABLED
PUSHBUTTON "Set",IDC_GENMENU_SET,128,196,17,14,WS_DISABLED
PUSHBUTTON "Default",IDC_GENMENU_DEFAULT,77,196,43,14,WS_DISABLED
END
IDD_DELETECONTACT DIALOGEX 0, 0, 284, 90
-STYLE DS_SETFONT | 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
DEFPUSHBUTTON "No",IDNO,162,38,65,14
PUSHBUTTON "Yes",IDYES,54,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 "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 "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 "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
END
IDD_OPT_CLIST DIALOGEX 0, 0, 314, 232
@@ -176,85 +121,48 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
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 "Always on top",IDC_ONTOP,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,10,84,124,10
- CONTROL "Hide contact list after it has been idle for",
- IDC_AUTOHIDE,"Button",BS_AUTOCHECKBOX | BS_TOP |
- BS_MULTILINE | WS_TABSTOP,10,100,124,22
+ 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 "Always on top",IDC_ONTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,84,124,10
+ CONTROL "Hide contact list after it has been idle for",IDC_AUTOHIDE,
+ "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,10,100,124,22
EDITTEXT IDC_HIDETIME,54,109,30,12,ES_RIGHT | ES_NUMBER
- CONTROL "Spin1",IDC_HIDETIMESPIN,"msctls_updown32",
- UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
- UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,75,108,10,
- 14
+ CONTROL "Spin1",IDC_HIDETIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,75,108,10,14
LTEXT "seconds",IDC_STAUTOHIDESECS,87,111,47,8
- CONTROL "Sort contacts by name",IDC_SORTBYNAME,"Button",
- BS_AUTORADIOBUTTON | WS_GROUP,153,14,87,10
- CONTROL "Sort contacts by status",IDC_SORTBYSTATUS,"Button",
- BS_AUTORADIOBUTTON,153,38,89,10
- CONTROL "Sort contacts by protocol",IDC_SORTBYPROTO,"Button",
- BS_AUTORADIOBUTTON,153,51,151,10
- CONTROL "Single click interface",IDC_ONECLK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,151,82,150,10
- CONTROL "Always show status in tooltip",IDC_ALWAYSSTATUS,"Button",
- BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,151,
- 95,151,11
- CONTROL "Disable icon blinking",IDC_DISABLEBLINK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,151,108,86,9
+ CONTROL "Sort contacts by name",IDC_SORTBYNAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,153,14,87,10
+ CONTROL "Sort contacts by status",IDC_SORTBYSTATUS,"Button",BS_AUTORADIOBUTTON,153,38,89,10
+ CONTROL "Sort contacts by protocol",IDC_SORTBYPROTO,"Button",BS_AUTORADIOBUTTON,153,51,151,10
+ CONTROL "Single click interface",IDC_ONECLK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,82,150,10
+ CONTROL "Always show status in tooltip",IDC_ALWAYSSTATUS,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,151,95,151,11
+ CONTROL "Disable icon blinking",IDC_DISABLEBLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,108,86,9
EDITTEXT IDC_BLINKTIME,153,122,35,12,ES_NUMBER
- LTEXT "ms, delay between icon blinking",IDC_STATIC,203,124,102,
- 8
- CONTROL "Show",IDC_DONTCYCLE,"Button",BS_AUTORADIOBUTTON |
- WS_GROUP,10,155,97,10
- COMBOBOX IDC_PRIMARYSTATUS,107,153,78,70,CBS_DROPDOWNLIST |
- WS_VSCROLL | WS_TABSTOP
- LTEXT "icon when statuses differ",IDC_STATIC,189,155,116,8,NOT
- WS_GROUP
- CONTROL "Cycle icons every",IDC_CYCLE,"Button",
- BS_AUTORADIOBUTTON,10,170,97,10
+ LTEXT "ms, delay between icon blinking",IDC_STATIC,203,124,102,8
+ CONTROL "Show",IDC_DONTCYCLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,155,97,10
+ COMBOBOX IDC_PRIMARYSTATUS,107,153,78,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ LTEXT "icon when statuses differ",IDC_STATIC,189,155,116,8,NOT WS_GROUP
+ CONTROL "Cycle icons every",IDC_CYCLE,"Button",BS_AUTORADIOBUTTON,10,170,97,10
EDITTEXT IDC_CYCLETIME,107,170,30,12,ES_RIGHT | ES_NUMBER
- CONTROL "Spin1",IDC_CYCLETIMESPIN,"msctls_updown32",
- UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
- UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,137,168,
- 11,14
- LTEXT "seconds, when statuses differ",IDC_STATIC,154,172,151,8,
- NOT WS_GROUP
- CONTROL "Show multiple icons",IDC_MULTITRAY,"Button",
- BS_AUTORADIOBUTTON,9,184,98,10
- CONTROL "Only when statuses differ",IDC_ALWAYSMULTI,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,107,184,198,10
+ CONTROL "Spin1",IDC_CYCLETIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,137,168,11,14
+ LTEXT "seconds, when statuses differ",IDC_STATIC,154,172,151,8,NOT WS_GROUP
+ CONTROL "Show multiple icons",IDC_MULTITRAY,"Button",BS_AUTORADIOBUTTON,9,184,98,10
+ CONTROL "Only when statuses differ",IDC_ALWAYSMULTI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,184,198,10
GROUPBOX "Contact List",IDC_STCLISTGROUP,2,2,135,139
GROUPBOX "System tray icon",IDC_STATIC,143,71,169,70
- GROUPBOX "System tray icon when using multiple protocols",
- IDC_STATIC,2,142,310,57
+ GROUPBOX "System tray icon when using multiple protocols",IDC_STATIC,2,142,310,57
GROUPBOX "Contact List Sorting",IDC_STATIC,143,2,169,69,WS_GROUP
- CONTROL "Spin5",IDC_BLINKSPIN,"msctls_updown32",UDS_SETBUDDYINT |
- UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS |
- UDS_HOTTRACK,177,109,11,12
+ CONTROL "Spin5",IDC_BLINKSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,177,109,11,12
CONTROL "Dont move offline user to bottom",IDC_NOOFFLINEMOVE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,26,131,10
- CONTROL "Pin to desktop",IDC_ONDESKTOP,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,10,120,125,15
- CONTROL "Disable icon blinking",IDC_ICONBLINK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,10,84,97,10
-
+ CONTROL "Pin to desktop",IDC_ONDESKTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,120,125,15
+ CONTROL "Disable icon blinking",IDC_ICONBLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,84,97,10
GROUPBOX "Rows",IDC_STATIC,2,199,174,31
LTEXT "Row height:",IDC_STATIC,10,213,65,8
EDITTEXT IDC_ROWHEIGHT,77,211,31,12,ES_RIGHT | ES_NUMBER
- CONTROL "Spin1",IDC_ROWHEIGHTSPIN,"msctls_updown32",
- UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
- UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,97,210,10,14
+ CONTROL "Spin1",IDC_ROWHEIGHTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,97,210,10,14
LTEXT "pixels",IDC_STATIC,112,213,62,8
-
- CONTROL "Gamma correction",IDC_GAMMACORRECT,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,180,211,95,10
+ CONTROL "Gamma correction",IDC_GAMMACORRECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,180,211,95,10
END
IDD_OPT_CLUI DIALOGEX 0, 0, 314, 232
@@ -263,57 +171,36 @@ EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Window",IDC_STWINDOWGROUP,4,4,305,121
- 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,130,191,80
- CONTROL "Fade contact list in/out",IDC_FADEINOUT,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,13,140,163,10
- CONTROL "Transparent contact list",IDC_TRANSPARENT,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,13,152,151,9
+ GROUPBOX "Translucency options (Windows 2000/XP only)",IDC_STATIC,4,130,191,80
+ CONTROL "Fade contact list in/out",IDC_FADEINOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,140,163,10
+ CONTROL "Transparent contact list",IDC_TRANSPARENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,152,151,9
LTEXT "Inactive opacity:",IDC_STATIC11,23,165,67,8
- CONTROL "Slider2",IDC_TRANSINACTIVE,"msctls_trackbar32",TBS_TOP |
- TBS_NOTICKS | WS_TABSTOP,95,164,70,11
+ CONTROL "Slider2",IDC_TRANSINACTIVE,"msctls_trackbar32",TBS_TOP | TBS_NOTICKS | WS_TABSTOP,95,164,70,11
LTEXT "Active opacity:",IDC_STATIC12,23,181,67,8
- CONTROL "Slider2",IDC_TRANSACTIVE,"msctls_trackbar32",TBS_TOP |
- TBS_NOTICKS | WS_TABSTOP,95,179,70,11
+ CONTROL "Slider2",IDC_TRANSACTIVE,"msctls_trackbar32",TBS_TOP | TBS_NOTICKS | WS_TABSTOP,95,179,70,11
LTEXT "000%",IDC_INACTIVEPERC,165,164,25,8,SS_NOPREFIX
LTEXT "000%",IDC_ACTIVEPERC,165,184,25,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 "Enable drop shadow (restart required)",IDC_DROPSHADOW,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,194,138,10
@@ -325,75 +212,48 @@ EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Items",IDC_STATIC,2,2,310,114
- CONTROL "Show divider between online and offline contacts",
- IDC_DIVIDERONOFF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
- 11,13,179,10
+ CONTROL "Show divider between online and offline contacts",IDC_DIVIDERONOFF,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,13,179,10
CONTROL "Hot track items as mouse passes over",IDC_TRACKSELECT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,28,179,10
CONTROL "Disable drag and drop of items",IDC_DISABLEDRAGDROP,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,43,179,10
- CONTROL "Disable rename of items by clicking twice",
- IDC_NOTEDITLABELS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
- 11,58,179,10
- CONTROL "Show selection even when list is not focused",
- IDC_SHOWSELALWAYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
- 11,73,179,10
- CONTROL "Make selection highlight translucent",
- IDC_NOTNOTRANSLUCENTSEL,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,11,88,179,10
+ CONTROL "Disable rename of items by clicking twice",IDC_NOTEDITLABELS,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,58,179,10
+ CONTROL "Show selection even when list is not focused",IDC_SHOWSELALWAYS,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,73,179,10
+ CONTROL "Make selection highlight translucent",IDC_NOTNOTRANSLUCENTSEL,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,88,179,10
LTEXT "'Hide Offline' means to hide:",IDC_STATIC,191,10,112,8
- CONTROL "Tree1",IDC_HIDEOFFLINEOPTS,"SysTreeView32",
- TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | WS_BORDER |
- WS_TABSTOP | 0x4000,191,20,112,80
+ CONTROL "Tree1",IDC_HIDEOFFLINEOPTS,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_NONEVENHEIGHT | WS_BORDER | WS_TABSTOP,191,20,112,80
GROUPBOX "Groups",IDC_STATIC,2,120,148,121
CONTROL "Draw a line alongside group names",IDC_LINEWITHGROUPS,
- "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,
- 129,131,16
- CONTROL "Show counts of number of contacts in a group",
- IDC_SHOWGROUPCOUNTS,"Button",BS_AUTOCHECKBOX |
- BS_MULTILINE | WS_TABSTOP,11,147,131,16
- CONTROL "Hide group counts when there are none online",
- IDC_HIDECOUNTSWHENEMPTY,"Button",BS_AUTOCHECKBOX |
- BS_MULTILINE | WS_TABSTOP,11,165,131,16
- CONTROL "Sort groups alphabetically",IDC_SORTGROUPSALPHA,"Button",
- BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,183,131,
- 16
+ "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,129,131,16
+ CONTROL "Show counts of number of contacts in a group",IDC_SHOWGROUPCOUNTS,
+ "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,147,131,16
+ CONTROL "Hide group counts when there are none online",IDC_HIDECOUNTSWHENEMPTY,
+ "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,165,131,16
+ CONTROL "Sort groups alphabetically",IDC_SORTGROUPSALPHA,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,183,131,16
CONTROL "Quicksearch in open groups only",IDC_QUICKSEARCHVISONLY,
- "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,
- 201,131,16
+ "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,201,131,16
LTEXT "Indent groups by:",IDC_STATIC,11,221,67,8
EDITTEXT IDC_GROUPINDENT,78,219,31,12,ES_RIGHT | ES_NUMBER
- CONTROL "Spin1",IDC_GROUPINDENTSPIN,"msctls_updown32",
- UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
- UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,95,215,10,
- 14
+ CONTROL "Spin1",IDC_GROUPINDENTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,95,215,10,14
LTEXT "pixels",IDC_STATIC,112,221,36,8
GROUPBOX "Visual",IDC_STATIC,156,120,156,121
- CONTROL "Scroll list smoothly",IDC_NOTNOSMOOTHSCROLLING,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,164,130,139,10
+ CONTROL "Scroll list smoothly",IDC_NOTNOSMOOTHSCROLLING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,130,139,10
LTEXT "Time:",IDC_STATIC11,174,144,42,8
EDITTEXT IDC_SMOOTHTIME,216,142,31,12,ES_RIGHT | ES_NUMBER
- CONTROL "Spin1",IDC_SMOOTHTIMESPIN,"msctls_updown32",
- UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
- UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,237,137,
- 10,14
+ CONTROL "Spin1",IDC_SMOOTHTIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,237,137,10,14
LTEXT "milliseconds",IDC_STATIC12,250,140,56,8,SS_CENTERIMAGE
LTEXT "Left margin:",IDC_STATIC,165,180,52,8
EDITTEXT IDC_LEFTMARGIN,215,180,31,12,ES_RIGHT | ES_NUMBER
- CONTROL "Spin1",IDC_LEFTMARGINSPIN,"msctls_updown32",
- UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
- UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,240,180,
- 10,14
+ CONTROL "Spin1",IDC_LEFTMARGINSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,240,180,10,14
LTEXT "pixels",IDC_STATIC,250,180,54,8
- CONTROL "Grey out entire list when:",IDC_GREYOUT,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,165,195,139,10
- CONTROL "Tree1",IDC_GREYOUTOPTS,"SysTreeView32",
- TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | WS_BORDER |
- WS_TABSTOP | 0x4000,165,205,139,30
- CONTROL "Dim idle contacts",IDC_IDLE,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,11,102,153,10
- CONTROL "Hide vertical scrollbar",IDC_NOSCROLLBAR,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,165,160,140,10
+ CONTROL "Grey out entire list when:",IDC_GREYOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,195,139,10
+ CONTROL "Tree1",IDC_GREYOUTOPTS,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_NONEVENHEIGHT | WS_BORDER | WS_TABSTOP,165,205,139,30
+ CONTROL "Dim idle contacts",IDC_IDLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,102,153,10
+ CONTROL "Hide vertical scrollbar",IDC_NOSCROLLBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,160,140,10
END
IDD_OPT_CLCBKG DIALOGEX 0, 0, 235, 151
@@ -406,22 +266,15 @@ BEGIN
CONTROL "",IDC_BKGCOLOUR,"ColourPicker",WS_TABSTOP,84,19,32,10
LTEXT "Selection colour:",IDC_STATIC,12,36,72,8
CONTROL "",IDC_SELCOLOUR,"ColourPicker",WS_TABSTOP,84,35,32,10
- CONTROL "Use background bitmap",IDC_BITMAP,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,12,53,161,10
+ CONTROL "Use background bitmap",IDC_BITMAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,53,161,10
EDITTEXT IDC_FILENAME,22,67,184,12,ES_AUTOHSCROLL
PUSHBUTTON "...",IDC_BROWSE,208,67,15,11
- CONTROL "Stretch to width",IDC_STRETCHH,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,22,84,100,10
- CONTROL "Stretch to height",IDC_STRETCHV,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,121,84,101,10
- CONTROL "Tile horizontally",IDC_TILEH,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,22,97,93,10
- CONTROL "Tile vertically",IDC_TILEV,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,22,110,85,10
- CONTROL "Scroll with text",IDC_SCROLL,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,121,110,100,10
- CONTROL "Stretch proportionally",IDC_PROPORTIONAL,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,121,97,101,10
+ CONTROL "Stretch to width",IDC_STRETCHH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,84,100,10
+ CONTROL "Stretch to height",IDC_STRETCHV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,121,84,101,10
+ CONTROL "Tile horizontally",IDC_TILEH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,97,93,10
+ CONTROL "Tile vertically",IDC_TILEV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,110,85,10
+ CONTROL "Scroll with text",IDC_SCROLL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,121,110,100,10
+ CONTROL "Stretch proportionally",IDC_PROPORTIONAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,121,97,101,10
CONTROL "Tile vertically according to Row Height",IDC_TILEVROWH,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,125,205,10
END
@@ -433,19 +286,38 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "Use 'Meta' protocol icons for Metacontacts",IDC_META,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,13,233,10
- CONTROL "Avoid doubleclick expand",IDC_METADBLCLK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,11,29,233,10
- CONTROL "Hide all 'Extra icons' for subcontacts",
- IDC_METASUBEXTRA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
- 11,45,233,10
+ CONTROL "Avoid doubleclick expand",IDC_METADBLCLK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,29,233,10
+ CONTROL "Hide all 'Extra icons' for subcontacts",IDC_METASUBEXTRA,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,45,233,10
GROUPBOX "MetaContacts supporting",-1,2,2,252,90
- CONTROL "Ignore Empty Extra icons places (arrange to right).",
- IDC_METASUBEXTRA_IGN,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,11,75,233,10
+ CONTROL "Ignore Empty Extra icons places (arrange to right).",IDC_METASUBEXTRA_IGN,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,75,233,10
CONTROL "Hide offline subcontacts.",IDC_METASUB_HIDEOFFLINE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,60,233,10
END
+IDD_OPT_SBAR DIALOGEX 0, 0, 178, 211
+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,201
+ 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,20,35,142,10
+ CONTROL "Show protocol names",IDC_SHOWPROTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,47,142,10
+ CONTROL "Show status text",IDC_SHOWSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,59,142,10
+ CONTROL "Right click opens status menu",IDC_RIGHTSTATUS,"Button",BS_AUTORADIOBUTTON,20,111,142,10
+ CONTROL "Right click opens Miranda menu",IDC_RIGHTMIRANDA,"Button",BS_AUTORADIOBUTTON,20,122,142,10
+ CONTROL "Make sections equal width",IDC_EQUALSECTIONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,141,142,10
+ CONTROL "",IDC_BKGCOLOUR,"ColourPicker",WS_TABSTOP,100,175,32,10
+ LTEXT "Background colour:",IDC_STATIC,20,175,72,8,NOT WS_GROUP
+ PUSHBUTTON "-",IDC_DEFBKCOLOR,135,175,6,10
+ CONTROL "Show size grip",IDC_SHOWSIZEGRIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,72,142,10
+ CONTROL "Show bevel effect on panels",IDC_SBPANELBEVEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,86,107,10
+ CONTROL "Use connecting Icon",IDC_USECONNECTINGICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,97,82,10
+ CONTROL "Use New Drawer for StatusBar",IDC_USEOWNERDRAW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,160,142,10
+END
+
/////////////////////////////////////////////////////////////////////////////
//
@@ -453,8 +325,13 @@ END
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
+GUIDELINES DESIGNINFO
BEGIN
+ IDD_OPT_CLCBKG2, DIALOG
+ BEGIN
+ BOTTOMMARGIN, 149
+ END
+
IDD_DELETECONTACT, DIALOG
BEGIN
LEFTMARGIN, 7
@@ -536,6 +413,19 @@ BEGIN
TOPMARGIN, 2
BOTTOMMARGIN, 92
END
+
+ IDD_OPT_SBAR, DIALOG
+ BEGIN
+ LEFTMARGIN, 4
+ RIGHTMARGIN, 174
+ VERTGUIDE, 12
+ VERTGUIDE, 22
+ VERTGUIDE, 164
+ TOPMARGIN, 4
+ BOTTOMMARGIN, 207
+ HORZGUIDE, 33
+ HORZGUIDE, 73
+ END
END
#endif // APSTUDIO_INVOKED
@@ -553,9 +443,8 @@ END
2 TEXTINCLUDE
BEGIN
- "#include <windows.h>\r\n"
"#include <winres.h>\r\n"
- "#include ""statusmodes.h""\r\n"
+ "#include <statusmodes.h>\r\n"
"\0"
END
@@ -570,19 +459,10 @@ END
/////////////////////////////////////////////////////////////////////////////
//
-// Cursor
-//
-
-IDC_HYPERLINKHAND CURSOR "hyperlin.cur"
-IDC_DROP CURSOR "dragcopy.cur"
-IDC_DROPUSER CURSOR "dropuser.cur"
-
-/////////////////////////////////////////////////////////////////////////////
-//
// Menu
//
-IDR_CLISTMENU MENU
+IDR_CLISTMENU MENU
BEGIN
POPUP "&¤"
BEGIN
@@ -604,7 +484,7 @@ BEGIN
END
END
-IDR_CONTEXT MENU
+IDR_CONTEXT MENU
BEGIN
POPUP "Tray"
BEGIN
@@ -633,122 +513,7 @@ BEGIN
END
END
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,3,4,0
- PRODUCTVERSION 0,3,4,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "000004b0"
- BEGIN
- VALUE "Comments", "Licensed under the terms of the GNU General Public License"
- VALUE "CompanyName", " "
- VALUE "FileDescription", "Miranda NG Contact List"
- VALUE "FileVersion", "0.3.4 alpha"
- VALUE "InternalName", "mwclist"
- VALUE "LegalCopyright", "Copyright © 2000-2006 Richard Hughes, Roland Rabien, Tristan Van de Vreede, Martin Oberg, Robert Rainwater, Sam Kothari and Lyon Lim"
- VALUE "OriginalFilename", "mwclist.dll"
- VALUE "ProductName", "Miranda NG Contact List"
- VALUE "ProductVersion", "0.3.4 alpha"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x0, 1200
- END
-END
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (Canada) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENC)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_OPT_SBAR DIALOGEX 0, 0, 178, 211
-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,201
- 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,20,35,142,10
- CONTROL "Show protocol names",IDC_SHOWPROTO,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,20,47,142,10
- CONTROL "Show status text",IDC_SHOWSTATUS,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,20,59,142,10
- CONTROL "Right click opens status menu",IDC_RIGHTSTATUS,"Button",
- BS_AUTORADIOBUTTON,20,111,142,10
- CONTROL "Right click opens Miranda menu",IDC_RIGHTMIRANDA,"Button",
- BS_AUTORADIOBUTTON,20,122,142,10
- CONTROL "Make sections equal width",IDC_EQUALSECTIONS,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,20,141,142,10
- CONTROL "",IDC_BKGCOLOUR,"ColourPicker",WS_TABSTOP,100,175,32,10
- LTEXT "Background colour:",IDC_STATIC,20,175,72,8,NOT WS_GROUP
- PUSHBUTTON "-",IDC_DEFBKCOLOR,135,175,6,10
- CONTROL "Show size grip",IDC_SHOWSIZEGRIP,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,20,72,142,10
- CONTROL "Show bevel effect on panels",IDC_SBPANELBEVEL,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,20,86,107,10
- CONTROL "Use connecting Icon",IDC_USECONNECTINGICON,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,20,97,82,10
- CONTROL "Use New Drawer for StatusBar",IDC_USEOWNERDRAW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,20,160,142,10
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
- IDD_OPT_SBAR, DIALOG
- BEGIN
- LEFTMARGIN, 4
- RIGHTMARGIN, 174
- VERTGUIDE, 12
- VERTGUIDE, 22
- VERTGUIDE, 164
- TOPMARGIN, 4
- BOTTOMMARGIN, 207
- HORZGUIDE, 33
- HORZGUIDE, 73
- END
-END
-#endif // APSTUDIO_INVOKED
-
-#endif // English (Canada) resources
+#endif // Русский (Россия) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Clist_mw/src/Version.h b/plugins/Clist_mw/src/Version.h
new file mode 100644
index 0000000000..1e83b27e7f
--- /dev/null
+++ b/plugins/Clist_mw/src/Version.h
@@ -0,0 +1,14 @@
+#define __MAJOR_VERSION 0
+#define __MINOR_VERSION 9
+#define __RELEASE_NUM 0
+#define __BUILD_NUM 0
+
+#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
+
+#define __PLUGIN_NAME "MultiWindow contact list"
+#define __FILENAME "Clist_mw.dll"
+#define __DESCRIPTION "Displays contacts, event notifications, protocol status with MW modifications."
+#define __AUTHOR ""
+#define __AUTHOREMAIL "bethoven@mailgate.ru"
+#define __AUTHORWEB "http://miranda-ng.org/"
+#define __COPYRIGHT "Copyright 2000-2010 Miranda IM project, 2012 Miranda NG project."
diff --git a/plugins/Clist_mw/src/commonheaders.h b/plugins/Clist_mw/src/commonheaders.h
index 0422ce93fa..4faf052f07 100644
--- a/plugins/Clist_mw/src/commonheaders.h
+++ b/plugins/Clist_mw/src/commonheaders.h
@@ -24,53 +24,37 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef _COMMON_HEADERS_H_
#define _COMMON_HEADERS_H_ 1
-#define MIRANDA_VER 0x0A00
-
#define _WIN32_WINNT 0x0501
#define _WIN32_IE 0x0501
-#include "m_stdhdr.h"
-
#include <windows.h>
-#include <commctrl.h>
#include <vssym32.h>
-#include <stdio.h>
#include <time.h>
#include <stddef.h>
-#include <process.h>
-#include <io.h>
-#include <string.h>
-#include <direct.h>
-#include "resource.h"
-#include <win2k.h>
+#include <m_stdhdr.h>
#include <newpluginapi.h>
-#include <m_system.h>
-#include <m_utils.h>
#include <m_database.h>
#include <m_langpack.h>
-#include <m_button.h>
#include <m_options.h>
#include <m_protosvc.h>
-#include <m_clist.h>
#include <m_clistint.h>
#include <m_skin.h>
-#include <m_contacts.h>
#include <m_extraicons.h>
-#include "m_genmenu.h"
-#include "m_clui.h"
+#include <m_clui.h>
+#include <win2k.h>
+#include <m_icolib.h>
+#include <m_cluiframes.h>
+#include <m_fontservice.h>
+
+#include <m_metacontacts.h>
+#include "resource.h"
+#include "Version.h"
#include "clc.h"
#include "clist.h"
-#include "m_icolib.h"
-#include <m_userinfo.h>
#include "CLUIFrames/cluiframes.h"
-#include "m_cluiframes.h"
-#include "m_metacontacts.h"
#include "BkgrCfg.h"
-#include <m_file.h>
-#include <m_addcontact.h>
-#include "m_fontservice.h"
// shared vars
extern HINSTANCE g_hInst;
diff --git a/plugins/Clist_mw/src/init.cpp b/plugins/Clist_mw/src/init.cpp
index cbb0c062ad..2d89519ac4 100644
--- a/plugins/Clist_mw/src/init.cpp
+++ b/plugins/Clist_mw/src/init.cpp
@@ -77,16 +77,16 @@ extern int BGModuleUnload();
PLUGININFOEX pluginInfo = {
sizeof(PLUGININFOEX),
- "MultiWindow Contact List",
- PLUGIN_MAKE_VERSION(0,9,0,0),
- "Displays contacts, event notifications, protocol status with MW modifications.",
- "",
- "bethoven@mailgate.ru" ,
- "Copyright 2000-2010 Miranda IM project, 2012 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,
- //{2A417AB9-16F2-472d-9AE3-415103C78A64}
- {0x2a417ab9, 0x16f2, 0x472d, { 0x9a, 0xe3, 0x41, 0x51, 0x3, 0xc7, 0x8a, 0x64 }}
+ // {2A417AB9-16F2-472D-9AE3-415103C78A64}
+ {0x2a417ab9, 0x16f2, 0x472d, {0x9a, 0xe3, 0x41, 0x51, 0x3, 0xc7, 0x8a, 0x64}}
};
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD dwReason, LPVOID reserved)
@@ -209,7 +209,6 @@ extern "C" int __declspec(dllexport) CListInitialise()
extern "C" int __declspec(dllexport) Load(void)
{
OutputDebugStringA("Load ClistMW\r\n");
- MessageBoxA(0,"You Running Old Miranda, use >30-10-2004 version!","MultiWindow Clist",0);
CListInitialise();
return 1;
}
diff --git a/plugins/Clist_mw/src/resource.h b/plugins/Clist_mw/src/resource.h
index 5f7d9332d3..a726d14957 100644
--- a/plugins/Clist_mw/src/resource.h
+++ b/plugins/Clist_mw/src/resource.h
@@ -1,6 +1,6 @@
//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by resource.rc
+// Включаемый файл, созданный в Microsoft Visual C++.
+// Используется d:\MNG_orig\plugins\Clist_mw\res\resource.rc
//
#define IDC_AUTHICON 1
#define IDC_NOTOALL 3