metacontacts:

-fixed a rare crash
-some ressource fixes
-code cleanup

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

1 files changed, 38 insertions, 28 deletions

diff --git a/src/resource.rc b/src/resource.rc
index 287b2ec578..75db71ff81 100644
--- a/src/resource.rc
+++ b/src/resource.rc
@@ -742,10 +742,10 @@ CAPTION "Add to Existing MetaContact"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

     CTEXT           "Please select a MetaContact:",IDC_STATIC,5,4,207,8

+    LISTBOX         IDC_METALIST,4,16,211,222,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP

+    CONTROL         "Sort Alphabetically",IDC_CHK_SRT,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,6,244,104,8

     DEFPUSHBUTTON   "&OK",IDOK,115,241,48,14

     PUSHBUTTON      "&Cancel",IDCANCEL,167,241,48,14

-    LISTBOX         IDC_METALIST,4,16,211,222,LBS_NOINTEGRALHEIGHT | WS_VSCROLL

-    CONTROL         "Sort Alphabetically",IDC_CHK_SRT,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,6,244,104,8

 END

 

 IDD_METAEDIT DIALOGEX 0, 0, 383, 260

@@ -754,38 +754,38 @@ EXSTYLE WS_EX_STATICEDGE
 CAPTION "Editing"

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

 BEGIN

-    DEFPUSHBUTTON   "&OK",IDOK,220,241,50,14

-    PUSHBUTTON      "&Cancel",IDCANCEL,274,241,50,14

-    RTEXT           "Name:",IDC_STATIC,70,17,51,8

     GROUPBOX        "Information",IDC_STATIC,4,4,375,29

+    RTEXT           "Name:",IDC_STATIC,70,17,51,8

+    EDITTEXT        IDC_ED_NAME,129,15,183,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP

     GROUPBOX        "Contacts",IDC_FRAME,4,33,375,202

-    PUSHBUTTON      "&Apply",IDC_VALIDATE,328,241,50,14

-    DEFPUSHBUTTON   "&Remove",IDC_BTN_REM,87,216,54,14

+    CONTROL         "List1",IDC_LST_CONTACTS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,10,43,363,169,WS_EX_CLIENTEDGE

+    PUSHBUTTON      "&Remove",IDC_BTN_REM,87,216,54,14

     PUSHBUTTON      "&Set as Default",IDC_BTN_SETDEFAULT,145,216,54,14

     PUSHBUTTON      "Move &Up",IDC_BTN_UP,261,216,54,14

     PUSHBUTTON      "Move &Down",IDC_BTN_DOWN,319,216,54,14

-    EDITTEXT        IDC_ED_NAME,129,15,183,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP

-    CONTROL         "List1",IDC_LST_CONTACTS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,10,43,363,169,WS_EX_CLIENTEDGE

     PUSHBUTTON      "Send &Offline",IDC_BTN_SETOFFLINE,203,216,54,14

+    DEFPUSHBUTTON   "&OK",IDOK,220,241,50,14

+    PUSHBUTTON      "&Cancel",IDCANCEL,274,241,50,14

+    PUSHBUTTON      "&Apply",IDC_VALIDATE,328,241,50,14

 END

 

-IDD_METAOPTIONS DIALOGEX 0, 0, 298, 178

+IDD_METAOPTIONS DIALOGEX 0, 0, 298, 168

 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

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

 BEGIN

-    GROUPBOX        "Context Menu",IDC_STATIC,4,79,289,58

-    CONTROL         "Use contact's unique ID",IDC_RAD_UID,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,100,112,10

-    CONTROL         "Use contact's display name",IDC_RAD_DID,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,114,112,10

-    GROUPBOX        "Contact Labels",IDC_STATIC,9,87,120,45,WS_GROUP

-    GROUPBOX        "Function",IDC_STATIC,133,87,155,45,WS_GROUP

-    CONTROL         "Set default and open message window",IDC_RAD_MSG,"Button",BS_AUTORADIOBUTTON | WS_GROUP,137,98,148,10

-    CONTROL         "Show subcontact context menu",IDC_RAD_MENU,"Button",BS_AUTORADIOBUTTON | WS_GROUP,137,108,148,10

