iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Ask the user if they want to close the current file before prompting for a new file to open rather than after

This commit is contained in:
Thomas Goyne 2013-02-04 15:35:17 -08:00
parent d7531a723a
commit 1f831be170
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
aegisub/src/command/recent.cpp
View File

@ -93,6 +93,7 @@ struct recent_subtitle_entry : public Command {
STR_HELP("Open recent subtitles")
void operator()(agi::Context *c, int id) {
if (c->subsController->TryToClose() == wxCANCEL) return;
c->subsController->Load(config::mru->GetEntry("Subtitle", id));
}
};

5
aegisub/src/command/subtitle.cpp
View File

@ -260,6 +260,7 @@ struct subtitle_open : public Command {
STR_HELP("Opens a subtitles file")
void operator()(agi::Context *c) {
if (c->subsController->TryToClose() == wxCANCEL) return;
auto filename = OpenFileSelector(_("Open subtitles file"), "Path/Last/Subtitles", "","", SubtitleFormat::GetWildcards(0), c->parent);
if (!filename.empty())
c->subsController->Load(filename);
@ -273,6 +274,7 @@ struct subtitle_open_autosave : public Command {
STR_HELP("Open a previous version of a file which was autosaved by Aegisub")
void operator()(agi::Context *c) {
if (c->subsController->TryToClose() == wxCANCEL) return;
DialogAutosave dialog(c->parent);
if (dialog.ShowModal() == wxID_OK)
c->subsController->Load(dialog.ChosenFile());
@ -287,6 +289,8 @@ struct subtitle_open_charset : public Command {
STR_HELP("Opens a subtitles file with a specific charset")
void operator()(agi::Context *c) {
if (c->subsController->TryToClose() == wxCANCEL) return;
auto filename = OpenFileSelector(_("Open subtitles file"), "Path/Last/Subtitles", "","", SubtitleFormat::GetWildcards(0), c->parent);
if (filename.empty()) return;
@ -306,6 +310,7 @@ struct subtitle_open_video : public Command {
CMD_TYPE(COMMAND_VALIDATE)
void operator()(agi::Context *c) {
if (c->subsController->TryToClose() == wxCANCEL) return;
c->subsController->Load(c->videoController->GetVideoName(), "binary");
}

2
aegisub/src/subs_controller.cpp
View File

@ -83,8 +83,6 @@ SubsController::SubsController(agi::Context *context)
}
void SubsController::Load(agi::fs::path const& filename, std::string charset) {
if (TryToClose() == wxCANCEL) return;
// TextFileReader does this automatically, but relying on that results in
// the user being prompted twice if it can't be auto-detected, since we
// open the file twice below.