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

Add the script file name to the close confirmation dialog. Closes #879.

Browse source 
Originally committed to SVN as r5861.
This commit is contained in:
Thomas Goyne 2011-11-16 21:58:58 +00:00
parent de03dfd8a8
commit 95a1071a1b
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
aegisub/src/frame_main.cpp
View file

@ -323,7 +323,7 @@ int FrameMain::TryToCloseSubs(bool enableCancel) {
if (context->ass->IsModified()) { if (context->ass->IsModified()) {
int flags = wxYES_NO; int flags = wxYES_NO;
if (enableCancel) flags |= wxCANCEL; if (enableCancel) flags |= wxCANCEL;
int result = wxMessageBox(_("Save before continuing?"), _("Unsaved changes"), flags,this); int result = wxMessageBox(wxString::Format(_("Do you want to save changes to %s?"), GetScriptFileName()), _("Unsaved changes"), flags, this);
if (result == wxYES) { if (result == wxYES) {
(*cmd::get("subtitle/save"))(context.get()); (*cmd::get("subtitle/save"))(context.get());
// If it fails saving, return cancel anyway // If it fails saving, return cancel anyway
@ -372,20 +372,7 @@ void FrameMain::SetDisplayMode(int video, int audio) {
void FrameMain::UpdateTitle() { void FrameMain::UpdateTitle() {
wxString newTitle; wxString newTitle;
if (context->ass->IsModified()) newTitle << "* "; if (context->ass->IsModified()) newTitle << "* ";
if (context->ass->filename.empty()) { newTitle << GetScriptFileName();
// Apple HIG says "untitled" should not be capitalised
// and the window is a document window, it shouldn't contain the app name
// (The app name is already present in the menu bar)
#ifndef __WXMAC__
newTitle << _("Untitled");
#else
newTitle << _("untitled");
#endif
}
else {
wxFileName file (context->ass->filename);
newTitle << file.GetFullName();
}
#ifndef __WXMAC__ #ifndef __WXMAC__
newTitle << " - Aegisub " << GetAegisubLongVersionString(); newTitle << " - Aegisub " << GetAegisubLongVersionString();
@ -691,3 +678,20 @@ void FrameMain::OnKeyDown(wxKeyEvent &event) {
void FrameMain::OnMouseWheel(wxMouseEvent &evt) { void FrameMain::OnMouseWheel(wxMouseEvent &evt) {
ForwardMouseWheelEvent(this, evt); ForwardMouseWheelEvent(this, evt);
} }
wxString FrameMain::GetScriptFileName() const {
if (context->ass->filename.empty()) {
// Apple HIG says "untitled" should not be capitalised
// and the window is a document window, it shouldn't contain the app name
// (The app name is already present in the menu bar)
#ifndef __WXMAC__
return _("Untitled");
#else
return _("untitled");
#endif
}
else {
wxFileName file (context->ass->filename);
return file.GetFullName();
}
}

1
aegisub/src/frame_main.h
View file

@ -96,6 +96,7 @@ class FrameMain: public wxFrame {
bool LoadList(wxArrayString list); bool LoadList(wxArrayString list);
void UpdateTitle(); void UpdateTitle();
wxString GetScriptFileName() const;
void OnKeyDown(wxKeyEvent &event); void OnKeyDown(wxKeyEvent &event);
void OnMouseWheel(wxMouseEvent &evt); void OnMouseWheel(wxMouseEvent &evt);