minor options redesign

git-svn-id: http://svn.miranda-ng.org/main/trunk@7697 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 65 insertions, 32 deletions

diff --git a/protocols/MSN/res/msn.rc b/protocols/MSN/res/msn.rc
index c309a0aa08..b8b9fa5d98 100644
--- a/protocols/MSN/res/msn.rc
+++ b/protocols/MSN/res/msn.rc
@@ -24,7 +24,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 // Dialog

 //

 

-IDD_OPT_MSN DIALOGEX 0, 0, 304, 194

+IDD_OPT_MSN DIALOGEX 0, 0, 304, 176

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE

 EXSTYLE WS_EX_CONTROLPARENT

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

@@ -38,39 +38,39 @@ BEGIN
     EDITTEXT        IDC_HANDLE2,72,50,100,12,ES_AUTOHSCROLL

     CONTROL         "Create a new Windows Live account",IDC_NEWMSNACCOUNTLINK,

                     "Hyperlink",WS_TABSTOP,21,68,208,8

-    GROUPBOX        "Expert",IDC_STATIC,4,84,298,106,WS_GROUP

+    GROUPBOX        "Expert",IDC_STATIC,4,84,298,88,WS_GROUP

     CONTROL         "Send message font color/size info inside messages",IDC_SENDFONTINFO,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,96,288,10

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,95,280,10

     CONTROL         "Disable all contacts not included into my contact list",IDC_DISABLE_ANOTHER_CONTACTS,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,106,288,10

-    CONTROL         "Manage server groups",IDC_MANAGEGROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,116,288,10

-    CONTROL         "Run the following application when new Hotmail arrives",IDC_RUN_APP_ON_HOTMAIL,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,158,288,10

-    EDITTEXT        IDC_MAILER_APP,21,170,161,12,ES_AUTOHSCROLL

-    PUSHBUTTON      "...",IDC_ENTER_MAILER_APP,186,170,15,12

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,106,280,10

+    CONTROL         "Manage server groups",IDC_MANAGEGROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,116,280,10

     CONTROL         "Allow people on my contact list send messages to mobile device",IDC_MOBILESEND,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,126,288,10

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,126,280,10

+    CONTROL         "Run the following application when new Hotmail arrives",IDC_RUN_APP_ON_HOTMAIL,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,137,280,10

+    EDITTEXT        IDC_MAILER_APP,22,153,237,12,ES_AUTOHSCROLL

+    PUSHBUTTON      "...",IDC_ENTER_MAILER_APP,265,153,15,12

 END

 

-IDD_OPT_MSN_CONN DIALOGEX 0, 0, 304, 169

+IDD_OPT_MSN_CONN DIALOGEX 0, 0, 304, 127

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE

 EXSTYLE WS_EX_CONTROLPARENT

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

 BEGIN

-    GROUPBOX        "Connection settings",IDC_STATIC,4,0,298,106

-    LTEXT           "Direct:",IDC_STATIC,12,18,52,8

+    GROUPBOX        "Connection settings",IDC_STATIC,4,3,298,64

+    RTEXT           "Direct:",IDC_STATIC,10,18,52,8

     EDITTEXT        IDC_DIRECTSERVER,68,16,135,12,ES_AUTOHSCROLL

-    LTEXT           " 1863",IDC_STATIC,210,16,27,12,SS_SUNKEN

-    LTEXT           "Gateway:",IDC_STATIC,12,32,52,8

+    LTEXT           " 1863",IDC_STATIC,209,16,28,12,SS_SUNKEN

+    RTEXT           "Gateway:",IDC_STATIC,10,32,52,8

     EDITTEXT        IDC_GATEWAYSERVER,68,30,135,12,ES_AUTOHSCROLL

     CONTROL         " 80",IDC_STATIC,"Static",SS_SIMPLE | SS_SUNKEN | WS_GROUP,209,30,28,12

     PUSHBUTTON      "Reset",IDC_RESETSERVER,244,16,48,12

     CONTROL         "Notify me when a message delivery has failed",IDC_SLOWSEND,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,49,285,8

-    GROUPBOX        "Incoming file transfers",IDC_STATIC,4,108,298,48

-    COMBOBOX        IDC_HOSTOPT,11,120,261,30,CBS_DROPDOWNLIST | WS_TABSTOP