-    CONTROL         "Show user information",IDC_RAD_INFO,"Button",BS_AUTORADIOBUTTON | WS_GROUP,137,118,148,10

-    GROUPBOX        "Contact List",IDC_STATIC,4,139,289,33,WS_GROUP

-    CONTROL         "Display subcontact nickname",IDC_RAD_NICK,"Button",BS_AUTORADIOBUTTON | WS_GROUP,9,149,144,10

-    CONTROL         "Display subcontact display name",IDC_RAD_NAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,9,160,144,10

-    CONTROL         "Lock name to first contact",IDC_CHK_LOCKHANDLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,173,155,115,10

+    GROUPBOX        "Context Menu",IDC_STATIC,4,4,289,109

+    CONTROL         "Use contact's unique ID",IDC_RAD_UID,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,30,264,10

+    CONTROL         "Use contact's display name",IDC_RAD_DID,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,43,264,10

+    GROUPBOX        "Contact Labels",IDC_STATIC,9,16,278,45,WS_GROUP

+    GROUPBOX        "Function",IDC_STATIC,10,65,277,45,WS_GROUP

+    CONTROL         "Set default and open message window",IDC_RAD_MSG,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,76,264,10

+    CONTROL         "Show subcontact context menu",IDC_RAD_MENU,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,87,264,10

+    CONTROL         "Show user information",IDC_RAD_INFO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,97,264,10

+    GROUPBOX        "Contact List",IDC_STATIC,4,117,289,47,WS_GROUP

+    CONTROL         "Display subcontact nickname",IDC_RAD_NICK,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,10,129,277,10

+    CONTROL         "Display subcontact display name",IDC_RAD_NAME,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,10,140,277,10

+    CONTROL         "Lock name to first contact",IDC_CHK_LOCKHANDLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,151,278,10

 END

 

 IDD_METACOPYPROGRESS DIALOG 0, 0, 186, 90

@@ -812,16 +812,16 @@ EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

     GROUPBOX        "Subcontact Priorities",IDC_STATIC,7,7,252,143

-    EDITTEXT        IDC_ED_PRIORITY,157,78,40,14,ES_AUTOHSCROLL | ES_NUMBER

-    CONTROL         "",IDC_SP_PRIORITY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,195,78,11,14

-    RTEXT           "Rank:",IDC_STATIC,42,81,49,8

-    RTEXT           "Status:",IDC_STATIC,30,57,61,8

-    COMBOBOX        IDC_CMB_STATUS,98,53,112,87,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP

     RTEXT           "Protocol:",IDC_STATIC,30,31,61,8

     COMBOBOX        IDC_CMB_PROTOCOL,98,28,112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP

-    PUSHBUTTON      "Reset All",IDC_BTN_RESET,87,119,91,14

+    RTEXT           "Status:",IDC_STATIC,30,57,61,8

+    COMBOBOX        IDC_CMB_STATUS,98,53,112,87,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP

+    RTEXT           "Rank:",IDC_STATIC,42,81,49,8

     CONTROL         "Default",IDC_CHK_DEFAULT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,97,81,58,10

+    EDITTEXT        IDC_ED_PRIORITY,157,78,40,14,ES_AUTOHSCROLL | ES_NUMBER

+    CONTROL         "",IDC_SP_PRIORITY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,195,78,11,14

     CTEXT           "(Lower ranks are preferred)",IDC_STATIC,51,99,162,8

+    PUSHBUTTON      "Reset All",IDC_BTN_RESET,87,119,91,14

 END

 

 IDD_OPT_LANGUAGES DIALOGEX 0, 0, 301, 191

@@ -1126,6 +1126,16 @@ BEGIN
     BEGIN

     END

 

+    IDD_METAOPTIONS, DIALOG

+    BEGIN

+        VERTGUIDE, 4

+        VERTGUIDE, 10

+        VERTGUIDE, 16

+        VERTGUIDE, 280

+        VERTGUIDE, 287

+        VERTGUIDE, 293

+    END

+

     IDD_OPT_LANGUAGES, DIALOG

     BEGIN

         VERTGUIDE, 5