diff --git a/stepmania/src/smpackage/ChangeGameSettings.cpp b/stepmania/src/smpackage/ChangeGameSettings.cpp index f9918018d9..d55d579921 100644 --- a/stepmania/src/smpackage/ChangeGameSettings.cpp +++ b/stepmania/src/smpackage/ChangeGameSettings.cpp @@ -156,7 +156,7 @@ void ChangeGameSettings::OnOK() if( !ini.WriteFile(SpecialFiles::PREFERENCES_INI_PATH) ) { RString sError = ssprintf( ERROR_WRITING_FILE.GetValue(), SpecialFiles::PREFERENCES_INI_PATH.c_str(), ini.GetError().c_str() ); - AfxMessageBox( sError ); + Dialog::OK( sError ); } CDialog::OnOK(); diff --git a/stepmania/src/smpackage/EditInsallations.cpp b/stepmania/src/smpackage/EditInsallations.cpp index 42a182d4f3..cb864761fa 100644 --- a/stepmania/src/smpackage/EditInsallations.cpp +++ b/stepmania/src/smpackage/EditInsallations.cpp @@ -103,7 +103,7 @@ void EditInsallations::OnButtonAdd() if( sNewDir == "" ) { - AfxMessageBox( YOU_MUST_TYPE_IN.GetValue() ); + Dialog::OK( YOU_MUST_TYPE_IN.GetValue() ); return; } @@ -118,7 +118,7 @@ void EditInsallations::OnButtonAdd() if( !SMPackageUtil::IsValidInstallDir(sNewDir) ) { - AfxMessageBox( ssprintf(NOT_A_VALID_INSTALLATION_DIR.GetValue(),sNewDir.c_str()) ); + Dialog::OK( ssprintf(NOT_A_VALID_INSTALLATION_DIR.GetValue(),sNewDir.c_str()) ); return; } diff --git a/stepmania/src/smpackage/LanguagesDlg.cpp b/stepmania/src/smpackage/LanguagesDlg.cpp index 4364683afb..a84a2315f7 100644 --- a/stepmania/src/smpackage/LanguagesDlg.cpp +++ b/stepmania/src/smpackage/LanguagesDlg.cpp @@ -231,8 +231,9 @@ void LanguagesDlg::OnBnClickedButtonDelete() RString sLanguageFile = GetLanguageFile( sTheme, sLanguage ); - int iRet = MessageBox( ssprintf(THIS_WILL_PERMANENTLY_DELETE.GetValue(),sLanguageFile.c_str()), NULL, MB_OKCANCEL ); - if( iRet != IDOK ) + RString sMessage = ssprintf(THIS_WILL_PERMANENTLY_DELETE.GetValue(),sLanguageFile.c_str()); + Dialog::Result ret = Dialog::AbortRetry( sMessage ); + if( ret != Dialog::retry ) return; FILEMAN->Remove( sLanguageFile ); @@ -303,14 +304,14 @@ void LanguagesDlg::OnBnClickedButtonExport() RString sFullFile = "Desktop/"+sFile; if( iNumExpored == 0 ) { - MessageBox( THERE_ARE_NO_STRINGS_TO_EXPORT.GetValue() ); + Dialog::OK( THERE_ARE_NO_STRINGS_TO_EXPORT.GetValue() ); return; } if( csv.WriteFile(sFullFile) ) - MessageBox( ssprintf(EXPORTED_TO_YOUR_DESKTOP.GetValue(),sFile.c_str()) ); + Dialog::OK( ssprintf(EXPORTED_TO_YOUR_DESKTOP.GetValue(),sFile.c_str()) ); else - MessageBox( ssprintf(FAILED_TO_SAVE.GetValue(),sFullFile.c_str()) ); + Dialog::OK( ssprintf(FAILED_TO_SAVE.GetValue(),sFullFile.c_str()) ); } static LocalizedString ERROR_READING_FILE ( "LanguagesDlg", "Error reading file '%s'." ); @@ -343,28 +344,28 @@ void LanguagesDlg::OnBnClickedButtonImport() RageFileOsAbsolute cvsFile; if( !cvsFile.Open(sCsvFile) ) { - MessageBox( ssprintf(ERROR_READING_FILE.GetValue(),sCsvFile.c_str()) ); + Dialog::OK( ssprintf(ERROR_READING_FILE.GetValue(),sCsvFile.c_str()) ); return; } CsvFile csv; if( !csv.ReadFile(cvsFile) ) { - MessageBox( ssprintf(ERROR_PARSING_FILE.GetValue(),sCsvFile.c_str()) ); + Dialog::OK( ssprintf(ERROR_PARSING_FILE.GetValue(),sCsvFile.c_str()) ); return; } RString sLanguageFile = GetLanguageFile( sTheme, sLanguage ); { - int iRet = MessageBox( ssprintf(IMPORTING_THESE_STRINGS_WILL_OVERRIDE.GetValue(),sLanguageFile.c_str()), NULL, MB_OKCANCEL ); - if( iRet != IDOK ) + Dialog::Result ret = Dialog::RetryCancel( ssprintf(IMPORTING_THESE_STRINGS_WILL_OVERRIDE.GetValue(),sLanguageFile.c_str()), NULL, MB_OKCANCEL ); + if( ret != Dialog::retry ) return; } IniFile ini; if( !ini.ReadFile(sLanguageFile) ) { - MessageBox( ssprintf(ERROR_READING.GetValue(),sLanguageFile.c_str()) ); + Dialog::OK( ssprintf(ERROR_READING.GetValue(),sLanguageFile.c_str()) ); return; } @@ -380,7 +381,7 @@ void LanguagesDlg::OnBnClickedButtonImport() int iNumValues = line->size(); if( iNumValues != 3 && iNumValues != 4 ) { - MessageBox( ssprintf(ERROR_READING_EACH_LINE_MUST_HAVE.GetValue(),sCsvFile.c_str(),iNumValues) ); + Dialog::OK( ssprintf(ERROR_READING_EACH_LINE_MUST_HAVE.GetValue(),sCsvFile.c_str(),iNumValues) ); return; } tl.sSection = (*line)[0]; @@ -400,9 +401,9 @@ void LanguagesDlg::OnBnClickedButtonImport() } if( ini.WriteFile(sLanguageFile) ) - MessageBox( ssprintf(IMPORTED_STRINGS_INTO.GetValue(),iNumImported,sLanguageFile.c_str(),iNumIgnored) ); + Dialog::OK( ssprintf(IMPORTED_STRINGS_INTO.GetValue(),iNumImported,sLanguageFile.c_str(),iNumIgnored) ); else - MessageBox( ssprintf(FAILED_TO_SAVE.GetValue(),sLanguageFile.c_str()) ); + Dialog::OK( ssprintf(FAILED_TO_SAVE.GetValue(),sLanguageFile.c_str()) ); OnSelchangeListThemes(); } diff --git a/stepmania/src/smpackage/MainMenuDlg.cpp b/stepmania/src/smpackage/MainMenuDlg.cpp index 84b3fe71ec..1c0c283766 100644 --- a/stepmania/src/smpackage/MainMenuDlg.cpp +++ b/stepmania/src/smpackage/MainMenuDlg.cpp @@ -135,7 +135,7 @@ void MainMenuDlg::OnCreateSong() if( DoesFileExist(sSongDirectory) ) { - MessageBox( ssprintf(THE_SONG_DIRECTORY_ALREADY_EXISTS.GetValue(),sSongDirectory.c_str()) ); + Dialog::OK( ssprintf(THE_SONG_DIRECTORY_ALREADY_EXISTS.GetValue(),sSongDirectory.c_str()) ); return; } @@ -147,7 +147,7 @@ void MainMenuDlg::OnCreateSong() bool bSuccess = FileCopy( fileIn, fileOut, sError ); if( !bSuccess ) { - MessageBox( ssprintf(FAILED_TO_COPY_MUSIC_FILE.GetValue(),sMusicFile.c_str(),sNewMusicFile.c_str(),sError.c_str()) ); + Dialog::OK( ssprintf(FAILED_TO_COPY_MUSIC_FILE.GetValue(),sMusicFile.c_str(),sNewMusicFile.c_str(),sError.c_str()) ); return; } @@ -157,12 +157,12 @@ void MainMenuDlg::OnCreateSong() RageFile file; if( file.Open(sNewSongFile, RageFile::WRITE) ) { - MessageBox( ssprintf(FAILED_TO_CREATE_THE_SONG_FILE.GetValue(),sNewSongFile.c_str()) ); + Dialog::OK( ssprintf(FAILED_TO_CREATE_THE_SONG_FILE.GetValue(),sNewSongFile.c_str()) ); return; } file.Close(); - MessageBox( ssprintf(SUCCESS_CREATED_THE_SONG.GetValue(),sSongDirectory.c_str()) ); + Dialog::OK( ssprintf(SUCCESS_CREATED_THE_SONG.GetValue(),sSongDirectory.c_str()) ); } BOOL MainMenuDlg::OnInitDialog() @@ -192,14 +192,14 @@ void MainMenuDlg::OnBnClickedClearKeymaps() if( !DoesFileExist( SpecialFiles::KEYMAPS_PATH ) ) { - MessageBox( ssprintf(IS_ALREADY_CLEARED.GetValue(),SpecialFiles::KEYMAPS_PATH.c_str()) ); + Dialog::OK( ssprintf(IS_ALREADY_CLEARED.GetValue(),SpecialFiles::KEYMAPS_PATH.c_str()) ); return; } if( !FILEMAN->Remove(SpecialFiles::KEYMAPS_PATH) ) - MessageBox( ssprintf(FAILED_TO_DELETE_FILE.GetValue(), SpecialFiles::KEYMAPS_PATH.c_str()) ); + Dialog::OK( ssprintf(FAILED_TO_DELETE_FILE.GetValue(), SpecialFiles::KEYMAPS_PATH.c_str()) ); - MessageBox( ssprintf(CLEARED.GetValue(),SpecialFiles::PREFERENCES_INI_PATH.c_str()) ); + Dialog::OK( ssprintf(CLEARED.GetValue(),SpecialFiles::PREFERENCES_INI_PATH.c_str()) ); } void MainMenuDlg::OnBnClickedChangePreferences() @@ -216,12 +216,12 @@ void MainMenuDlg::OnBnClickedOpenPreferences() // TODO: Add your control notification handler code here if( !DoesFileExist( SpecialFiles::PREFERENCES_INI_PATH ) ) { - MessageBox( ssprintf(DOESNT_EXIST_IT_WILL_BE_CREATED.GetValue(),SpecialFiles::PREFERENCES_INI_PATH.c_str()) ); + Dialog::OK( ssprintf(DOESNT_EXIST_IT_WILL_BE_CREATED.GetValue(),SpecialFiles::PREFERENCES_INI_PATH.c_str()) ); } else { if( NULL == ::ShellExecute( this->m_hWnd, "open", SpecialFiles::PREFERENCES_INI_PATH, "", "", SW_SHOWNORMAL ) ) - MessageBox( ssprintf(FAILED_TO_OPEN.GetValue(),SpecialFiles::PREFERENCES_INI_PATH.c_str(),GetLastErrorString().c_str()) ); + Dialog::OK( ssprintf(FAILED_TO_OPEN.GetValue(),SpecialFiles::PREFERENCES_INI_PATH.c_str(),GetLastErrorString().c_str()) ); } } @@ -230,17 +230,17 @@ void MainMenuDlg::OnBnClickedClearPreferences() // TODO: Add your control notification handler code here if( !DoesFileExist(SpecialFiles::PREFERENCES_INI_PATH) ) { - MessageBox( ssprintf(IS_ALREADY_CLEARED.GetValue(),SpecialFiles::PREFERENCES_INI_PATH.c_str()) ); + Dialog::OK( ssprintf(IS_ALREADY_CLEARED.GetValue(),SpecialFiles::PREFERENCES_INI_PATH.c_str()) ); return; } if( !FILEMAN->Remove(SpecialFiles::PREFERENCES_INI_PATH) ) { - MessageBox( ssprintf(FAILED_TO_DELETE_FILE.GetValue(),SpecialFiles::PREFERENCES_INI_PATH.c_str()) ); + Dialog::OK( ssprintf(FAILED_TO_DELETE_FILE.GetValue(),SpecialFiles::PREFERENCES_INI_PATH.c_str()) ); return; } - MessageBox( ssprintf(CLEARED.GetValue(),SpecialFiles::PREFERENCES_INI_PATH.c_str()) ); + Dialog::OK( ssprintf(CLEARED.GetValue(),SpecialFiles::PREFERENCES_INI_PATH.c_str()) ); } void MainMenuDlg::OnBnClickedButtonLaunchGame() diff --git a/stepmania/src/smpackage/SMPackageInstallDlg.cpp b/stepmania/src/smpackage/SMPackageInstallDlg.cpp index 0b3d121fba..aa2fe5284f 100644 --- a/stepmania/src/smpackage/SMPackageInstallDlg.cpp +++ b/stepmania/src/smpackage/SMPackageInstallDlg.cpp @@ -98,14 +98,14 @@ BOOL CSMPackageInstallDlg::OnInitDialog() RageFileOsAbsolute file; if( !file.Open(m_sPackagePath) ) { - MessageBox( ssprintf(COULD_NOT_OPEN_FILE.GetValue(),m_sPackagePath.c_str()) ); + Dialog::OK( ssprintf(COULD_NOT_OPEN_FILE.GetValue(),m_sPackagePath.c_str()) ); exit(1); // better way to abort? } RageFileDriverZip zip; if( !zip.Load(&file) ) { - MessageBox( ssprintf(IS_NOT_A_VALID_ZIP.GetValue(),m_sPackagePath.c_str()) ); + Dialog::OK( ssprintf(IS_NOT_A_VALID_ZIP.GetValue(),m_sPackagePath.c_str()) ); exit(1); // better way to abort? } @@ -276,7 +276,7 @@ void CSMPackageInstallDlg::OnOK() int iSelectedInstallDirIndex = m_comboDir.GetCurSel(); if( iSelectedInstallDirIndex == -1 ) { - MessageBox( NO_INSTALLATIONS.GetValue(), NULL, MB_OK|MB_ICONEXCLAMATION ); + Dialog::OK( NO_INSTALLATIONS.GetValue(), NULL, MB_OK|MB_ICONEXCLAMATION ); return; } @@ -287,14 +287,14 @@ void CSMPackageInstallDlg::OnOK() RageFileOsAbsolute file; if( !file.Open(m_sPackagePath) ) { - MessageBox( ssprintf(COULD_NOT_OPEN_FILE.GetValue(),m_sPackagePath.c_str()) ); + Dialog::OK( ssprintf(COULD_NOT_OPEN_FILE.GetValue(),m_sPackagePath.c_str()) ); exit(1); // better way to abort? } RageFileDriverZip zip; if( !zip.Load(&file) ) { - MessageBox( ssprintf(IS_NOT_A_VALID_ZIP.GetValue(),m_sPackagePath.c_str()) ); + Dialog::OK( ssprintf(IS_NOT_A_VALID_ZIP.GetValue(),m_sPackagePath.c_str()) ); exit(1); // better way to abort? } @@ -382,15 +382,15 @@ retry_unzip: goto done_with_file; show_error: - switch( MessageBox( sError, NULL, MB_ABORTRETRYIGNORE|MB_ICONEXCLAMATION ) ) + switch( Dialog::AbortRetryIgnore(sError) ) { - case IDABORT: + case Dialog::abort: exit(1); // better way to exit? break; - case IDRETRY: + case Dialog::retry: goto retry_unzip; break; - case IDIGNORE: + case Dialog::ignore: // do nothing break; } @@ -400,7 +400,7 @@ done_with_file: pProgress1->StepIt(); //increase the progress bar of 1 step } - AfxMessageBox( PACKAGE_INSTALLED_SUCCESSFULLY.GetValue() ); + Dialog::OK( PACKAGE_INSTALLED_SUCCESSFULLY.GetValue() ); // close the dialog CDialog::OnOK(); diff --git a/stepmania/src/smpackage/SMPackageUtil.cpp b/stepmania/src/smpackage/SMPackageUtil.cpp index 5b3e45abc9..1466770485 100644 --- a/stepmania/src/smpackage/SMPackageUtil.cpp +++ b/stepmania/src/smpackage/SMPackageUtil.cpp @@ -179,7 +179,7 @@ bool SMPackageUtil::LaunchGame() if( !DoesFileExist(sFile) ) { RString sError = ssprintf( COULD_NOT_FIND.GetValue(), sExe.c_str() ); - ::MessageBox( NULL, sError, NULL, MB_OK|MB_ICONEXCLAMATION ); + Dialog::OK( sError ); return false; } } @@ -225,6 +225,7 @@ void SMPackageUtil::StripIgnoredSmzipFiles( vector &vsFilesInOut ) bEraseThis |= EndsWith( sFile, "smzip.ctl" ); bEraseThis |= EndsWith( sFile, ".old" ); bEraseThis |= EndsWith( sFile, "Thumbs.db" ); + bEraseThis |= EndsWith( sFile, ".DS_Store" ); bEraseThis |= (sFile.find("CVS") != string::npos); if( bEraseThis ) diff --git a/stepmania/src/smpackage/SmpackageExportDlg.cpp b/stepmania/src/smpackage/SmpackageExportDlg.cpp index 22f2f22ccb..bb99eee249 100644 --- a/stepmania/src/smpackage/SmpackageExportDlg.cpp +++ b/stepmania/src/smpackage/SmpackageExportDlg.cpp @@ -196,7 +196,7 @@ static bool ExportPackage( const RString &sPackageName, const RString &sSourceIn } catch (CException* e) { - AfxMessageBox( ssprintf(ERROR_ADDING_FILE.GetValue(), sFilePath.c_str()) ); + Dialog::OK( ssprintf(ERROR_ADDING_FILE.GetValue(), sFilePath.c_str()) ); zip.Close(); e->Delete(); return false; @@ -237,7 +237,7 @@ void CSmpackageExportDlg::OnButtonExportAsOne() if( asPaths.size() == 0 ) { - AfxMessageBox( NO_ITEMS_ARE_CHECKED.GetValue() ); + Dialog::OK( NO_ITEMS_ARE_CHECKED.GetValue() ); return; } else if( asPaths.size() == 1 ) @@ -261,7 +261,7 @@ void CSmpackageExportDlg::OnButtonExportAsOne() return; // cancelled if( ExportPackage( sPackageName, GetCurrentInstallDir(), asPaths, sComment ) ) - AfxMessageBox( ssprintf(SUCCESSFULLY_EXPORTED.GetValue(),sPackageName.c_str()) ); + Dialog::OK( ssprintf(SUCCESSFULLY_EXPORTED.GetValue(),sPackageName.c_str()) ); } static LocalizedString THE_FOLLOWING_PACKAGES_WERE_EXPORTED ("CSmpackageExportDlg","The following packages were exported to your Desktop:"); @@ -273,7 +273,7 @@ void CSmpackageExportDlg::OnButtonExportAsIndividual() if( asPaths.size() == 0 ) { - AfxMessageBox( NO_ITEMS_ARE_CHECKED.GetValue() ); + Dialog::OK( NO_ITEMS_ARE_CHECKED.GetValue() ); return; } @@ -314,7 +314,7 @@ void CSmpackageExportDlg::OnButtonExportAsIndividual() sMessage += "\n\n"; sMessage += THE_FOLLOWING_PACKAGES_FAILED.GetValue()+"\n\n"+join( "\n", asFailedPackages ); } - AfxMessageBox( sMessage ); + Dialog::OK( sMessage ); } void CSmpackageExportDlg::OnButtonPlay() diff --git a/stepmania/src/smpackage/smpackage.cpp b/stepmania/src/smpackage/smpackage.cpp index 4dc9860b8e..703683cde8 100644 --- a/stepmania/src/smpackage/smpackage.cpp +++ b/stepmania/src/smpackage/smpackage.cpp @@ -97,7 +97,7 @@ BOOL CSmpackageApp::InitInstance() RString sPersonalDir = SpecialDirs::GetMyDocumentsDir(); RString sFile = sPersonalDir + PRODUCT_ID +"/Save/MachineProfile/Stats.xml"; if( NULL == ::ShellExecute( NULL, "open", sFile, "", "", SW_SHOWNORMAL ) ) - AfxMessageBox( ssprintf(FAILED_TO_OPEN.GetValue(),sFile.c_str(),GetLastErrorString().c_str()) ); + Dialog::OK( ssprintf(FAILED_TO_OPEN.GetValue(),sFile.c_str(),GetLastErrorString().c_str()) ); exit(1); // better way to quit? } }