diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index f8c1114b6..f6e0cd40c 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -140,6 +140,9 @@ FrameMain::FrameMain (wxArrayString args) context->audioController->AddAudioOpenListener(&FrameMain::OnAudioOpen, this); context->audioController->AddAudioCloseListener(&FrameMain::OnAudioClose, this); + // Initialized later due to that the selection controller is currently the subtitles grid + context->selectionController = 0; + context->videoController = VideoContext::Get(); // derp context->videoController->audio = context->audioController; context->videoController->AddVideoOpenListener(&FrameMain::OnVideoOpen, this); @@ -294,6 +297,7 @@ void FrameMain::InitContents() { StartupLog("Create subtitles grid"); context->subsGrid = SubsGrid = new SubtitlesGrid(this,Panel,-1,context->ass,wxDefaultPosition,wxSize(600,100),wxWANTS_CHARS | wxSUNKEN_BORDER,"Subs grid"); + context->selectionController = context->subsGrid; context->videoBox->videoSlider->grid = SubsGrid; context->videoController->grid = SubsGrid; Search.grid = SubsGrid; diff --git a/aegisub/src/include/aegisub/context.h b/aegisub/src/include/aegisub/context.h index 379ae34f7..a50685888 100644 --- a/aegisub/src/include/aegisub/context.h +++ b/aegisub/src/include/aegisub/context.h @@ -1,8 +1,10 @@ class AssFile; class AudioBox; class AudioController; +class AssDialogue; class DialogDetachedVideo; class DialogStyling; +template class SelectionController; class SubsEditBox; class SubtitlesGrid; class VideoBox; @@ -19,6 +21,7 @@ struct Context { // Controllers AudioController *audioController; + SelectionController *selectionController; VideoContext *videoController; // Things that should probably be in some sort of UI-context-model