From 488b00c60855ee919e24c8ec8aad389d9f753d6a Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 13 Nov 2023 17:06:14 +0300
Subject: =?UTF-8?q?fixed=20#3867=20(Spamotron:=20=D0=BF=D0=B5=D1=80=D0=B5?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=B4=20=D0=BD=D0=B5=20=D0=BF=D0=BE=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=89=D0=B0=D0=B5=D1=82=D1=81=D1=8F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/Spamotron/res/spamotron.rc | 79 +++-----------------------------------
 plugins/Spamotron/src/resource.h   |  2 +-
 2 files changed, 7 insertions(+), 74 deletions(-)

(limited to 'plugins/Spamotron')

diff --git a/plugins/Spamotron/res/spamotron.rc b/plugins/Spamotron/res/spamotron.rc
index 4f67daf1c9..50f0337bac 100644
--- a/plugins/Spamotron/res/spamotron.rc
+++ b/plugins/Spamotron/res/spamotron.rc
@@ -164,7 +164,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,161,152,10
     EDITTEXT        IDC_OPT_MAX_SAME_MSG,170,160,22,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
     LTEXT           "times a day",IDC_STATIC,196,162,97,8
-	CONTROL         "Do not reply to messages with words in this list:",IDC_OPT_DONT_REPLY_MSG,
+    CONTROL         "Do not reply to messages with words in this list:",IDC_OPT_DONT_REPLY_MSG,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,175,277,10
     EDITTEXT        IDC_OPT_DONT_REPLY_MSG_WORDLIST,16,189,277,24,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN
 END
@@ -219,9 +219,11 @@ BEGIN
     CONTROL         "",IDC_OPT_POPUPS_CHALLENGE_FOREGROUND,"ColourPicker",WS_TABSTOP,126,99,50,10
     CONTROL         "",IDC_OPT_POPUPS_CHALLENGE_BACKGROUND,"ColourPicker",WS_TABSTOP,184,99,50,10
     EDITTEXT        IDC_OPT_POPUPS_CHALLENGE_TIMEOUT,248,98,28,12,ES_CENTER | ES_AUTOHSCROLL
-    CONTROL         "Use default colors",IDC_OPT_POPUPS_DEFAULT_COLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,149,168,10
-    CONTROL         "Use Windows colors",IDC_OPT_POPUPS_WINDOWS_COLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,163,168,10
-    CONTROL         "Default timeout",IDC_OPT_POPUPS_DEFAULT_TIMEOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,210,149,83,10
+    CONTROL         "Use default colors",IDC_OPT_POPUPS_DEFAULT_COLORS,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,139,269,10
+    CONTROL         "Use Windows colors",IDC_OPT_POPUPS_WINDOWS_COLORS,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,152,269,10
+    CONTROL         "Default timeout",IDC_OPT_POPUPS_DEFAULT_TIMEOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,166,269,8
     PUSHBUTTON      "Preview",IDC_OPT_POPUPS_PREVIEW,227,198,66,14
 END
 
@@ -236,83 +238,14 @@ GUIDELINES DESIGNINFO
 BEGIN
     IDD_SPAMOTRON_MAIN, DIALOG
     BEGIN
-        LEFTMARGIN, 8
-        RIGHTMARGIN, 301
-        VERTGUIDE, 16
-        VERTGUIDE, 114
-        VERTGUIDE, 118
-        VERTGUIDE, 122
-        VERTGUIDE, 140
-        VERTGUIDE, 293
-        TOPMARGIN, 8
-        BOTTOMMARGIN, 222
-        HORZGUIDE, 13
-        HORZGUIDE, 21
-        HORZGUIDE, 33
-        HORZGUIDE, 47
-        HORZGUIDE, 56
-        HORZGUIDE, 91
-        HORZGUIDE, 105
-        HORZGUIDE, 119
-        HORZGUIDE, 135
-        HORZGUIDE, 152
-        HORZGUIDE, 166
-        HORZGUIDE, 180
-        HORZGUIDE, 189
-        HORZGUIDE, 212
     END
 
     IDD_SPAMOTRON_Q, DIALOG
     BEGIN
-        LEFTMARGIN, 8
-        RIGHTMARGIN, 301
-        VERTGUIDE, 120
-        VERTGUIDE, 126
-        TOPMARGIN, 8
-        BOTTOMMARGIN, 222
-        HORZGUIDE, 28
-        HORZGUIDE, 40
-        HORZGUIDE, 68
-        HORZGUIDE, 72
-        HORZGUIDE, 82
-        HORZGUIDE, 110
-        HORZGUIDE, 115
-        HORZGUIDE, 127
-        HORZGUIDE, 147
-        HORZGUIDE, 153
-        HORZGUIDE, 165
-        HORZGUIDE, 193
-        HORZGUIDE, 198
-        HORZGUIDE, 211
     END
 
     IDD_SPAMOTRON_POPUPS, DIALOG
     BEGIN
-        LEFTMARGIN, 8
-        RIGHTMARGIN, 301
-        VERTGUIDE, 16
-        VERTGUIDE, 121
-        VERTGUIDE, 126
-        VERTGUIDE, 176
-        VERTGUIDE, 184
-        VERTGUIDE, 234
-        VERTGUIDE, 242
-        VERTGUIDE, 248
-        VERTGUIDE, 276
-        VERTGUIDE, 282
-        VERTGUIDE, 293
-        TOPMARGIN, 8
-        BOTTOMMARGIN, 222
-        HORZGUIDE, 13
-        HORZGUIDE, 24
-        HORZGUIDE, 41
-        HORZGUIDE, 58
-        HORZGUIDE, 72
-        HORZGUIDE, 88
-        HORZGUIDE, 104
-        HORZGUIDE, 154
-        HORZGUIDE, 168
-        HORZGUIDE, 212
     END
 END
 #endif    // APSTUDIO_INVOKED
diff --git a/plugins/Spamotron/src/resource.h b/plugins/Spamotron/src/resource.h
index 31f5166fe9..5a13092d35 100644
--- a/plugins/Spamotron/src/resource.h
+++ b/plugins/Spamotron/src/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by spamotron.rc
+// Used by W:\miranda-ng\plugins\Spamotron\res\spamotron.rc
 //
 #define IDD_SPAMOTRON_MAIN              101
 #define IDD_SPAMOTRON_Q                 102
-- 
cgit v1.2.3