fixes #3843 (MenuEx: не помещается перевод)

3 files changed, 48 insertions, 43 deletions

diff --git a/plugins/MenuItemEx/res/resource.rc b/plugins/MenuItemEx/res/resource.rc
index 601624c42b..a21a9df1ba 100644
--- a/plugins/MenuItemEx/res/resource.rc
+++ b/plugins/MenuItemEx/res/resource.rc
@@ -27,46 +27,58 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

 IDI_HIDE                ICON                    "hide_from_list.ico"

+

 IDI_VISIBLE             ICON                    "Always Visible.ico"

+

 IDI_INVISIBLE           ICON                    "Never Visible.ico"

+

 IDI_COPYID              ICON                    "copyid_overlay.ico"

+

 IDI_PROTOCOL            ICON                    "change_proto.ico"

+

 IDI_IGNORE              ICON                    "ignore_list.ico"

+

 IDI_SHOWINLIST          ICON                    "show_in_list.ico"

+

 IDI_COPYSTATUS          ICON                    "msg_status.ico"

+

 IDI_COPYXSTATUS         ICON                    "msg_xstatus.ico"

+

 IDI_COPYIP              ICON                    "copyip_overlay.ico"

+

 IDI_BROWSE              ICON                    "recv_files.ico"

+

 IDI_MIRVER              ICON                    "CopyMirVer.ico"

 

+

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

 //

 // Dialog

 //

 

-IDD_OPTIONS DIALOGEX 0, 0, 280, 158

+IDD_OPTIONS DIALOGEX 0, 0, 280, 171

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

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

 BEGIN

-    GROUPBOX        "Shown menu items",IDC_STATIC,7,7,266,146

+    GROUPBOX        "Shown menu items",IDC_STATIC,7,3,266,151

     CONTROL         "Visibility",IDC_VIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,18,131,10

     CONTROL         "Show alpha icons",IDC_SHOWALPHAICONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,18,116,10

-    CONTROL         "Hide from list",IDC_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,30,131,10

-    CONTROL         "Ignore",IDC_IGNORE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,42,131,10

+    CONTROL         "Hide from list",IDC_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,30,251,10

+    CONTROL         "Ignore",IDC_IGNORE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,42,253,10

     CONTROL         "Copy to Account (Ctrl+click for move to Account)",IDC_PROTOS,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,54,251,10

-    CONTROL         "Browse Received Files",IDC_RECVFILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,66,131,10

-    CONTROL         "Copy IP",IDC_COPYIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,78,131,10

-    CONTROL         "Copy MirVer",IDC_COPYMIRVER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,90,131,10

-    CONTROL         "Copy Status Message",IDC_STATUSMSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,102,131,10

-    CONTROL         "Add item name",IDC_SMNAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,102,116,10

-    CONTROL         "Copy ID",IDC_COPYID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,114,131,10

-    CONTROL         "Add protocol name",IDC_COPYIDNAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,114,116,10

-    CONTROL         "Show ID in menu item",IDC_SHOWID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,126,124,10

-    CONTROL         "Trim too long ID",IDC_TRIMID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,126,116,10

-    LTEXT           "* Use Ctrl+click to see popup with the copied text",IDC_HINT1,16,138,251,11

-    CONTROL         "Hide contact on 'Ignore all'",IDC_IGNOREHIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,42,116,10

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,67,251,10

+    CONTROL         "Browse Received Files",IDC_RECVFILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,79,253,10

+    CONTROL         "Copy IP",IDC_COPYIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,91,252,10

+    CONTROL         "Copy MirVer",IDC_COPYMIRVER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,103,253,10

+    CONTROL         "Copy Status Message",IDC_STATUSMSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,115,131,10

+    CONTROL         "Add item name",IDC_SMNAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,115,116,10

+    CONTROL         "Copy ID",IDC_COPYID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,127,131,10

+    CONTROL         "Add protocol name",IDC_COPYIDNAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,127,116,10

+    CONTROL         "Show ID in menu item",IDC_SHOWID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,139,124,10

+    CONTROL         "Trim too long ID",IDC_TRIMID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,139,116,10

+    LTEXT           "* Use Ctrl+click to see popup with the copied text",IDC_HINT1,16,158,251,11

+    CONTROL         "Hide contact on 'Ignore all'",IDC_IGNOREHIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,54,254,10

 END

 

 

@@ -80,15 +92,7 @@ GUIDELINES DESIGNINFO
 BEGIN

     IDD_OPTIONS, DIALOG

     BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 273

