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

Make saving transient UI state in the file optional

Browse source 
It significantly increases the amount of noise when tracking subtitle
files in source control.

Closes #1535.
This commit is contained in:
Thomas Goyne 2013-10-07 17:43:53 -07:00
parent 1cdd461023
commit 7a6fd4bb1e
4 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
aegisub/src/ass_file.cpp
View file

@ -148,7 +148,8 @@ int AssFile::GetUIStateAsInt(std::string const& key) const {
} }
void AssFile::SaveUIState(std::string const& key, std::string const& value) { void AssFile::SaveUIState(std::string const& key, std::string const& value) {
SetScriptInfo("Aegisub " + key, value); if (OPT_GET("App/Save UI State")->GetBool())
SetScriptInfo("Aegisub " + key, value);
} }
void AssFile::SetScriptInfo(std::string const& key, std::string const& value) { void AssFile::SetScriptInfo(std::string const& key, std::string const& value) {

1
aegisub/src/libresrc/default_config.json
View file

@ -14,6 +14,7 @@
"Language" : "", "Language" : "",
"Maximized" : false, "Maximized" : false,
"Save Charset" : "UTF-8", "Save Charset" : "UTF-8",
"Save UI State" : true,
"Show Toolbar" : true, "Show Toolbar" : true,
"Toolbar Icon Size" : 16 "Toolbar Icon Size" : 16
}, },

1
aegisub/src/libresrc/osx/default_config.json
View file

@ -14,6 +14,7 @@
"Language" : "", "Language" : "",
"Maximized" : false, "Maximized" : false,
"Save Charset" : "UTF-8", "Save Charset" : "UTF-8",
"Save UI State" : true,
"Show Toolbar" : true, "Show Toolbar" : true,
"Toolbar Icon Size" : 16 "Toolbar Icon Size" : 16
}, },

2
aegisub/src/preferences.cpp
View file

@ -93,6 +93,8 @@ General::General(wxTreebook *book, Preferences *parent): OptionPage(book, parent
wxFlexGridSizer *general = PageSizer(_("General")); wxFlexGridSizer *general = PageSizer(_("General"));
OptionAdd(general, _("Check for updates on startup"), "App/Auto/Check For Updates"); OptionAdd(general, _("Check for updates on startup"), "App/Auto/Check For Updates");
OptionAdd(general, _("Show main toolbar"), "App/Show Toolbar"); OptionAdd(general, _("Show main toolbar"), "App/Show Toolbar");
OptionAdd(general, _("Save UI state in subtitles files"), "App/Save UI State");
CellSkip(general);
OptionAdd(general, _("Toolbar Icon Size"), "App/Toolbar Icon Size"); OptionAdd(general, _("Toolbar Icon Size"), "App/Toolbar Icon Size");
wxString autoload_modes[] = { _("Never"), _("Always"), _("Ask") }; wxString autoload_modes[] = { _("Never"), _("Always"), _("Ask") };