mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Add wxOK to some message boxes that specified flags without including either wxOK or wxYESNO.

Browse source 
Originally committed to SVN as r3250.
This commit is contained in:
Thomas Goyne 2009-07-24 02:10:41 +00:00
parent f81b147031
commit 766ae98a76
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/src/dialog_style_editor.cpp
View file

@ -439,7 +439,7 @@ void DialogStyleEditor::Apply (bool apply,bool close) {
for (unsigned int i=0;i<styles.Count();i++) { for (unsigned int i=0;i<styles.Count();i++) {
if (newStyleName.CmpNoCase(styles[i]) == 0) { if (newStyleName.CmpNoCase(styles[i]) == 0) {
if ((isLocal && (grid->ass->GetStyle(styles[i]) != style)) || (!isLocal && (store->GetStyle(styles[i]) != style))) { if ((isLocal && (grid->ass->GetStyle(styles[i]) != style)) || (!isLocal && (store->GetStyle(styles[i]) != style))) {
wxMessageBox(_T("There is already a style with this name. Please choose another name."),_T("Style name conflict."),wxICON_ERROR); wxMessageBox(_T("There is already a style with this name. Please choose another name."),_T("Style name conflict."),wxICON_ERROR|wxOK);
return; return;
} }
} }

2
aegisub/src/dialog_style_manager.cpp
View file

@ -432,7 +432,7 @@ void DialogStyleManager::OnCatalogNew (wxCommandEvent &event) {
// Make sure that there is no storage with the same name (case insensitive search since Windows filenames are case insensitive) // Make sure that there is no storage with the same name (case insensitive search since Windows filenames are case insensitive)
if (CatalogList->FindString(name, false) != wxNOT_FOUND) { if (CatalogList->FindString(name, false) != wxNOT_FOUND) {
wxMessageBox(_("A catalog with that name already exists."),_("Catalog name conflict"),wxICON_ERROR); wxMessageBox(_("A catalog with that name already exists."),_("Catalog name conflict"),wxICON_ERROR|wxOK);
return; return;
} }

2
aegisub/src/frame_main_events.cpp
View file

@ -1394,7 +1394,7 @@ void FrameMain::OnSetARCustom (wxCommandEvent &event) {
} }
// Sanity check // Sanity check
if (numval < 0.5 || numval > 5.0) wxMessageBox(_("Invalid value! Aspect ratio must be between 0.5 and 5.0."),_("Invalid Aspect Ratio"),wxICON_ERROR); if (numval < 0.5 || numval > 5.0) wxMessageBox(_("Invalid value! Aspect ratio must be between 0.5 and 5.0."),_("Invalid Aspect Ratio"),wxICON_ERROR|wxOK);
// Set value // Set value
else { else {

4
aegisub/src/options.cpp
View file

@ -465,7 +465,7 @@ void OptionsManager::Load() {
header = _T(""); header = _T("");
} }
if (header != _T("[Config]")) { if (header != _T("[Config]")) {
wxMessageBox(_("Configuration file is either invalid or corrupt. The current file will be backed up and replaced with a default file."),_("Error"),wxCENTRE|wxICON_WARNING); wxMessageBox(_("Configuration file is either invalid or corrupt. The current file will be backed up and replaced with a default file."),_("Error"),wxCENTRE|wxICON_WARNING|wxOK);
wxRenameFile(filename,filename + wxString::Format(_T(".%i.backup"),wxGetUTCTime())); wxRenameFile(filename,filename + wxString::Format(_T(".%i.backup"),wxGetUTCTime()));
modified = true; modified = true;
return; return;
@ -480,7 +480,7 @@ void OptionsManager::Load() {
curLine = file.ReadLineFromFile(); curLine = file.ReadLineFromFile();
} }
catch (wxString e) { catch (wxString e) {
wxMessageBox(_("Configuration file is either invalid or corrupt. The current file will be backed up and replaced with a default file."),_("Error"),wxCENTRE|wxICON_WARNING); wxMessageBox(_("Configuration file is either invalid or corrupt. The current file will be backed up and replaced with a default file."),_("Error"),wxCENTRE|wxICON_WARNING|wxOK);
wxRenameFile(filename,filename + wxString::Format(_T(".%i.backup"),wxGetUTCTime())); wxRenameFile(filename,filename + wxString::Format(_T(".%i.backup"),wxGetUTCTime()));
modified = true; modified = true;
return; return;

2
aegisub/src/subs_preview.cpp
View file

@ -148,7 +148,7 @@ void SubtitlesPreview::UpdateBitmap(int w,int h) {
provider = SubtitlesProviderFactoryManager::GetProvider(); provider = SubtitlesProviderFactoryManager::GetProvider();
} }
catch (...) { catch (...) {
wxMessageBox(_T("Could not get any subtitles provider for the preview box. Make sure that you have a provider installed."),_T("No subtitles provider"),wxICON_ERROR); wxMessageBox(_T("Could not get any subtitles provider for the preview box. Make sure that you have a provider installed."),_T("No subtitles provider"),wxICON_ERROR|wxOK);
} }
// Provider OK // Provider OK