From 290518a76e3dbed5f3452f9e210c90246c8875d4 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 8 Jun 2018 19:44:51 +0300
Subject: merge of recent SRMM-related fixes

---
 plugins/SmileyAdd/res/resource.rc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins/SmileyAdd/res')

diff --git a/plugins/SmileyAdd/res/resource.rc b/plugins/SmileyAdd/res/resource.rc
index 27357ba49b..4d0e2c94c6 100644
--- a/plugins/SmileyAdd/res/resource.rc
+++ b/plugins/SmileyAdd/res/resource.rc
@@ -13,7 +13,7 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// Нейтральный resources
+// Neutral resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
@@ -67,9 +67,8 @@ BEGIN
     CONTROL         "Enable smileys",IDC_INPUTSMILEYS,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,15,226,130,8
     CONTROL         "Don't replace at cursor",IDC_DCURSORSMILEY,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,15,237,130,8
     GROUPBOX        "Built-in message dialog support",IDC_STATIC,155,213,162,36
-    CONTROL         "Enable",IDC_PLUGENABLED,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,240,222,69,12
-    COMBOBOX        IDC_SMLBUT,159,233,60,35,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Smiley button",IDC_STATIC,161,223,72,8
+    LTEXT           "Smiley button",IDC_STATIC,161,226,72,8
+    COMBOBOX        IDC_SMLBUT,249,226,60,35,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Surround inserted smiley with spaces",IDC_APPENDSPACES,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,170,220,11
     CONTROL         "Use first smiley for selection size",IDC_SCALEALLSMILEYS,
@@ -107,6 +106,7 @@ END
 // remains consistent on all systems.
 IDI_SMILINGICON         ICON                    "smiley.ICO"
 
+
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -132,7 +132,7 @@ END
 
 #endif    // APSTUDIO_INVOKED
 
-#endif    // Нейтральный resources
+#endif    // Neutral resources
 /////////////////////////////////////////////////////////////////////////////
 
 
-- 
cgit v1.2.3