mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Rewrote code for copying styles to and from storages, making it correctly replace styles of the same name that already exist in the target. Updates #922.

Browse source 
Originally committed to SVN as r3160.
This commit is contained in:
Thomas Goyne 2009-07-18 02:52:46 +00:00
parent c2087304fc
commit a7d0b591f8
1 changed files with 30 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
aegisub/src/dialog_style_manager.cpp
View file

@ -559,26 +559,22 @@ void DialogStyleManager::OnCopyToStorage (wxCommandEvent &event) {
wxArrayInt selections; wxArrayInt selections;
int n = CurrentList->GetSelections(selections); int n = CurrentList->GetSelections(selections);
AssStyle *temp; for (int i = 0; i < n; i++) {
for (int i=0;i<n;i++) { wxString styleName = CurrentList->GetString(selections[i]);
int test = StorageList->FindString(CurrentList->GetString(selections[i]), true); bool addStyle = true;
if (test == wxNOT_FOUND) {
temp = new AssStyle; for (std::list<AssStyle *>::iterator style = Store.style.begin(); style != Store.style.end(); ++style) {
*temp = *styleMap.at(selections[i]); if ((*style)->name.CmpNoCase(styleName) == 0) {
Store.style.push_back(temp); addStyle = false;
} if (wxYES == wxMessageBox(wxString::Format(_T("There is already a style with the name \"%s\" on the current storage. Proceed and overwrite anyway?"),styleName), _T("Style name collision."), wxYES_NO)) {
else { **style = *styleMap.at(selections[i]);
int answer = wxMessageBox(wxString::Format(_T("There is already a style with the name \"%s\" on the current storage. Proceed and overwrite anyway?"),CurrentList->GetString(selections[i]).c_str()),_T("Style name collision."),wxYES_NO); }
if (answer == wxYES) { break;
// Remove the old style
temp = styleStorageMap.at(selections[i]);
Store.style.remove(temp);
// And save the new one instead
temp = new AssStyle;
*temp = *styleMap.at(selections[i]);
Store.style.push_back(temp);
} }
// else do nothing }
if (addStyle) {
AssStyle *temp = new AssStyle(*styleMap.at(selections[i]));
Store.style.push_back(temp);
} }
} }
Store.Save(CatalogList->GetString(CatalogList->GetSelection())); Store.Save(CatalogList->GetString(CatalogList->GetSelection()));
@ -592,29 +588,23 @@ void DialogStyleManager::OnCopyToStorage (wxCommandEvent &event) {
void DialogStyleManager::OnCopyToCurrent (wxCommandEvent &event) { void DialogStyleManager::OnCopyToCurrent (wxCommandEvent &event) {
wxArrayInt selections; wxArrayInt selections;
int n = StorageList->GetSelections(selections); int n = StorageList->GetSelections(selections);
AssStyle *temp; for (int i = 0; i < n; i++) {
for (int i=0;i<n;i++) { wxString styleName = StorageList->GetString(selections[i]);
// Check if there is already a style with that name bool addStyle = true;
int test = CurrentList->FindString(StorageList->GetString(selections[i]), false);
bool proceed = false; for (std::vector<AssStyle *>::iterator style = styleMap.begin(); style != styleMap.end(); ++style) {
if (test == wxNOT_FOUND) if ((*style)->name.CmpNoCase(styleName) == 0) {
proceed = true; addStyle = false;
if (!proceed) { if (wxYES == wxMessageBox(wxString::Format(_T("There is already a style with the name \"%s\" on the current script. Proceed and overwrite anyway?"),styleName), _T("Style name collision."), wxYES_NO)) {
int answer = wxMessageBox(wxString::Format(_T("There is already a style with the name \"%s\" on the current script. Proceed anyway?"),StorageList->GetString(selections[i]).c_str()),_T("Style name collision."),wxYES_NO); **style = *styleStorageMap.at(selections[i]);
if (answer == wxYES) proceed = true; }
break;
}
} }
if (addStyle) {
// Copy AssStyle *temp = new AssStyle(*styleStorageMap.at(selections[i]));
// FIXME: this doesn't overwrite the old style like most of the rest of the style copying functions do,
// it just inserts a new one with the same name. Bad usability.
if (proceed) {
temp = new AssStyle;
*temp = *styleStorageMap.at(selections[i]);
AssFile::top->InsertStyle(temp); AssFile::top->InsertStyle(temp);
} }
// Return
else return;
} }
LoadCurrentStyles(AssFile::top); LoadCurrentStyles(AssFile::top);
grid->ass->FlagAsModified(_("style copy")); grid->ass->FlagAsModified(_("style copy"));
@ -628,9 +618,8 @@ void DialogStyleManager::OnCopyToCurrent (wxCommandEvent &event) {
void DialogStyleManager::OnStorageCopy (wxCommandEvent &event) { void DialogStyleManager::OnStorageCopy (wxCommandEvent &event) {
wxArrayInt selections; wxArrayInt selections;
StorageList->GetSelections(selections); StorageList->GetSelections(selections);
AssStyle *temp = new AssStyle; AssStyle *temp = new AssStyle(*(styleStorageMap.at(selections[0])));
*temp = *(styleStorageMap.at(selections[0]));
wxString newName = _("Copy of "); wxString newName = _("Copy of ");
newName += temp->name; newName += temp->name;
temp->name = newName; temp->name = newName;