-    LTEXT           "Your host (or router):",IDC_STATIC,12,138,90,8

-    EDITTEXT        IDC_YOURHOST,105,136,169,12,ES_AUTOHSCROLL

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,49,285,8

+    GROUPBOX        "Incoming file transfers",IDC_STATIC,4,74,298,48

+    COMBOBOX        IDC_HOSTOPT,10,86,285,30,CBS_DROPDOWNLIST | WS_TABSTOP

+    RTEXT           "Your host (or router):",IDC_STATIC,10,103,90,8

+    EDITTEXT        IDC_YOURHOST,105,102,190,12,ES_AUTOHSCROLL

 END

 

 IDD_LISTSMGR DIALOGEX 0, 0, 304, 228

@@ -93,27 +93,27 @@ BEGIN
     PUSHBUTTON      "Refresh",IDC_LISTREFRESH,218,209,80,13

 END

 

-IDD_OPT_NOTIFY DIALOGEX 0, 0, 238, 145

+IDD_OPT_NOTIFY DIALOGEX 0, 0, 289, 126

 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

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

 BEGIN

-    GROUPBOX        "Hotmail",IDC_STATIC,0,28,236,60

+    GROUPBOX        "Hotmail",IDC_STATIC,5,7,262,60

     CONTROL         "Disable Popup notifications",IDC_DISABLEHOTMAILPOPUP,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,40,219,10

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,18,245,10

     CONTROL         "Disable Tray notifications",IDC_DISABLEHOTMAILTRAY,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,62,220,10

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,41,245,10

     CONTROL         "Ignore new messages not in Inbox folder",IDC_DISABLEHOTJUNK,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,73,218,10

-    GROUPBOX        "Other",IDC_STATIC,0,90,236,49

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,52,245,10

+    GROUPBOX        "Other",IDC_STATIC,5,68,262,49

     CONTROL         "Display errors using popups",IDC_ERRORS_USING_POPUPS,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,101,216,10

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,79,245,10

     CONTROL         "Enable 'Chat Session Established' popup",IDC_NOTIFY_FIRSTMSG,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,114,216,10

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,92,245,10

     CONTROL         "Enable 'Contact left channel' popup",IDC_NOTIFY_ENDSESSION,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,126,216,8

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,105,245,8

     CONTROL         "Disable Contact List notifications",IDC_DISABLEHOTMAILCL,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,51,220,10

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,30,245,10

 END

 

 IDD_SETNICKNAME DIALOGEX 0, 0, 187, 42

@@ -226,9 +226,42 @@ END
 #ifdef APSTUDIO_INVOKED

 GUIDELINES DESIGNINFO

 BEGIN

+    IDD_OPT_MSN, DIALOG

+    BEGIN

+        VERTGUIDE, 12

+        VERTGUIDE, 292

+    END

+

+    IDD_OPT_MSN_CONN, DIALOG

+    BEGIN

+        VERTGUIDE, 10

+        VERTGUIDE, 68

+        VERTGUIDE, 203

+        VERTGUIDE, 209

+        VERTGUIDE, 237

+        VERTGUIDE, 295

+    END

+

+    IDD_LISTSMGR, DIALOG

+    BEGIN

+    END

+

     IDD_OPT_NOTIFY, DIALOG

     BEGIN

-        BOTTOMMARGIN, 142

+        RIGHTMARGIN, 276

+        VERTGUIDE, 5

+        VERTGUIDE, 14

+        VERTGUIDE, 259

+        VERTGUIDE, 267

+        BOTTOMMARGIN, 123

+    END

+

+    IDD_SETNICKNAME, DIALOG

+    BEGIN

+    END

+

+    IDD_USEROPTS, DIALOG

+    BEGIN

     END

 

     IDD_CARD_GEN, DIALOG

diff --git a/protocols/MSN/src/resource.h b/protocols/MSN/src/resource.h
index 16a5491319..938a0124b7 100644
--- a/protocols/MSN/src/resource.h
+++ b/protocols/MSN/src/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}

 // Microsoft Visual C++ generated include file.

-// Used by msn.rc

+// Used by ..\res\msn.rc

 //

 #define IDD_CHATROOM_INVITE             40

 #define IDI_MSN                         101