From cd16d042ee670b02ea5b4be5c0776c83a61f94a9 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 12 Jul 2018 16:31:41 +0300 Subject: fixes #1469 (Clist_modern: gap is too big) --- plugins/Clist_modern/res/resource.rc | 4 ++-- plugins/Clist_modern/src/modern_clcopts.cpp | 1 - plugins/Clist_modern/src/resource.h | 2 +- plugins/Clist_nicer/res/resource.rc | 27 ++++++++++----------------- plugins/Clist_nicer/src/clistopts.cpp | 2 +- plugins/Clist_nicer/src/resource.h | 1 - 6 files changed, 14 insertions(+), 23 deletions(-) diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc index e0037b7e47..eaf6fff0d7 100644 --- a/plugins/Clist_modern/res/resource.rc +++ b/plugins/Clist_modern/res/resource.rc @@ -433,8 +433,8 @@ BEGIN CONTROL "Always show status in tooltip",IDC_ALWAYSSTATUS,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,10,32,156,11 CONTROL "Disable icon blinking",IDC_DISABLEBLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,45,156,9 EDITTEXT IDC_BLINKTIME,12,59,35,12,ES_NUMBER - CONTROL "",IDC_BLINKSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,47,59,11,12 - LTEXT "ms, delay between icon blinking",IDC_STATIC,62,61,104,8 + CONTROL "",IDC_BLINKSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,33,59,11,12 + LTEXT "ms, delay between icon blinking",IDC_STATIC,51,61,104,8 GROUPBOX "System tray icon",IDC_STATIC,2,6,292,73 CONTROL "Use xStatus icon",IDC_SHOWXSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,171,19,117,10 CONTROL "Show normal status as overlay",IDC_SHOWNORMAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,171,32,117,10 diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp index 8f8ac960f5..de7c71e726 100644 --- a/plugins/Clist_modern/src/modern_clcopts.cpp +++ b/plugins/Clist_modern/src/modern_clcopts.cpp @@ -605,7 +605,6 @@ static INT_PTR CALLBACK DlgProcTrayOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L CheckDlgButton(hwndDlg, IDC_ALWAYSSTATUS, db_get_b(0, "CList", "AlwaysStatus", SETTING_ALWAYSSTATUS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_DISABLEBLINK, db_get_b(0, "CList", "DisableTrayFlash", SETTING_DISABLETRAYFLASH_DEFAULT) == 1 ? BST_CHECKED : BST_UNCHECKED); - SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_BLINKTIME), 0); // set buddy SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETRANGE, 0, MAKELONG(0x3FFF, 250)); SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(0, "CList", "IconFlashTime", SETTING_ICONFLASHTIME_DEFAULT), 0)); diff --git a/plugins/Clist_modern/src/resource.h b/plugins/Clist_modern/src/resource.h index a0eeed3757..cb794ad7e3 100644 --- a/plugins/Clist_modern/src/resource.h +++ b/plugins/Clist_modern/src/resource.h @@ -502,7 +502,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 510 +#define _APS_NEXT_RESOURCE_VALUE 511 #define _APS_NEXT_COMMAND_VALUE 40022 #define _APS_NEXT_CONTROL_VALUE 2025 #define _APS_NEXT_SYMED_VALUE 101 diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc index 85bf1a22a9..abc645a9e7 100644 --- a/plugins/Clist_nicer/res/resource.rc +++ b/plugins/Clist_nicer/res/resource.rc @@ -53,14 +53,6 @@ BEGIN LTEXT "This will erase all history and settings for this contact!",IDC_STATIC,7,18,239,16 END -IDD_OPTIONSDIALOG DIALOGEX 0, 0, 312, 247 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - CONTROL "",IDC_OPTIONSTAB,"SysTabControl32",WS_TABSTOP,1,1,310,245,WS_EX_ACCEPTFILES -END - IDD_OPT_CLIST DIALOGEX 0, 0, 305, 226 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT @@ -83,8 +75,8 @@ BEGIN CONTROL "Always show status in tooltip",IDC_ALWAYSSTATUS,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,10,113,147,10 CONTROL "Disable icon blinking",IDC_DISABLEBLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,125,147,10 EDITTEXT IDC_BLINKTIME,69,136,57,12,ES_RIGHT | ES_NUMBER - CONTROL "Spin5",IDC_BLINKSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,114,137,11,16 - LTEXT "ms",IDC_STATIC,130,138,24,8 + CONTROL "Spin5",IDC_BLINKSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,110,134,11,16 + LTEXT "ms",IDC_STATIC,131,138,24,8 GROUPBOX "Event area",IDC_STATIC,169,91,133,63 LTEXT "Set base visibility on the frames menu",IDC_STATIC,176,102,121,20 CONTROL "Auto mode",IDC_EVENTAREAAUTOHIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,176,125,121,10 @@ -95,8 +87,8 @@ BEGIN LTEXT "icon when statuses differ",IDC_STATIC,189,167,113,8,NOT WS_GROUP CONTROL "Cycle icons every",IDC_CYCLE,"Button",BS_AUTORADIOBUTTON,10,180,92,10 EDITTEXT IDC_CYCLETIME,107,180,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,181,10,14 - LTEXT "seconds, when statuses differ",IDC_STATIC,145,182,150,8,NOT WS_GROUP + CONTROL "Spin1",IDC_CYCLETIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,126,179,10,14 + LTEXT "seconds, when statuses differ",IDC_STATIC,140,182,155,8,NOT WS_GROUP CONTROL "Show multiple icons",IDC_MULTITRAY,"Button",BS_AUTORADIOBUTTON,10,194,92,10 CONTROL "Only when statuses differ",IDC_ALWAYSMULTI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,194,186,10 CONTROL "Do not show system tray icon tooltips on mouse over",IDC_NOTRAYINFOTIPS, @@ -305,7 +297,7 @@ BEGIN LTEXT "Time:",IDC_STATIC11,21,137,39,8 EDITTEXT IDC_SMOOTHTIME,63,135,45,12,ES_RIGHT | ES_NUMBER CONTROL "Spin1",IDC_SMOOTHTIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,96,138,11,14 - LTEXT "milliseconds",IDC_STATIC12,114,137,73,8,SS_CENTERIMAGE + LTEXT "milliseconds",IDC_STATIC12,112,137,73,8,SS_CENTERIMAGE CONTROL "Hide vertical scroll bar",IDC_NOSCROLLBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,152,282,10 CONTROL "Gray out entire list when:",IDC_GREYOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,168,282,10 CONTROL "Tree gray out",IDC_GREYOUTOPTS,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_NONEVENHEIGHT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,11,181,182,39 @@ -630,10 +622,6 @@ BEGIN BEGIN END - IDD_OPTIONSDIALOG, DIALOG - BEGIN - END - IDD_OPT_CLIST, DIALOG BEGIN END @@ -705,6 +693,11 @@ BEGIN 0 END +IDD_OPT_CLIST AFX_DIALOG_LAYOUT +BEGIN + 0 +END + #endif // Neutral resources ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/Clist_nicer/src/clistopts.cpp b/plugins/Clist_nicer/src/clistopts.cpp index 36296161fd..c745fbcfb5 100644 --- a/plugins/Clist_nicer/src/clistopts.cpp +++ b/plugins/Clist_nicer/src/clistopts.cpp @@ -101,7 +101,7 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP } if (CB_ERR == (int)SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETCURSEL, 0, 0)) SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETCURSEL, 0, 0); - SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_BLINKTIME), 0); + SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETRANGE, 0, MAKELONG(0x3FFF, 250)); SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(NULL, "CList", "IconFlashTime", 550), 0)); CheckDlgButton(hwndDlg, IDC_NOTRAYINFOTIPS, cfg::dat.bNoTrayTips ? 1 : 0); diff --git a/plugins/Clist_nicer/src/resource.h b/plugins/Clist_nicer/src/resource.h index 5226261d50..5e9cabe936 100644 --- a/plugins/Clist_nicer/src/resource.h +++ b/plugins/Clist_nicer/src/resource.h @@ -7,7 +7,6 @@ #define IDD_QUICKIGNORE 5 #define IDD_OPT 6 #define IDD_EXCEPTION 20 -#define IDD_OPTIONSDIALOG 101 #define IDD_OPT_CLIST 126 #define IDI_CLIST 146 #define IDI_OPTIONS 163 -- cgit v1.2.3