more fixes for #3027

1 files changed, 40 insertions, 36 deletions

diff --git a/plugins/NewEventNotify/res/resource.rc b/plugins/NewEventNotify/res/resource.rc
index 7484fb0c98..b654e93e9e 100644
--- a/plugins/NewEventNotify/res/resource.rc
+++ b/plugins/NewEventNotify/res/resource.rc
@@ -24,55 +24,59 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // Dialog

 //

 

-IDD_OPT_MAIN DIALOGEX 0, 0, 314, 238

+IDD_OPT_MAIN DIALOGEX 0, 0, 302, 232

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    CONTROL         "",IDC_OPT_TREE,"SysTreeView32",TVS_DISABLEDRAGDROP | WS_BORDER | WS_HSCROLL | WS_TABSTOP,10,0,298,138

-    GROUPBOX        "Popup options",IDC_STATIC,7,139,298,79

-    LTEXT           "Text",IDC_STATIC,93,145,23,8

-    LTEXT           "Background",IDC_STATIC,142,145,44,8

-    CTEXT           "Timeout",IDC_STATIC,200,145,56,8

-    LTEXT           "Message",IDC_STATIC,13,158,44,8

-    CONTROL         "",IDC_COLTEXT_MESSAGE,"ColourPicker",WS_TABSTOP,93,157,39,11

-    CONTROL         "",IDC_COLBACK_MESSAGE,"ColourPicker",WS_TABSTOP,142,157,39,11

-    CONTROL         "",IDC_CHKDEFAULTCOL_MESSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,190,158,11,10

-    EDITTEXT        IDC_DELAY_MESSAGE,212,155,26,12,ES_AUTOHSCROLL | ES_NUMBER

-    CONTROL         "",IDC_CHKINFINITE_MESSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,258,158,11,10

-    LTEXT           "File",IDC_STATIC,13,172,44,8

-    CONTROL         "",IDC_COLTEXT_FILE,"ColourPicker",WS_TABSTOP,93,171,39,11

-    CONTROL         "",IDC_COLBACK_FILE,"ColourPicker",WS_TABSTOP,142,171,39,11

-    CONTROL         "",IDC_CHKDEFAULTCOL_FILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,190,172,11,10

-    EDITTEXT        IDC_DELAY_FILE,212,170,26,12,ES_AUTOHSCROLL | ES_NUMBER

-    CONTROL         "",IDC_CHKINFINITE_FILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,258,172,11,10

-    LTEXT           "Errors",IDC_STATIC,13,185,44,8

-    CONTROL         "",IDC_COLTEXT_ERR,"ColourPicker",WS_TABSTOP,93,185,39,11

-    CONTROL         "",IDC_COLBACK_ERR,"ColourPicker",WS_TABSTOP,142,185,39,11

-    CONTROL         "",IDC_CHKDEFAULTCOL_ERR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,190,186,11,10

-    EDITTEXT        IDC_DELAY_ERR,212,184,26,12,ES_AUTOHSCROLL | ES_NUMBER

-    CONTROL         "",IDC_CHKINFINITE_ERR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,258,186,11,10

-    LTEXT           "Others",IDC_STATIC,13,200,44,8

-    CONTROL         "",IDC_COLTEXT_OTHERS,"ColourPicker",WS_TABSTOP,93,199,39,11

-    CONTROL         "",IDC_COLBACK_OTHERS,"ColourPicker",WS_TABSTOP,142,199,39,11

-    CONTROL         "",IDC_CHKDEFAULTCOL_OTHERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,190,200,11,10

-    EDITTEXT        IDC_DELAY_OTHERS,212,198,26,12,ES_AUTOHSCROLL | ES_NUMBER

-    CONTROL         "",IDC_CHKINFINITE_OTHERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,258,200,11,10

-    PUSHBUTTON      "Preview",IDC_PREVIEW,245,222,60,12

+    CONTROL         "",IDC_OPT_TREE,"SysTreeView32",TVS_DISABLEDRAGDROP | WS_BORDER | WS_HSCROLL | WS_TABSTOP,6,5,293,121

+    CONTROL         "Limit message preview to",IDC_LIMITPREVIEW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,130,138,12

+    EDITTEXT        IDC_MESSAGEPREVIEWLIMIT,153,130,37,13,ES_AUTOHSCROLL

