mirror of
https://github.com/cookiengineer/audacity
synced 2025-10-26 23:33:49 +01:00
Split AutoRecoveryDialog.cpp from AutoRecovery.cpp...
... leaving AutoRecovery as a lower-level file, to be used by ProjectHistory for auto-save, and not including ProjectManager. The new file floats to a high level of the graph, but AutoRecovery.cpp remains in the big strongly connected component.
This commit is contained in:
@@ -21,261 +21,17 @@ text or binary format to a file.
|
||||
#include "Audacity.h"
|
||||
#include "AutoRecovery.h"
|
||||
#include "DirManager.h"
|
||||
#include "FileNames.h"
|
||||
#include "blockfile/SimpleBlockFile.h"
|
||||
#include "ProjectManager.h"
|
||||
#include "Sequence.h"
|
||||
#include "ShuttleGui.h"
|
||||
|
||||
#include <wx/evtloop.h>
|
||||
#include <wx/wxprec.h>
|
||||
#include <wx/filefn.h>
|
||||
#include <wx/listctrl.h>
|
||||
#include <wx/dir.h>
|
||||
#include <wx/dialog.h>
|
||||
#include <wx/app.h>
|
||||
|
||||
#include "WaveClip.h"
|
||||
#include "WaveTrack.h"
|
||||
#include "widgets/AudacityMessageBox.h"
|
||||
#include "widgets/wxPanelWrapper.h"
|
||||
|
||||
enum {
|
||||
ID_RECOVER_ALL = 10000,
|
||||
ID_RECOVER_NONE,
|
||||
ID_QUIT_AUDACITY,
|
||||
ID_FILE_LIST
|
||||
};
|
||||
|
||||
class AutoRecoveryDialog final : public wxDialogWrapper
|
||||
{
|
||||
public:
|
||||
AutoRecoveryDialog(wxWindow *parent);
|
||||
|
||||
private:
|
||||
void PopulateList();
|
||||
void PopulateOrExchange(ShuttleGui & S);
|
||||
|
||||
void OnQuitAudacity(wxCommandEvent &evt);
|
||||
void OnRecoverNone(wxCommandEvent &evt);
|
||||
void OnRecoverAll(wxCommandEvent &evt);
|
||||
|
||||
wxListCtrl *mFileList;
|
||||
|
||||
public:
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
AutoRecoveryDialog::AutoRecoveryDialog(wxWindow *parent) :
|
||||
wxDialogWrapper(parent, -1, _("Automatic Crash Recovery"),
|
||||
wxDefaultPosition, wxDefaultSize,
|
||||
wxDEFAULT_DIALOG_STYLE & (~wxCLOSE_BOX)) // no close box
|
||||
{
|
||||
SetName(GetTitle());
|
||||
ShuttleGui S(this, eIsCreating);
|
||||
PopulateOrExchange(S);
|
||||
}
|
||||
|
||||
BEGIN_EVENT_TABLE(AutoRecoveryDialog, wxDialogWrapper)
|
||||
EVT_BUTTON(ID_RECOVER_ALL, AutoRecoveryDialog::OnRecoverAll)
|
||||
EVT_BUTTON(ID_RECOVER_NONE, AutoRecoveryDialog::OnRecoverNone)
|
||||
EVT_BUTTON(ID_QUIT_AUDACITY, AutoRecoveryDialog::OnQuitAudacity)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
void AutoRecoveryDialog::PopulateOrExchange(ShuttleGui& S)
|
||||
{
|
||||
S.SetBorder(5);
|
||||
S.StartVerticalLay();
|
||||
{
|
||||
S.AddVariableText(_("Some projects were not saved properly the last time Audacity was run.\nFortunately, the following projects can be automatically recovered:"), false);
|
||||
|
||||
S.StartStatic(_("Recoverable projects"));
|
||||
{
|
||||
mFileList = S.Id(ID_FILE_LIST).AddListControlReportMode();
|
||||
/*i18n-hint: (noun). It's the name of the project to recover.*/
|
||||
mFileList->InsertColumn(0, _("Name"));
|
||||
mFileList->SetColumnWidth(0, wxLIST_AUTOSIZE);
|
||||
PopulateList();
|
||||
}
|
||||
S.EndStatic();
|
||||
|
||||
S.AddVariableText(_("After recovery, save the project to save the changes to disk."), false);
|
||||
|
||||
S.StartHorizontalLay();
|
||||
{
|
||||
S.Id(ID_QUIT_AUDACITY).AddButton(_("Quit Audacity"));
|
||||
S.Id(ID_RECOVER_NONE).AddButton(_("Discard Projects"));
|
||||
S.Id(ID_RECOVER_ALL).AddButton(_("Recover Projects"));
|
||||
}
|
||||
S.EndHorizontalLay();
|
||||
}
|
||||
S.EndVerticalLay();
|
||||
|
||||
Layout();
|
||||
Fit();
|
||||
SetMinSize(GetSize());
|
||||
|
||||
// Sometimes it centers on wxGTK and sometimes it doesn't.
|
||||
// Yielding before centering seems to be a good workaround,
|
||||
// but will leave to implement on a rainy day.
|
||||
Center();
|
||||
}
|
||||
|
||||
void AutoRecoveryDialog::PopulateList()
|
||||
{
|
||||
mFileList->DeleteAllItems();
|
||||
|
||||
wxDir dir(FileNames::AutoSaveDir());
|
||||
if (!dir.IsOpened())
|
||||
return;
|
||||
|
||||
wxString filename;
|
||||
int i = 0;
|
||||
for (bool c = dir.GetFirst(&filename, wxT("*.autosave"), wxDIR_FILES);
|
||||
c; c = dir.GetNext(&filename))
|
||||
mFileList->InsertItem(i++, wxFileName{ filename }.GetName());
|
||||
|
||||
mFileList->SetColumnWidth(0, wxLIST_AUTOSIZE);
|
||||
}
|
||||
|
||||
void AutoRecoveryDialog::OnQuitAudacity(wxCommandEvent & WXUNUSED(event))
|
||||
{
|
||||
EndModal(ID_QUIT_AUDACITY);
|
||||
}
|
||||
|
||||
void AutoRecoveryDialog::OnRecoverNone(wxCommandEvent & WXUNUSED(event))
|
||||
{
|
||||
int ret = AudacityMessageBox(
|
||||
_("Are you sure you want to discard all recoverable projects?\n\nChoosing \"Yes\" discards all recoverable projects immediately."),
|
||||
_("Confirm Discard Projects"), wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT, this);
|
||||
|
||||
if (ret == wxYES)
|
||||
EndModal(ID_RECOVER_NONE);
|
||||
}
|
||||
|
||||
void AutoRecoveryDialog::OnRecoverAll(wxCommandEvent & WXUNUSED(event))
|
||||
{
|
||||
EndModal(ID_RECOVER_ALL);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
static bool HaveFilesToRecover()
|
||||
{
|
||||
wxDir dir(FileNames::AutoSaveDir());
|
||||
if (!dir.IsOpened())
|
||||
{
|
||||
AudacityMessageBox(_("Could not enumerate files in auto save directory."),
|
||||
_("Error"), wxICON_STOP);
|
||||
return false;
|
||||
}
|
||||
|
||||
wxString filename;
|
||||
bool c = dir.GetFirst(&filename, wxT("*.autosave"), wxDIR_FILES);
|
||||
|
||||
return c;
|
||||
}
|
||||
|
||||
static bool RemoveAllAutoSaveFiles()
|
||||
{
|
||||
FilePaths files;
|
||||
wxDir::GetAllFiles(FileNames::AutoSaveDir(), &files,
|
||||
wxT("*.autosave"), wxDIR_FILES);
|
||||
|
||||
for (unsigned int i = 0; i < files.size(); i++)
|
||||
{
|
||||
if (!wxRemoveFile(files[i]))
|
||||
{
|
||||
// I don't think this error message is actually useful.
|
||||
// -dmazzoni
|
||||
//AudacityMessageBox(wxT("Could not remove auto save file: " + files[i]),
|
||||
// _("Error"), wxICON_STOP);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool RecoverAllProjects(AudacityProject** pproj)
|
||||
{
|
||||
wxDir dir(FileNames::AutoSaveDir());
|
||||
if (!dir.IsOpened())
|
||||
{
|
||||
AudacityMessageBox(_("Could not enumerate files in auto save directory."),
|
||||
_("Error"), wxICON_STOP);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Open a project window for each auto save file
|
||||
wxString filename;
|
||||
|
||||
FilePaths files;
|
||||
wxDir::GetAllFiles(FileNames::AutoSaveDir(), &files,
|
||||
wxT("*.autosave"), wxDIR_FILES);
|
||||
|
||||
for (unsigned int i = 0; i < files.size(); i++)
|
||||
{
|
||||
AudacityProject* proj{};
|
||||
if (*pproj)
|
||||
{
|
||||
// Reuse existing project window
|
||||
proj = *pproj;
|
||||
*pproj = NULL;
|
||||
}
|
||||
|
||||
// Open project. When an auto-save file has been opened successfully,
|
||||
// the opened auto-save file is automatically deleted and a NEW one
|
||||
// is created.
|
||||
(void) ProjectManager::OpenProject( proj, files[i], false );
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ShowAutoRecoveryDialogIfNeeded(AudacityProject** pproj,
|
||||
bool *didRecoverAnything)
|
||||
{
|
||||
if (didRecoverAnything)
|
||||
*didRecoverAnything = false;
|
||||
if (HaveFilesToRecover())
|
||||
{
|
||||
// Under wxGTK3, the auto recovery dialog will not get
|
||||
// the focus since the project window hasn't been allowed
|
||||
// to completely initialize.
|
||||
//
|
||||
// Yielding seems to allow the initialization to complete.
|
||||
//
|
||||
// Additionally, it also corrects a sizing issue in the dialog
|
||||
// related to wxWidgets bug:
|
||||
//
|
||||
// http://trac.wxwidgets.org/ticket/16440
|
||||
//
|
||||
// This must be done before "dlg" is declared.
|
||||
wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI);
|
||||
|
||||
int ret = AutoRecoveryDialog{nullptr}.ShowModal();
|
||||
|
||||
switch (ret)
|
||||
{
|
||||
case ID_RECOVER_NONE:
|
||||
return RemoveAllAutoSaveFiles();
|
||||
|
||||
case ID_RECOVER_ALL:
|
||||
if (didRecoverAnything)
|
||||
*didRecoverAnything = true;
|
||||
return RecoverAllProjects(pproj);
|
||||
|
||||
default:
|
||||
// This includes ID_QUIT_AUDACITY
|
||||
return false;
|
||||
}
|
||||
} else
|
||||
{
|
||||
// Nothing to recover, move along
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
/// Recording recovery handler
|
||||
|
||||
Reference in New Issue
Block a user