From 04ddded9f645bf0e0a8975ae68c2e36ec8097e19 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 10 Nov 2012 19:09:30 +0000 Subject: redrawn nicer+ options dialogs git-svn-id: http://svn.miranda-ng.org/main/trunk@2278 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_nicer/clist_nicer_10.vcxproj | 33 +++++ plugins/Clist_nicer/clist_nicer_10.vcxproj.filters | 95 ++++++++++++++ plugins/Clist_nicer/res/resource.rc | 139 +++++++++++---------- plugins/Clist_nicer/src/Include/resource.h | 3 +- 4 files changed, 205 insertions(+), 65 deletions(-) diff --git a/plugins/Clist_nicer/clist_nicer_10.vcxproj b/plugins/Clist_nicer/clist_nicer_10.vcxproj index f10a9a65ad..a7d79f3ccf 100644 --- a/plugins/Clist_nicer/clist_nicer_10.vcxproj +++ b/plugins/Clist_nicer/clist_nicer_10.vcxproj @@ -246,6 +246,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/Clist_nicer/clist_nicer_10.vcxproj.filters b/plugins/Clist_nicer/clist_nicer_10.vcxproj.filters index 32981a6589..92b445dab9 100644 --- a/plugins/Clist_nicer/clist_nicer_10.vcxproj.filters +++ b/plugins/Clist_nicer/clist_nicer_10.vcxproj.filters @@ -182,4 +182,99 @@ Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + \ No newline at end of file diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc index 4eb41e7da9..a52008760c 100644 --- a/plugins/Clist_nicer/res/resource.rc +++ b/plugins/Clist_nicer/res/resource.rc @@ -9,11 +9,11 @@ // #include #include -#include "..\..\include\statusmodes.h" +#include + ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS - ///////////////////////////////////////////////////////////////////////////// // English (United States) resources @@ -175,53 +175,53 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,208,284,12 END -IDD_OPT_DSPGROUPS DIALOGEX 0, 0, 227, 205 +IDD_OPT_DSPGROUPS DIALOGEX 0, 0, 305, 205 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Groups",IDC_STATIC,1,0,224,109 + GROUPBOX "Groups",IDC_STATIC,1,0,299,109 CONTROL "Draw a line alongside group names",IDC_LINEWITHGROUPS, - "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,8,200,12 + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,8,283,12 CONTROL "Show number of contacts in a group",IDC_SHOWGROUPCOUNTS, - "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,20,200,12 + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,20,283,12 CONTROL "Hide numbers when all offline",IDC_HIDECOUNTSWHENEMPTY, - "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,23,32,193,12 - CONTROL "Sort groups alphabetically",IDC_SORTGROUPSALPHA,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,44,200,12 + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,22,32,272,12 + CONTROL "Sort groups alphabetically",IDC_SORTGROUPSALPHA,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,44,283,12 CONTROL "Quicksearch in open groups only",IDC_QUICKSEARCHVISONLY, - "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,56,200,12 - CONTROL "No expand/collapse icon",IDC_NOGROUPICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,68,200,12 + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,56,283,12 + CONTROL "No expand/collapse icon",IDC_NOGROUPICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,68,283,12 CONTROL "Center groupnames horizontally",IDC_CENTERGROUPNAMES, - "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,80,200,12 - LTEXT "Alignment",IDC_STATIC,11,95,53,10 - COMBOBOX IDC_GROUPALIGN,68,93,73,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Margins (left/right)",IDC_STATIC,11,121,113,8 - EDITTEXT IDC_LEFTMARGIN,139,119,31,12,ES_RIGHT | ES_NUMBER - CONTROL "Spin1",IDC_LEFTMARGINSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,158,119,11,14 - EDITTEXT IDC_RIGHTMARGIN,176,119,31,12,ES_RIGHT | ES_NUMBER - CONTROL "",IDC_RIGHTMARGINSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,208,119,11,14 - LTEXT "Row gap",IDC_STATIC,11,135,156,11 - EDITTEXT IDC_ROWGAP,176,133,31,12,ES_RIGHT | ES_NUMBER - CONTROL "",IDC_ROWGAPSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,208,133,11,14 - LTEXT "Minimum row height:",IDC_STATIC,11,149,156,8 - EDITTEXT IDC_ROWHEIGHT,176,147,31,12,ES_RIGHT | ES_NUMBER - CONTROL "",IDC_ROWHEIGHTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,208,147,11,14 - LTEXT "Group row height",IDC_STATIC,11,161,156,8 - EDITTEXT IDC_GROUPROWHEIGHT,176,161,31,12,ES_RIGHT | ES_NUMBER - CONTROL "",IDC_GROUPROWHEIGHTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,208,161,11,14 - LTEXT "Indent groups by:",IDC_STATIC,11,175,156,8 - EDITTEXT IDC_GROUPINDENT,176,175,31,12,ES_RIGHT | ES_NUMBER - CONTROL "Spin1",IDC_GROUPINDENTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,208,175,11,14 - LTEXT "Inner Row vertical padding",IDC_STATIC,11,189,156,9 - EDITTEXT IDC_AVATARPADDING,176,189,31,12,ES_RIGHT | ES_AUTOHSCROLL - CONTROL "",IDC_AVATARPADDINGSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,208,189,11,14 - GROUPBOX "Margins and spacing",IDC_STATIC,1,111,224,93 + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,80,283,12 + LTEXT "Alignment",IDC_STATIC,11,95,91,10 + COMBOBOX IDC_GROUPALIGN,106,93,73,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Margins (left/right)",IDC_STATIC,11,120,174,8 + EDITTEXT IDC_LEFTMARGIN,193,117,45,12,ES_RIGHT | ES_NUMBER + CONTROL "Spin1",IDC_LEFTMARGINSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,231,116,11,14 + EDITTEXT IDC_RIGHTMARGIN,249,116,45,12,ES_RIGHT | ES_NUMBER + CONTROL "",IDC_RIGHTMARGINSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,284,117,11,14 + LTEXT "Row gap",IDC_STATIC,11,134,233,8 + EDITTEXT IDC_ROWGAP,249,130,45,12,ES_RIGHT | ES_NUMBER + CONTROL "",IDC_ROWGAPSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,284,131,11,14 + LTEXT "Minimum row height:",IDC_STATIC,11,148,233,8 + EDITTEXT IDC_ROWHEIGHT,249,145,45,12,ES_RIGHT | ES_NUMBER + CONTROL "",IDC_ROWHEIGHTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,284,145,11,14 + LTEXT "Group row height",IDC_STATIC,11,161,233,8 + EDITTEXT IDC_GROUPROWHEIGHT,249,158,45,12,ES_RIGHT | ES_NUMBER + CONTROL "",IDC_GROUPROWHEIGHTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,284,159,11,14 + LTEXT "Indent groups by:",IDC_STATIC,11,175,233,8 + EDITTEXT IDC_GROUPINDENT,249,172,45,12,ES_RIGHT | ES_NUMBER + CONTROL "Spin1",IDC_GROUPINDENTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,284,173,11,14 + LTEXT "Inner Row vertical padding",IDC_STATIC,11,189,233,8 + EDITTEXT IDC_AVATARPADDING,249,186,45,12,ES_RIGHT | ES_AUTOHSCROLL + CONTROL "",IDC_AVATARPADDINGSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,284,187,11,14 + GROUPBOX "Margins and spacing",IDC_STATIC,1,109,299,95 END -IDD_OPT_DSPITEMS DIALOGEX 0, 0, 227, 205 +IDD_OPT_DSPITEMS DIALOGEX 0, 0, 305, 167 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Contact List Sorting",IDC_STATIC,1,0,142,97,WS_GROUP + GROUPBOX "Contact List Sorting",IDC_STATIC,1,0,142,145,WS_GROUP LTEXT "First by",IDC_STATIC,5,15,57,9 COMBOBOX IDC_SORTPRIMARY,65,12,73,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Then by",IDC_STATIC,5,29,57,9 @@ -233,43 +233,43 @@ BEGIN CONTROL "Do not separate offline contacts",IDC_DONTSEPARATE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,80,132,10 LTEXT "Hide as offline",IDC_STATIC,151,1,73,8 - CONTROL "Tree1",IDC_HIDEOFFLINEOPTS,"SysTreeView32",TVS_HASBUTTONS | TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_CHECKBOXES | TVS_NONEVENHEIGHT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,147,11,77,85 - LTEXT "Right align contacts",IDC_STATIC,5,104,130,10 - COMBOBOX IDC_CLISTALIGN,147,102,77,56,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "Tree1",IDC_HIDEOFFLINEOPTS,"SysTreeView32",TVS_HASBUTTONS | TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_CHECKBOXES | TVS_NONEVENHEIGHT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,147,11,152,134 + LTEXT "Right align contacts",IDC_STATIC,5,150,130,10 + COMBOBOX IDC_CLISTALIGN,147,148,77,56,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END -IDD_OPT_DSPADVANCED DIALOGEX 0, 0, 227, 205 +IDD_OPT_DSPADVANCED DIALOGEX 0, 0, 305, 175 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Avatars",IDC_STATIC,1,0,224,109 + GROUPBOX "Avatars",IDC_STATIC,1,0,300,100 CONTROL "Show avatars",IDC_CLISTAVATARS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,11,125,10 - LTEXT "Height",IDC_STATIC,137,11,32,11 - EDITTEXT IDC_AVATARHEIGHT,180,9,31,12,ES_AUTOHSCROLL - CONTROL "",IDC_AVATARSIZESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,200,9,11,15 + LTEXT "Height",IDC_STATIC,210,11,41,11 + EDITTEXT IDC_AVATARHEIGHT,253,9,31,12,ES_AUTOHSCROLL + CONTROL "",IDC_AVATARSIZESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,285,9,11,15 CONTROL "Draw a border around avatars",IDC_AVATARSBORDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,25,165,10 - CONTROL "",IDC_AVATARBORDERCLR,"ColourPicker",WS_TABSTOP,180,24,22,10 + CONTROL "",IDC_AVATARBORDERCLR,"ColourPicker",WS_TABSTOP,253,24,22,10 CONTROL "Rounded avatars",IDC_AVATARSROUNDED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,39,125,10 - LTEXT "Radius",IDC_STATIC,137,39,32,9 - EDITTEXT IDC_RADIUS,180,37,31,12,ES_AUTOHSCROLL - CONTROL "",IDC_RADIUSSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,200,37,11,15 + LTEXT "Radius",IDC_STATIC,210,39,37,9 + EDITTEXT IDC_RADIUS,253,37,31,12,ES_AUTOHSCROLL + CONTROL "",IDC_RADIUSSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,284,37,11,15 CONTROL "Always align icons and text for missing avatars",IDC_ALWAYSALIGNNICK, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,65,213,10 - LTEXT "Avatar alignment",IDC_STATIC,8,80,103,11 - COMBOBOX IDC_ALIGNMENT,119,78,102,56,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,52,213,10 + LTEXT "Avatar alignment",IDC_STATIC,8,70,103,11 + COMBOBOX IDC_ALIGNMENT,187,68,108,56,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Don't request avatars for offline contacts",IDC_NOAVATARSOFFLINE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,94,213,10 - GROUPBOX "Second text line",IDC_STATIC,1,110,224,94 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,86,213,10 + GROUPBOX "Second text line",IDC_STATIC,1,100,300,70 CONTROL "Display status message when available",IDC_SHOWSTATUSMSG, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,122,213,10 - LTEXT "Show second text line:",IDC_STATIC,8,137,103,9 - COMBOBOX IDC_DUALROWMODE,119,135,102,56,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "Show contacts local time",IDC_SHOWLOCALTIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,150,212,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,113,213,10 + LTEXT "Show second text line:",IDC_STATIC,8,128,103,9 + COMBOBOX IDC_DUALROWMODE,187,126,108,56,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "Show contacts local time",IDC_SHOWLOCALTIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,141,212,10 CONTROL "Only when timezone differs",IDC_SHOWLOCALTIMEONLYWHENDIFFERENT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,164,201,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,155,201,10 END -IDD_OPT_ICONS DIALOGEX 0, 0, 227, 205 +IDD_OPT_ICONS DIALOGEX 0, 0, 305, 205 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -560,19 +560,19 @@ END // TEXTINCLUDE // -1 TEXTINCLUDE +1 TEXTINCLUDE BEGIN "..\\src\\include\\resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN "#include \r\n" "#include \r\n" - "#include \r\n" + "#include \r\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "\r\n" "\0" @@ -706,6 +706,18 @@ END #ifdef APSTUDIO_INVOKED GUIDELINES DESIGNINFO BEGIN + IDD_OPT_DSPGROUPS, DIALOG + BEGIN + END + + IDD_OPT_DSPITEMS, DIALOG + BEGIN + END + + IDD_OPT_DSPADVANCED, DIALOG + BEGIN + END + IDD_OPT_CLUI, DIALOG BEGIN HORZGUIDE, 127 @@ -727,3 +739,4 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/plugins/Clist_nicer/src/Include/resource.h b/plugins/Clist_nicer/src/Include/resource.h index e53c1cec0d..a863aa28bb 100644 --- a/plugins/Clist_nicer/src/Include/resource.h +++ b/plugins/Clist_nicer/src/Include/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by D:\Develop\miranda\plugins\miranda\miranda\plugins\clist_nicer\resource.rc +// Used by .\plugins\clist_nicer\res\resource.rc // #define IDD_OPT_VIEWMODES 1 #define IDD_OPT_FLOATING 3 @@ -312,7 +312,6 @@ #define IDC_STATIC1 40018 #define IDC_STATIC2 40019 #define IDC_STATIC3 40020 -//#define POPUP_VISIBILITY 40021 #define IDC_STATIC16 40021 #define IDC_STATIC4 40022 #define IDC_STATIC5 40023 -- cgit v1.2.3