Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-20 14:20:06 +02:00
Code Issues Releases Wiki Activity

History window listens for events

Browse Source
This commit is contained in:
Paul Licameli 2018-02-17 15:31:18 -05:00
parent dbcf8ae59b
commit ad8fafa6a0
5 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/HistoryWindow.cpp
View File

@ -31,6 +31,7 @@ undo memory so as to free up space.
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include "AudioIO.h" #include "AudioIO.h"
#include "AudacityApp.h"
#include "../images/Arrow.xpm" #include "../images/Arrow.xpm"
#include "../images/Empty9x16.xpm" #include "../images/Empty9x16.xpm"
#include "HistoryWindow.h" #include "HistoryWindow.h"
@ -154,6 +155,11 @@ HistoryWindow::HistoryWindow(AudacityProject *parent, UndoManager *manager):
wxTheApp->Bind(EVT_AUDIOIO_CAPTURE, wxTheApp->Bind(EVT_AUDIOIO_CAPTURE,
&HistoryWindow::OnAudioIO, &HistoryWindow::OnAudioIO,
this); this);
wxTheApp->Bind(EVT_CLIPBOARD_CHANGE, &HistoryWindow::UpdateDisplay, this);
manager->Bind(EVT_UNDO_PUSHED, &HistoryWindow::UpdateDisplay, this);
manager->Bind(EVT_UNDO_MODIFIED, &HistoryWindow::UpdateDisplay, this);
manager->Bind(EVT_UNDO_RESET, &HistoryWindow::UpdateDisplay, this);
} }
void HistoryWindow::OnAudioIO(wxCommandEvent& evt) void HistoryWindow::OnAudioIO(wxCommandEvent& evt)
@ -168,8 +174,9 @@ void HistoryWindow::OnAudioIO(wxCommandEvent& evt)
mDiscard->Enable(!mAudioIOBusy); mDiscard->Enable(!mAudioIOBusy);
} }
void HistoryWindow::UpdateDisplay() void HistoryWindow::UpdateDisplay(wxEvent& e)
{ {
e.Skip();
if(IsShown()) if(IsShown())
DoUpdate(); DoUpdate();
} }

2
src/HistoryWindow.h
View File

@ -29,7 +29,7 @@ class HistoryWindow final : public wxDialogWrapper {
public: public:
HistoryWindow(AudacityProject * parent, UndoManager *manager); HistoryWindow(AudacityProject * parent, UndoManager *manager);
void UpdateDisplay(); void UpdateDisplay(wxEvent &e);
private: private:
void OnAudioIO(wxCommandEvent & evt); void OnAudioIO(wxCommandEvent & evt);

9
src/Project.cpp
View File

@ -4591,9 +4591,6 @@ void AudacityProject::InitialState()
GetUndoManager()->StateSaved(); GetUndoManager()->StateSaved();
if (mHistoryWindow)
mHistoryWindow->UpdateDisplay();
GetMenuManager(*this).ModifyUndoMenuItems(*this); GetMenuManager(*this).ModifyUndoMenuItems(*this);
GetMenuManager(*this).UpdateMenus(*this); GetMenuManager(*this).UpdateMenus(*this);
@ -4629,9 +4626,6 @@ void AudacityProject::PushState(const wxString &desc,
mDirty = true; mDirty = true;
if (mHistoryWindow)
mHistoryWindow->UpdateDisplay();
GetMenuManager(*this).ModifyUndoMenuItems(*this); GetMenuManager(*this).ModifyUndoMenuItems(*this);
GetMenuManager(*this).UpdateMenus(*this); GetMenuManager(*this).UpdateMenus(*this);
@ -5236,9 +5230,6 @@ void AudacityProject::EditClipboardByLabel( EditDestFunction action )
msClipT0 = regions.front().start; msClipT0 = regions.front().start;
msClipT1 = regions.back().end; msClipT1 = regions.back().end;
if (mHistoryWindow)
mHistoryWindow->UpdateDisplay();
} }

16
src/menus/EditMenus.cpp
View File

@ -1,6 +1,5 @@
#include "../AdornedRulerPanel.h" #include "../AdornedRulerPanel.h"
#include "../AudacityApp.h" // for EVT_CLIPBOARD_CHANGE #include "../AudacityApp.h" // for EVT_CLIPBOARD_CHANGE
#include "../HistoryWindow.h"
#include "../LabelTrack.h" #include "../LabelTrack.h"
#include "../Menus.h" #include "../Menus.h"
#include "../MixerBoard.h" #include "../MixerBoard.h"
@ -240,9 +239,6 @@ void DoUndo(AudacityProject &project)
project.RedrawProject(); project.RedrawProject();
if (historyWindow)
historyWindow->UpdateDisplay();
if (mixerBoard) if (mixerBoard)
// Mixer board may need to change for selection state and pan/gain // Mixer board may need to change for selection state and pan/gain
mixerBoard->Refresh(); mixerBoard->Refresh();
@ -283,9 +279,6 @@ void OnRedo(const CommandContext &context)
project.RedrawProject(); project.RedrawProject();
if (historyWindow)
historyWindow->UpdateDisplay();
if (mixerBoard) if (mixerBoard)
// Mixer board may need to change for selection state and pan/gain // Mixer board may need to change for selection state and pan/gain
mixerBoard->Refresh(); mixerBoard->Refresh();
@ -377,9 +370,6 @@ void OnCut(const CommandContext &context)
ruler->DrawOverlays( true ); ruler->DrawOverlays( true );
project.RedrawProject(); project.RedrawProject();
if (historyWindow)
historyWindow->UpdateDisplay();
} }
void OnDelete(const CommandContext &context) void OnDelete(const CommandContext &context)
@ -424,9 +414,6 @@ void OnCopy(const CommandContext &context)
//Make sure the menus/toolbar states get updated //Make sure the menus/toolbar states get updated
trackPanel->Refresh(false); trackPanel->Refresh(false);
if (historyWindow)
historyWindow->UpdateDisplay();
} }
void OnPaste(const CommandContext &context) void OnPaste(const CommandContext &context)
@ -766,9 +753,6 @@ void OnSplitCut(const CommandContext &context)
project.PushState(_("Split-cut to the clipboard"), _("Split Cut")); project.PushState(_("Split-cut to the clipboard"), _("Split Cut"));
project.RedrawProject(); project.RedrawProject();
if (historyWindow)
historyWindow->UpdateDisplay();
} }
void OnSplitDelete(const CommandContext &context) void OnSplitDelete(const CommandContext &context)

1
src/menus/ViewMenus.cpp
View File

@ -191,7 +191,6 @@ void OnHistory(const CommandContext &context)
auto historyWindow = project.GetHistoryWindow(true); auto historyWindow = project.GetHistoryWindow(true);
historyWindow->Show(); historyWindow->Show();
historyWindow->Raise(); historyWindow->Raise();
historyWindow->UpdateDisplay();
} }
void OnKaraoke(const CommandContext &context) void OnKaraoke(const CommandContext &context)