-        VERTGUIDE, 16

-        VERTGUIDE, 25

-        VERTGUIDE, 152

-        VERTGUIDE, 162

-        VERTGUIDE, 214

-        VERTGUIDE, 267

-        TOPMARGIN, 7

+        BOTTOMMARGIN, 158

     END

 END

 #endif    // APSTUDIO_INVOKED

diff --git a/plugins/MenuItemEx/src/options.cpp b/plugins/MenuItemEx/src/options.cpp
index 061fa9af49..cf84d6daa6 100644
--- a/plugins/MenuItemEx/src/options.cpp
+++ b/plugins/MenuItemEx/src/options.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"

 

-struct {

+struct

+{

 	int idc;

 	int flag;

 }

@@ -61,12 +62,12 @@ public:
 	bool OnInitDialog() override

 	{

 		for (auto &it : checkboxes) {

-			CCtrlCheck &item = *(CCtrlCheck*)FindControl(it.idc);

+			CCtrlCheck &item = *(CCtrlCheck *)FindControl(it.idc);

 			item.SetState(m_flags & it.flag);

 		}

 

 		for (int i = 0; i < 4; i++) {

-			CCtrlCheck &item = *(CCtrlCheck*)FindControl(checkboxes[i].idc);

+			CCtrlCheck &item = *(CCtrlCheck *)FindControl(checkboxes[i].idc);

 			CMStringW buffer;

 			buffer.Format(L"%s *", item.GetText());

 			item.SetText(buffer);

@@ -79,7 +80,7 @@ public:
 		uint32_t mod_flags = 0;

 

 		for (auto &it : checkboxes) {

-			CCtrlCheck &item = *(CCtrlCheck*)FindControl(it.idc);

+			CCtrlCheck &item = *(CCtrlCheck *)FindControl(it.idc);

 			mod_flags |= item.GetState() ? it.flag : 0;

 		}

 

@@ -87,24 +88,24 @@ public:
 		return true;

 	}

 

-	void onChange_Vis(CCtrlBase*)

+	void onChange_Vis(CCtrlBase *)

 	{

 		m_chkAlpha.Enable(m_chkVis.GetState());

 	}

 

-	void onChange_Ignore(CCtrlBase*)

+	void onChange_Ignore(CCtrlBase *)

 	{

 		m_chkIgnoreHide.Enable(m_chkIgnore.GetState());

 	}

 

-	void onChange_CopyID(CCtrlBase*)

+	void onChange_CopyID(CCtrlBase *)

 	{

 		m_chkCopyIDName.Enable(m_chkCopyID.GetState());

 		m_chkShowID.Enable(m_chkCopyID.GetState());

 		m_chkTrimID.Enable(m_chkCopyID.GetState() && m_chkShowID.GetState());

 	}

 

-	void onChange_StatusMsg(CCtrlBase*)

+	void onChange_StatusMsg(CCtrlBase *)

 	{

 		m_chkSMName.Enable(m_chkStatusMsg.GetState());

 	}

diff --git a/plugins/MenuItemEx/src/resource.h b/plugins/MenuItemEx/src/resource.h
index 2cc96bb73b..c8c493cfaf 100644
--- a/plugins/MenuItemEx/src/resource.h
+++ b/plugins/MenuItemEx/src/resource.h
@@ -1,18 +1,18 @@
 //{{NO_DEPENDENCIES}}

 // Microsoft Visual C++ generated include file.

-// Used by resource.rc

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

 //

 #define IDD_OPTIONS                     101

 #define IDD_AUTHREQ                     103

-#define IDI_HIDE                       110

-#define IDI_VISIBLE                       111

-#define IDI_INVISIBLE                       112

-#define IDI_COPYID                       113

-#define IDI_PROTOCOL                       116

-#define IDI_IGNORE                       117

-#define IDI_SHOWINLIST                       118

-#define IDI_COPYSTATUS                       119

-#define IDI_COPYXSTATUS                      120

+#define IDI_HIDE                        110

+#define IDI_VISIBLE                     111

+#define IDI_INVISIBLE                   112

+#define IDI_COPYID                      113

+#define IDI_PROTOCOL                    116

+#define IDI_IGNORE                      117

+#define IDI_SHOWINLIST                  118

+#define IDI_COPYSTATUS                  119

+#define IDI_COPYXSTATUS                 120

 #define IDI_COPYIP                      121

 #define IDI_BROWSE                      122

 #define IDI_MIRVER                      123