MyDetails: Changed control order

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

2 files changed, 26 insertions, 26 deletions

diff --git a/plugins/MyDetails/res/resource.rc b/plugins/MyDetails/res/resource.rc
index 3d93641bb1..830ec2aa36 100644
--- a/plugins/MyDetails/res/resource.rc
+++ b/plugins/MyDetails/res/resource.rc
@@ -42,29 +42,27 @@ EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

     GROUPBOX        "General",IDC_STATIC,7,2,307,68

-    CONTROL         "...avatar",IDC_GLOBAL_ON_AVATAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,215,25,96,8

     CONTROL         "RTL",IDC_TEXT_RTL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,11,86,14

     CONTROL         "Align text to right",IDC_TEXT_ALIGN_RIGHT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,11,99,14

-    CONTROL         "...nickname",IDC_GLOBAL_ON_NICKNAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,215,35,96,8

     CONTROL         "Auto-resize frame",IDC_RESIZE_FRAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,32,86,14

     CONTROL         "Use contact list smileys",IDC_USE_CONTACT_LIST_SMILEYS,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,32,108,14

-    CONTROL         "...status",IDC_GLOBAL_ON_STATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,215,46,96,8

     CONTROL         "Replace Smileys",IDC_REPLACE_SMILEYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,57,86,8

     CONTROL         "Resize Smileys",IDC_RESIZE_SMILEYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,57,107,8

+    LTEXT           "Global On...",IDC_STATIC,210,14,93,8

+    CONTROL         "...avatar",IDC_GLOBAL_ON_AVATAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,215,25,96,8

+    CONTROL         "...nickname",IDC_GLOBAL_ON_NICKNAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,215,35,96,8

+    CONTROL         "...status",IDC_GLOBAL_ON_STATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,215,46,96,8

     CONTROL         "...status message",IDC_GLOBAL_ON_STATUS_MESSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,215,57,96,8

-    RTEXT           "Top:",IDC_STATIC,108,194,41,11

-    EDITTEXT        IDC_BORDER_TOP,154,194,35,12,ES_NUMBER

-    CONTROL         "",IDC_BORDER_TOP_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,181,194,11,12

-    RTEXT           "Bottom:",IDC_STATIC,111,212,41,11

-    EDITTEXT        IDC_BORDER_BOTTOM,154,210,35,12,ES_NUMBER

-    CONTROL         "",IDC_BORDER_BOTTOM_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,181,210,11,12

-    RTEXT           "Left:",IDC_STATIC,11,203,42,11

-    EDITTEXT        IDC_BORDER_LEFT,58,201,35,12,ES_NUMBER

-    CONTROL         "",IDC_BORDER_LEFT_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,86,201,11,12

-    RTEXT           "Right:",IDC_STATIC,209,203,40,8

-    EDITTEXT        IDC_BORDER_RIGHT,251,202,35,12,ES_NUMBER

-    CONTROL         "",IDC_BORDER_RIGHT_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,279,202,11,12

+    GROUPBOX        "Account",IDC_STATIC,7,70,307,42

+    CONTROL         "Show account name",IDC_SHOW_PROTO_NAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,81,138,13

+    CONTROL         "Show account cycle button",IDC_SHOW_CYCLE_PROTO_BUTTON,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,81,138,11

+    CONTROL         "Cycle through accounts every:",IDC_CYCLE_THROUGH_PROTOS,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,93,145,14

+    EDITTEXT        IDC_CYCLE_TIME,163,94,35,12,ES_NUMBER

+    CONTROL         "",IDC_CYCLE_TIME_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,190,94,11,12

+    LTEXT           "seconds",IDC_STATIC,204,96,38,11

     GROUPBOX        "Avatar",IDC_STATIC,7,112,307,71

     CONTROL         "Custom size:",IDC_AVATAR_CUSTOM_SIZE_CHK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,125,70,9

     EDITTEXT        IDC_AVATAR_CUSTOM_SIZE,87,123,35,12,ES_NUMBER

@@ -80,17 +78,19 @@ BEGIN
     LTEXT           "pixels",IDC_STATIC,258,153,46,11

     CONTROL         "Use free space (under avatar) to other texts",IDC_AVATAR_USE_FREE_SPACE,

                     "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,12,169,288,11

-    LTEXT           "Global On...",IDC_STATIC,210,14,93,8

     GROUPBOX        "Frame Options",IDC_STATIC,7,183,307,44

-    CONTROL         "Cycle through accounts every:",IDC_CYCLE_THROUGH_PROTOS,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,93,145,14

-    EDITTEXT        IDC_CYCLE_TIME,163,94,35,12,ES_NUMBER

-    CONTROL         "",IDC_CYCLE_TIME_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,190,94,11,12

-    LTEXT           "seconds",IDC_STATIC,204,96,38,11

-    GROUPBOX        "Account",IDC_STATIC,7,70,307,42

-    CONTROL         "Show account name",IDC_SHOW_PROTO_NAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,81,138,13

-    CONTROL         "Show account cycle button",IDC_SHOW_CYCLE_PROTO_BUTTON,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,81,138,11

+    RTEXT           "Top:",IDC_STATIC,108,194,41,11

+    EDITTEXT        IDC_BORDER_TOP,154,194,35,12,ES_NUMBER

+    CONTROL         "",IDC_BORDER_TOP_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,181,194,11,12

+    RTEXT           "Bottom:",IDC_STATIC,111,212,41,11

+    EDITTEXT        IDC_BORDER_BOTTOM,154,210,35,12,ES_NUMBER

+    CONTROL         "",IDC_BORDER_BOTTOM_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,181,210,11,12

+    RTEXT           "Left:",IDC_STATIC,11,203,42,11

+    EDITTEXT        IDC_BORDER_LEFT,58,201,35,12,ES_NUMBER

+    CONTROL         "",IDC_BORDER_LEFT_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,86,201,11,12

+    RTEXT           "Right:",IDC_STATIC,209,203,40,8

+    EDITTEXT        IDC_BORDER_RIGHT,251,202,35,12,ES_NUMBER

+    CONTROL         "",IDC_BORDER_RIGHT_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,279,202,11,12

 END

 

 IDD_SETSTATUSMESSAGE DIALOG 0, 0, 283, 68

diff --git a/plugins/MyDetails/src/options.cpp b/plugins/MyDetails/src/options.cpp
index 735b95524e..148f63e633 100644
--- a/plugins/MyDetails/src/options.cpp
+++ b/plugins/MyDetails/src/options.cpp
@@ -135,7 +135,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 	return ret;

 }

 

-int InitOptionsCallback(WPARAM wParam,LPARAM lParam)

+int InitOptionsCallback(WPARAM wParam,LPARAM)

 {

 	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

 	odp.position = -200000000;