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

Update the selection and scroll position after opening subtitles from video

Browse source
This commit is contained in:
Thomas Goyne 2014-11-16 13:25:17 -08:00
parent 1a4634003f
commit a9208a592b
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/command/subtitle.cpp
View file

@ -286,7 +286,7 @@ struct subtitle_open_video final : public Command {
void operator()(agi::Context *c) override { void operator()(agi::Context *c) override {
if (c->subsController->TryToClose() == wxCANCEL) return; if (c->subsController->TryToClose() == wxCANCEL) return;
c->subsController->Load(c->project->VideoName(), "binary"); c->project->LoadSubtitles(c->project->VideoName(), "binary", false);
} }
bool Validate(const agi::Context *c) override { bool Validate(const agi::Context *c) override {

4
src/project.cpp
View file

@ -158,9 +158,9 @@ bool Project::DoLoadSubtitles(agi::fs::path const& path, std::string encoding, P
return true; return true;
} }
void Project::LoadSubtitles(agi::fs::path path, std::string encoding) { void Project::LoadSubtitles(agi::fs::path path, std::string encoding, bool load_linked) {
ProjectProperties properties; ProjectProperties properties;
if (DoLoadSubtitles(path, encoding, properties)) if (DoLoadSubtitles(path, encoding, properties) && load_linked)
LoadUnloadFiles(properties); LoadUnloadFiles(properties);
} }

2
src/project.h
View file

@ -69,7 +69,7 @@ public:
Project(agi::Context *context); Project(agi::Context *context);
~Project(); ~Project();
void LoadSubtitles(agi::fs::path path, std::string encoding=""); void LoadSubtitles(agi::fs::path path, std::string encoding="", bool load_linked=true);
void CloseSubtitles(); void CloseSubtitles();
bool CanLoadSubtitlesFromVideo() const { return video_has_subtitles; } bool CanLoadSubtitlesFromVideo() const { return video_has_subtitles; }