From ecd88d0d6db0d02aa3fa829e1fef62b0d59fcdb0 Mon Sep 17 00:00:00 2001
From: Tobias Weimer <wishmaster51@googlemail.com>
Date: Sun, 4 Nov 2012 14:55:57 +0000
Subject: - fixes minor display issues (#152)

git-svn-id: http://svn.miranda-ng.org/main/trunk@2183 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/NewXstatusNotify/res/resource.rc | 39 +++++++++++++++++++-------------
 plugins/NewXstatusNotify/src/options.cpp |  2 +-
 2 files changed, 24 insertions(+), 17 deletions(-)

(limited to 'plugins')

diff --git a/plugins/NewXstatusNotify/res/resource.rc b/plugins/NewXstatusNotify/res/resource.rc
index 11308ecd2e..c8aa467764 100644
--- a/plugins/NewXstatusNotify/res/resource.rc
+++ b/plugins/NewXstatusNotify/res/resource.rc
@@ -13,11 +13,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// Нейтральный resources
+// Neutral resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1251)
+#pragma code_page(1252)
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -84,7 +84,14 @@ BEGIN
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 296
+        VERTGUIDE, 1
+        VERTGUIDE, 11
+        VERTGUIDE, 14
+        VERTGUIDE, 288
         TOPMARGIN, 7
+        BOTTOMMARGIN, 214
+        HORZGUIDE, 156
+        HORZGUIDE, 208
     END
 END
 #endif    // APSTUDIO_INVOKED
@@ -323,20 +330,20 @@ BEGIN
     CONTROL         "Reset",IDC_BT_RESET,"MButtonClass",WS_TABSTOP,29,180,16,14
 END
 
-IDD_OPT_SMPOPUP DIALOGEX 0, 0, 305, 194
+IDD_OPT_SMPOPUP DIALOGEX 0, 0, 305, 226
 STYLE DS_SETFONT | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CONTROL | DS_CENTER | WS_CHILD
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    GROUPBOX        "General",IDC_STATIC,0,0,296,39
-    CONTROL         "Show PopUps when I connect",IDC_ONCONNECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,11,202,8
-    CONTROL         "Ignore empty status messages",IDC_PUIGNOREREMOVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,25,202,8
-    GROUPBOX        "Protocols",IDC_STATIC,0,41,296,94
-    CTEXT           "Enable/Disable protocols which you don't wish to be notified for:",IDC_STATIC,10,52,280,10
-    CONTROL         "",IDC_PROTOCOLLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,100,66,110,64
-    GROUPBOX        "Text",IDC_STATIC,0,135,152,34
-    EDITTEXT        IDC_POPUPTEXT,6,145,140,20,ES_MULTILINE | ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_STATICEDGE
-    CONTROL         "Variables",IDC_BT_VARIABLES,"MButtonClass",WS_TABSTOP,11,174,16,14
-    CONTROL         "Reset",IDC_BT_RESET,"MButtonClass",WS_TABSTOP,29,174,16,14
+    GROUPBOX        "General",IDC_STATIC,7,0,289,39
+    CONTROL         "Show PopUps when I connect",IDC_ONCONNECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,11,274,8
+    CONTROL         "Ignore empty status messages",IDC_PUIGNOREREMOVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,25,274,8
+    GROUPBOX        "Protocols",IDC_STATIC,7,41,289,124
+    CTEXT           "Enable/Disable protocols which you don't wish to be notified for:",IDC_STATIC,14,52,274,10
+    CONTROL         "",IDC_PROTOCOLLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,51,66,201,90
+    GROUPBOX        "Text",IDC_STATIC,7,170,289,38
+    EDITTEXT        IDC_POPUPTEXT,14,182,222,20,ES_MULTILINE | ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_STATICEDGE
+    CONTROL         "Variables",IDC_BT_VARIABLES,"MButtonClass",WS_TABSTOP,241,185,16,14
+    CONTROL         "Reset",IDC_BT_RESET,"MButtonClass",WS_TABSTOP,262,185,16,14
 END
 
 
@@ -358,12 +365,12 @@ IDI_DISABLEALL          ICON                    "disable_all.ico"
 IDI_ENABLEALL           ICON                    "enable_all.ico"
 IDI_VARIABLES           ICON                    "variables.ico"
 IDI_STATUS_MESSAGE      ICON                    "status_message.ico"
-#endif    // Нейтральный resources
+#endif    // Neutral resources
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
-// Немецкий (Германия) resources
+// German (Germany) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
@@ -394,7 +401,7 @@ END
 
 #endif    // APSTUDIO_INVOKED
 
-#endif    // Немецкий (Германия) resources
+#endif    // German (Germany) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp
index 360261f8f9..cc84b83911 100644
--- a/plugins/NewXstatusNotify/src/options.cpp
+++ b/plugins/NewXstatusNotify/src/options.cpp
@@ -789,7 +789,7 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		case BN_CLICKED:
 			switch (LOWORD(wParam)) {
 				case IDC_BT_VARIABLES:
-					MessageBox(0, VARIABLES_SM_HELP_TEXT, TranslateT("Variables"), MB_OK | MB_ICONINFORMATION);
+					MessageBox(hwndDlg, VARIABLES_SM_HELP_TEXT, TranslateT("Variables"), MB_OK | MB_ICONINFORMATION);
 					break;				
 
 				case IDC_BT_RESET:
-- 
cgit v1.2.3