+    CONTROL         "",IDC_MESSAGEPREVIEWLIMITSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,196,130,9,13

+    LTEXT           "characters",IDC_STATIC,210,131,82,10

+    GROUPBOX        "Popup options",IDC_STATIC,7,143,291,73

+    LTEXT           "Text",IDC_STATIC,93,149,23,8

+    LTEXT           "Background",IDC_STATIC,142,149,44,8

+    CTEXT           "Timeout",IDC_STATIC,200,149,56,8

+    LTEXT           "Message",IDC_STATIC,13,162,44,8

+    CONTROL         "",IDC_COLTEXT_MESSAGE,"ColourPicker",WS_TABSTOP,93,161,39,11

+    CONTROL         "",IDC_COLBACK_MESSAGE,"ColourPicker",WS_TABSTOP,142,161,39,11

+    CONTROL         "",IDC_CHKDEFAULTCOL_MESSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,190,162,11,10

+    EDITTEXT        IDC_DELAY_MESSAGE,212,159,26,12,ES_AUTOHSCROLL | ES_NUMBER

+    CONTROL         "",IDC_CHKINFINITE_MESSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,258,162,11,10

+    LTEXT           "File",IDC_STATIC,13,175,44,8

+    CONTROL         "",IDC_COLTEXT_FILE,"ColourPicker",WS_TABSTOP,93,174,39,11

+    CONTROL         "",IDC_COLBACK_FILE,"ColourPicker",WS_TABSTOP,142,174,39,11

+    CONTROL         "",IDC_CHKDEFAULTCOL_FILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,190,175,11,10

+    EDITTEXT        IDC_DELAY_FILE,212,173,26,12,ES_AUTOHSCROLL | ES_NUMBER

+    CONTROL         "",IDC_CHKINFINITE_FILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,258,175,11,10

+    LTEXT           "Errors",IDC_STATIC,13,187,44,8

+    CONTROL         "",IDC_COLTEXT_ERR,"ColourPicker",WS_TABSTOP,93,187,39,11

+    CONTROL         "",IDC_COLBACK_ERR,"ColourPicker",WS_TABSTOP,142,187,39,11

+    CONTROL         "",IDC_CHKDEFAULTCOL_ERR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,190,188,11,10

+    EDITTEXT        IDC_DELAY_ERR,212,186,26,12,ES_AUTOHSCROLL | ES_NUMBER

+    CONTROL         "",IDC_CHKINFINITE_ERR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,258,188,11,10

+    LTEXT           "Others",IDC_STATIC,13,201,44,8

+    CONTROL         "",IDC_COLTEXT_OTHERS,"ColourPicker",WS_TABSTOP,93,200,39,11

+    CONTROL         "",IDC_COLBACK_OTHERS,"ColourPicker",WS_TABSTOP,142,200,39,11

+    CONTROL         "",IDC_CHKDEFAULTCOL_OTHERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,190,201,11,10

+    EDITTEXT        IDC_DELAY_OTHERS,212,199,26,12,ES_AUTOHSCROLL | ES_NUMBER

+    CONTROL         "",IDC_CHKINFINITE_OTHERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,258,201,11,10

+    PUSHBUTTON      "Preview",IDC_PREVIEW,239,218,60,13

 END

 

-IDD_OPT_MESSAGE DIALOGEX 0, 0, 314, 148

+IDD_OPT_MESSAGE DIALOGEX 0, 0, 302, 148

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

     CONTROL         "Don't show popup when message dialog is already open",IDC_CHKWINDOWCHECK,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,8,297,10

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,8,284,10

     CONTROL         "Hide popup when sending new message",IDC_CHKHIDESEND,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,20,297,10

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,20,284,10

     CONTROL         "Open reply dialog instead of reading the message",IDC_CHKREPLYWINDOW,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,32,297,11

-    CONTROL         "Merge popups from one user",IDC_CHKMERGEPOPUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,63,295,10

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,32,284,11

+    CONTROL         "Merge popups from one user",IDC_CHKMERGEPOPUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,63,284,10

     CONTROL         "Show date",IDC_CHKSHOWDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,74,227,10

     CONTROL         "Show time",IDC_CHKSHOWTIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,85,214,10

     CONTROL         "Show headers",IDC_CHKSHOWHEADERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,96,220,10