fixes #3635 (Настройки уведомлений о наборе текста)

2 files changed, 25 insertions, 21 deletions

diff --git a/plugins/TabSRMM/res/resource.rc b/plugins/TabSRMM/res/resource.rc
index b9daaf6d79..764e08982f 100644
--- a/plugins/TabSRMM/res/resource.rc
+++ b/plugins/TabSRMM/res/resource.rc
@@ -345,38 +345,38 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,185,284,11

 END

 

-IDD_OPT_TYPINGNOTIFYPOPUP DIALOGEX 0, 0, 314, 250

+IDD_OPT_TYPINGNOTIFYPOPUP DIALOGEX 0, 0, 314, 244

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

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

 BEGIN

-    GROUPBOX        "Colors",IDC_STATIC,4,9,307,129

-    CONTROL         "...is &typing",IDC_START,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,20,95,13

-    CONTROL         "...stopped t&yping",IDC_STOP,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,46,95,13

-    CTEXT           "Background",IDC_STATIC,11,61,43,8

-    CTEXT           "Text",IDC_STATIC,89,62,29,8

-    CONTROL         "",IDC_TYPEON_TX,"ColourPicker",WS_TABSTOP,120,33,24,12

-    CONTROL         "",IDC_TYPEOFF_BG,"ColourPicker",WS_TABSTOP,58,59,24,12

-    CONTROL         "",IDC_TYPEOFF_TX,"ColourPicker",WS_TABSTOP,120,59,24,12

-    CONTROL         "Use &default colors",IDC_USEPOPUPCOLORS,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,71,235,13

-    CONTROL         "Use &Windows colors",IDC_USEWINCOLORS,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,84,242,13

+    GROUPBOX        "Popups",IDC_STATIC,4,2,307,137

+    CONTROL         "...is &typing",IDC_START,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,13,287,13

+    CONTROL         "...stopped t&yping",IDC_STOP,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,45,273,13

+    CTEXT           "Background",IDC_STATIC,11,59,43,8

+    CTEXT           "Text",IDC_STATIC,89,59,29,8

+    CONTROL         "",IDC_TYPEON_TX,"ColourPicker",WS_TABSTOP,120,26,24,12

+    CONTROL         "",IDC_TYPEOFF_BG,"ColourPicker",WS_TABSTOP,58,58,24,12

+    CONTROL         "",IDC_TYPEOFF_TX,"ColourPicker",WS_TABSTOP,120,58,24,12

+    CONTROL         "Use &default colors",IDC_USEPOPUPCOLORS,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,83,242,13

+    CONTROL         "Use &Windows colors",IDC_USEWINCOLORS,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,96,242,13

     CONTROL         "Only &one popup for each contact",IDC_ONEPOPUP,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,109,250,13

-    GROUPBOX        "...is typing",IDC_STATIC,8,151,148,58,WS_GROUP

+    GROUPBOX        "...is typing",IDC_STATIC,8,147,144,61,WS_GROUP

     CONTROL         "Default",IDC_TIMEOUT_POPUP,"Button",BS_AUTORADIOBUTTON,16,161,130,10

     CONTROL         "From protocol",IDC_TIMEOUT_PROTO,"Button",BS_AUTORADIOBUTTON,16,172,130,10

     CONTROL         "Permanent",IDC_TIMEOUT_PERMANENT,"Button",BS_AUTORADIOBUTTON,16,183,130,10

     CONTROL         "Custom",IDC_TIMEOUT_CUSTOM,"Button",BS_AUTORADIOBUTTON,16,194,95,10

-    EDITTEXT        IDC_TIMEOUT_VALUE,125,193,25,12,ES_AUTOHSCROLL | ES_NUMBER

-    GROUPBOX        "...stopped typing",IDC_STATIC,158,151,148,58,WS_GROUP

+    EDITTEXT        IDC_TIMEOUT_VALUE,122,192,25,12,ES_AUTOHSCROLL | ES_NUMBER

+    GROUPBOX        "...stopped typing",IDC_STATIC,158,147,146,61,WS_GROUP

     CONTROL         "Default",IDC_TIMEOUT_POPUP2,"Button",BS_AUTORADIOBUTTON,166,161,130,10

     CONTROL         "Permanent",IDC_TIMEOUT_PERMANENT2,"Button",BS_AUTORADIOBUTTON,166,183,130,10

     CONTROL         "Custom",IDC_TIMEOUT_CUSTOM2,"Button",BS_AUTORADIOBUTTON,166,193,95,10

-    EDITTEXT        IDC_TIMEOUT_VALUE2,275,192,25,12,ES_AUTOHSCROLL | ES_NUMBER

+    EDITTEXT        IDC_TIMEOUT_VALUE2,273,192,25,12,ES_AUTOHSCROLL | ES_NUMBER

     PUSHBUTTON      "Preview",IDC_PREVIEW,62,220,194,16

     GROUPBOX        "Timeout",IDC_STATIC,3,140,308,75

-    CTEXT           "Background",IDC_STATIC,11,35,44,8

-    CONTROL         "",IDC_TYPEON_BG,"ColourPicker",WS_TABSTOP,58,33,24,12

-    CTEXT           "Text",IDC_STATIC,89,35,29,8

+    CTEXT           "Background",IDC_STATIC,11,27,44,8

+    CONTROL         "",IDC_TYPEON_BG,"ColourPicker",WS_TABSTOP,58,26,24,12

+    CTEXT           "Text",IDC_STATIC,89,27,29,8

 END

 

 IDD_TEMPLATEEDIT DIALOGEX 0, 0, 368, 231

@@ -778,7 +778,6 @@ BEGIN
 

     IDD_OPT_TYPINGNOTIFYPOPUP, DIALOG

     BEGIN

-        BOTTOMMARGIN, 191

     END

 

     IDD_OPT_SKIN, DIALOG

@@ -864,6 +863,11 @@ BEGIN
     0

 END

 

+IDD_OPT_TYPINGNOTIFYPOPUP AFX_DIALOG_LAYOUT

+BEGIN

+    0

+END

+

 #endif    // Neutral resources

 /////////////////////////////////////////////////////////////////////////////

 

diff --git a/plugins/TabSRMM/src/resource.h b/plugins/TabSRMM/src/resource.h
index 205ea0816a..87036e4cc9 100644
--- a/plugins/TabSRMM/src/resource.h
+++ b/plugins/TabSRMM/src/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}

 // Microsoft Visual C++ generated include file.

-// Used by W:\miranda-ng\plugins\TabSRMM\res\chat.rc

+// Used by W:\miranda-ng\plugins\TabSRMM\res\resource.rc

 //

 #define IDD_TEMPLATEEDIT                1

 #define VS_VERSION_INFO                 1

@@ -696,7 +696,7 @@
 // 

 #ifdef APSTUDIO_INVOKED

 #ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NEXT_RESOURCE_VALUE        107

+#define _APS_NEXT_RESOURCE_VALUE        108

 #define _APS_NEXT_COMMAND_VALUE         40001

 #define _APS_NEXT_CONTROL_VALUE         1000

 #define _APS_NEXT_SYMED_VALUE           101