fix uninstall dialog listed all package names on one line

This commit is contained in:
Chris Danford
2005-10-23 17:06:54 +00:00
parent 5d41ae8076
commit a6d98549e3
3 changed files with 18 additions and 18 deletions
@@ -209,7 +209,7 @@ bool CSMPackageInstallDlg::CheckPackages()
{ {
UninstallOld UninstallOldDlg; UninstallOld UninstallOldDlg;
UninstallOldDlg.m_sPackages = join("\n", Directories); UninstallOldDlg.m_sPackages = join("\r\n", Directories);
int nResponse = UninstallOldDlg.DoModal(); int nResponse = UninstallOldDlg.DoModal();
if( nResponse == IDCANCEL ) if( nResponse == IDCANCEL )
return false; // cancelled return false; // cancelled
+12 -12
View File
@@ -16,23 +16,23 @@ Resource1=IDR_MAINFRAME
Resource2=IDD_ENTER_STRING Resource2=IDD_ENTER_STRING
Class3=CSMPackageInstallDlg Class3=CSMPackageInstallDlg
Class4=CSmpackageExportDlg Class4=CSmpackageExportDlg
Resource3=IDD_UNINSTALL_OLD_PACKAGES Resource3=IDD_CONVERT_THEME
Class5=EnterName Class5=EnterName
Resource4=IDD_CONVERT_THEME Resource4=IDD_INSTALL
Class6=EditInsallations Class6=EditInsallations
Resource5=IDD_MENU Resource5=IDD_UNINSTALL_OLD_PACKAGES
Class7=MainMenuDlg Class7=MainMenuDlg
Resource6=IDD_DIALOG_NAME Resource6=IDD_SHOW_COMMENT
Class8=ConvertThemeDlg Class8=ConvertThemeDlg
Resource7=IDD_SHOW_COMMENT Resource7=IDD_DIALOG_NAME
Class9=EditMetricsDlg Class9=EditMetricsDlg
Resource8=IDD_ENTER_COMMENT Resource8=IDD_EXPORTER
Resource9=IDD_EXPORTER Resource9=IDD_EDIT_METRICS
Class10=EnterComment Class10=EnterComment
Resource10=IDD_INSTALL Resource10=IDD_MENU
Class11=ShowComment Class11=ShowComment
Resource11=IDD_EDIT_METRICS Resource11=IDD_EDIT_INSTALLATIONS
Resource12=IDD_EDIT_INSTALLATIONS Resource12=IDD_ENTER_COMMENT
Class12=ChangeGameSettings Class12=ChangeGameSettings
Resource13=IDD_CHANGE_GAME_SETTINGS Resource13=IDD_CHANGE_GAME_SETTINGS
@@ -286,9 +286,9 @@ ControlCount=6
Control1=IDOK,button,1342242817 Control1=IDOK,button,1342242817
Control2=IDCANCEL,button,1342242816 Control2=IDCANCEL,button,1342242816
Control3=IDC_STATIC,static,1342308352 Control3=IDC_STATIC,static,1342308352
Control4=IDC_PACKAGES,edit,1342244992 Control4=IDC_PACKAGES,edit,1352730756
Control5=IDC_BUTTON1,button,1342242816 Control5=IDC_BUTTON1,button,1342242816
Control6=IDC_STATIC,static,1342308352 Control6=IDC_STATIC,static,1342308353
[DLG:IDD_CHANGE_GAME_SETTINGS] [DLG:IDD_CHANGE_GAME_SETTINGS]
Type=1 Type=1
+5 -5
View File
@@ -268,19 +268,19 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,149,145,11 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,149,145,11
END END
IDD_UNINSTALL_OLD_PACKAGES DIALOGEX 0, 0, 277, 161 IDD_UNINSTALL_OLD_PACKAGES DIALOG DISCARDABLE 0, 0, 277, 161
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Uninstall Old Packages" CAPTION "Uninstall Old Packages"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg"
BEGIN BEGIN
DEFPUSHBUTTON "&Yes",IDOK,55,132,50,14 DEFPUSHBUTTON "&Yes",IDOK,55,132,50,14
PUSHBUTTON "Cancel",IDCANCEL,171,132,50,14 PUSHBUTTON "Cancel",IDCANCEL,171,132,50,14
LTEXT "The following packages are already installed. It is strongly recommended that they be deleted before installing this package.", LTEXT "The following packages are already installed. It is strongly recommended that they be deleted before installing this package.",
IDC_STATIC,32,11,214,19 IDC_STATIC,32,11,214,19
EDITTEXT IDC_PACKAGES,56,47,165,67,ES_AUTOHSCROLL | ES_READONLY | EDITTEXT IDC_PACKAGES,56,37,165,77,ES_MULTILINE | ES_AUTOHSCROLL |
NOT WS_BORDER ES_READONLY | WS_VSCROLL
PUSHBUTTON "&No",IDC_BUTTON1,111,132,49,14 PUSHBUTTON "&No",IDC_BUTTON1,111,132,49,14
LTEXT "Delete old packages?",IDC_STATIC,105,119,67,12 CTEXT "Delete old packages?",IDC_STATIC,55,119,166,12
END END
IDD_CHANGE_GAME_SETTINGS DIALOG DISCARDABLE 0, 0, 162, 285 IDD_CHANGE_GAME_SETTINGS DIALOG DISCARDABLE 0, 0, 162, 285