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

Make AssStyleStorage keep track of the current catalog name

Browse source 
Originally committed to SVN as r6544.
This commit is contained in:
Thomas Goyne 2012-03-08 04:17:23 +00:00
parent fa06033762
commit a09d96df1f
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
aegisub/src/ass_style_storage.cpp
View file

@ -52,20 +52,20 @@ AssStyleStorage::~AssStyleStorage() {
delete_clear(style);
}
void AssStyleStorage::Save(wxString const& name) {
if (name.empty()) return;
void AssStyleStorage::Save() {
if (storage_name.empty()) return;
wxString dirname = StandardPaths::DecodePath("?user/catalog/");
if (!wxDirExists(dirname) && !wxMkdir(dirname))
throw "Failed creating directory for style catalogs";
TextFileWriter file(StandardPaths::DecodePath("?user/catalog/" + name + ".sty"), "UTF-8");
TextFileWriter file(StandardPaths::DecodePath("?user/catalog/" + storage_name + ".sty"), "UTF-8");
for (std::list<AssStyle*>::iterator cur = style.begin(); cur != style.end(); ++cur)
file.WriteLineToFile((*cur)->GetEntryData());
}
void AssStyleStorage::Load(wxString const& name) {
if (name.empty()) return;
storage_name = name;
Clear();
try {

4
aegisub/src/ass_style_storage.h
View file

@ -48,6 +48,7 @@ class AssStyle;
///
/// DOCME
class AssStyleStorage {
wxString storage_name;
public:
~AssStyleStorage();
@ -65,8 +66,7 @@ public:
AssStyle *GetStyle(wxString name);
/// Save stored styles to a file
/// @param name Catalog name (note: not file name)
void Save(wxString const& name);
void Save();
/// Load stored styles from a file
/// @param name Catalog name (note: not file name)

22
aegisub/src/dialog_style_manager.cpp
View file

@ -318,12 +318,12 @@ void DialogStyleManager::OnCatalogNew() {
}
// Add to list of storages
Store.Clear();
StorageList->Clear();
CatalogList->Append(name);
CatalogList->SetStringSelection(name);
Store.Save(name);
Store.Load(name);
Store.Save();
StorageList->Clear();
}
UpdateButtons();
}
@ -348,8 +348,8 @@ void DialogStyleManager::OnStorageEdit() {
if (n == 1) {
AssStyle *selStyle = styleStorageMap[selections[0]];
DialogStyleEditor(this, selStyle, c, &Store).ShowModal();
StorageList->SetString(selections[0],selStyle->name);
Store.Save(CatalogList->GetStringSelection());
StorageList->SetString(selections[0], selStyle->name);
Store.Save();
}
UpdateButtons();
}
@ -388,7 +388,7 @@ void DialogStyleManager::OnCopyToStorage() {
copied.push_back(styleName);
}
}
Store.Save(CatalogList->GetStringSelection());
Store.Save();
LoadStorageStyles();
for (std::list<wxString>::iterator name = copied.begin(); name != copied.end(); ++name) {
StorageList->SetStringSelection(*name, true);
@ -448,7 +448,7 @@ void DialogStyleManager::OnStorageCopy() {
unique_name(bind(&AssStyleStorage::GetStyle, &Store, _1), s->name));
if (editor.ShowModal()) {
Store.Save(CatalogList->GetStringSelection());
Store.Save();
LoadStorageStyles();
StorageList->SetStringSelection(editor.GetStyleName());
UpdateButtons();
@ -531,14 +531,14 @@ void DialogStyleManager::PasteToStorage() {
bind(&AssStyleStorage::GetStyle, &Store, _1),
bind(&std::list<AssStyle*>::push_back, &Store.style, _1));
Store.Save(CatalogList->GetStringSelection());
Store.Save();
LoadStorageStyles();
StorageList->SetStringSelection(Store.style.back()->name);
}
void DialogStyleManager::OnStorageNew() {
DialogStyleEditor(this, 0, c, &Store).ShowModal();
Store.Save(CatalogList->GetStringSelection());
Store.Save();
LoadStorageStyles();
UpdateButtons();
}
@ -566,7 +566,7 @@ void DialogStyleManager::OnStorageDelete() {
Store.style.remove(temp);
delete temp;
}
Store.Save(CatalogList->GetStringSelection());
Store.Save();
LoadStorageStyles();
}
UpdateButtons();
@ -788,7 +788,7 @@ void DialogStyleManager::MoveStyles(bool storage, int type) {
if (storage) {
Store.style.clear();
copy(styls.begin(), styls.end(), back_inserter(Store.style));
Store.Save(CatalogList->GetStringSelection());
Store.Save();
}
// Current
else {