From d3a61dde4e1608dc68d7df1a492abe7a8298d0b6 Mon Sep 17 00:00:00 2001 From: "chak%netscape.com" Date: Tue, 5 Feb 2002 02:57:54 +0000 Subject: [PATCH] Fix for #123054 - Rearrange profile dlgs in MfcEmbed r=adamlock, sr=alecf --- embedding/tests/mfcembed/MfcEmbed.rc | 32 ++++++++++++------------ embedding/tests/mfcembed/ProfilesDlg.cpp | 6 +++++ embedding/tests/mfcembed/ProfilesDlg.h | 1 + 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/embedding/tests/mfcembed/MfcEmbed.rc b/embedding/tests/mfcembed/MfcEmbed.rc index 3248a0326603..d5c167564824 100644 --- a/embedding/tests/mfcembed/MfcEmbed.rc +++ b/embedding/tests/mfcembed/MfcEmbed.rc @@ -306,20 +306,20 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,178,7,50,14,WS_GROUP END -IDD_PROFILES DIALOG DISCARDABLE 0, 0, 196, 95 +IDD_PROFILES DIALOG DISCARDABLE 0, 0, 193, 110 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Manage Profiles" FONT 8, "MS Sans Serif" BEGIN - LISTBOX IDC_LIST1,79,17,110,44,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | + LISTBOX IDC_LIST1,7,7,117,56,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Rename...",IDC_PROF_RENAME,7,7,50,14 - PUSHBUTTON "Delete",IDC_PROF_DELETE,7,27,50,14 - PUSHBUTTON "New...",IDC_PROF_NEW,7,48,50,14 - DEFPUSHBUTTON "OK",IDOK,139,74,50,14 - PUSHBUTTON "Cancel",IDCANCEL,80,74,50,14 + PUSHBUTTON "New...",IDC_PROF_NEW,133,7,50,14 + PUSHBUTTON "Rename...",IDC_PROF_RENAME,133,27,50,14 + PUSHBUTTON "Delete",IDC_PROF_DELETE,133,48,50,14 CONTROL "Ask At Startup",IDC_CHECK_ASK_AT_START,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,75,61,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,71,61,10 + DEFPUSHBUTTON "OK",IDOK,77,89,50,14 + PUSHBUTTON "Cancel",IDCANCEL,133,89,50,14 END IDD_PROFILE_NEW DIALOG DISCARDABLE 0, 0, 177, 79 @@ -327,24 +327,24 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "New Profile" FONT 8, "MS Sans Serif" BEGIN + RTEXT "Name:",IDC_STATIC,13,18,22,8 EDITTEXT IDC_NEW_PROF_NAME,39,16,122,14,ES_AUTOHSCROLL + RTEXT "Locale:",IDC_STATIC,11,37,24,8 COMBOBOX IDC_LOCALE_COMBO,39,35,67,30,CBS_DROPDOWNLIST | CBS_SORT | WS_DISABLED | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK",IDOK,120,58,50,14 - PUSHBUTTON "Cancel",IDCANCEL,63,58,50,14 - RTEXT "Name:",IDC_STATIC,13,18,22,8 - RTEXT "Locale:",IDC_STATIC,11,37,24,8 + DEFPUSHBUTTON "OK",IDOK,64,58,50,14 + PUSHBUTTON "Cancel",IDCANCEL,120,58,50,14 END -IDD_PROFILE_RENAME DIALOG DISCARDABLE 0, 0, 177, 76 +IDD_PROFILE_RENAME DIALOG DISCARDABLE 0, 0, 177, 71 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Rename Profile" FONT 8, "MS Sans Serif" BEGIN - EDITTEXT IDC_NEW_NAME,50,16,113,14,ES_AUTOHSCROLL - DEFPUSHBUTTON "OK",IDOK,120,55,50,14 - PUSHBUTTON "Cancel",IDCANCEL,63,55,50,14 RTEXT "New Name:",IDC_STATIC,7,18,38,8 + EDITTEXT IDC_NEW_NAME,50,16,113,14,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,60,48,50,14 + PUSHBUTTON "Cancel",IDCANCEL,115,48,50,14 END IDD_FINDDLG DIALOG DISCARDABLE 30, 73, 236, 62 diff --git a/embedding/tests/mfcembed/ProfilesDlg.cpp b/embedding/tests/mfcembed/ProfilesDlg.cpp index 9041769aa514..720d76114c61 100644 --- a/embedding/tests/mfcembed/ProfilesDlg.cpp +++ b/embedding/tests/mfcembed/ProfilesDlg.cpp @@ -167,6 +167,7 @@ BEGIN_MESSAGE_MAP(CProfilesDlg, CDialog) ON_BN_CLICKED(IDC_PROF_NEW, OnNewProfile) ON_BN_CLICKED(IDC_PROF_RENAME, OnRenameProfile) ON_BN_CLICKED(IDC_PROF_DELETE, OnDeleteProfile) + ON_LBN_DBLCLK(IDC_LIST1, OnDblclkProfile) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -295,3 +296,8 @@ void CProfilesDlg::OnDeleteProfile() } } } + +void CProfilesDlg::OnDblclkProfile() +{ + OnOK(); +} diff --git a/embedding/tests/mfcembed/ProfilesDlg.h b/embedding/tests/mfcembed/ProfilesDlg.h index f82cb2d2c89f..d033fbfe47d8 100644 --- a/embedding/tests/mfcembed/ProfilesDlg.h +++ b/embedding/tests/mfcembed/ProfilesDlg.h @@ -110,6 +110,7 @@ protected: afx_msg void OnNewProfile(); afx_msg void OnRenameProfile(); afx_msg void OnDeleteProfile(); + afx_msg void OnDblclkProfile(); //}}AFX_MSG DECLARE_MESSAGE_MAP() };