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

Disable zoom controls when video is detached as the zoom is ignored with detached video.

Browse source 
Originally committed to SVN as r3676.
This commit is contained in:
Thomas Goyne 2009-10-10 15:21:26 +00:00
parent 75f010f889
commit 5cf7724698
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
aegisub/src/frame_main.cpp
View file

@ -676,9 +676,9 @@ void FrameMain::UpdateToolbar() {
// Update // Update
wxToolBar* toolbar = GetToolBar(); wxToolBar* toolbar = GetToolBar();
toolbar->FindById(Menu_Video_JumpTo)->Enable(isVideo); toolbar->FindById(Menu_Video_JumpTo)->Enable(isVideo);
toolbar->FindById(Menu_Video_Zoom_In)->Enable(isVideo); toolbar->FindById(Menu_Video_Zoom_In)->Enable(isVideo && !detachedVideo);
toolbar->FindById(Menu_Video_Zoom_Out)->Enable(isVideo); toolbar->FindById(Menu_Video_Zoom_Out)->Enable(isVideo && !detachedVideo);
ZoomBox->Enable(isVideo); ZoomBox->Enable(isVideo && !detachedVideo);
toolbar->FindById(Menu_Subs_Snap_Start_To_Video)->Enable(isVideo && selRows > 0); toolbar->FindById(Menu_Subs_Snap_Start_To_Video)->Enable(isVideo && selRows > 0);
toolbar->FindById(Menu_Subs_Snap_End_To_Video)->Enable(isVideo && selRows > 0); toolbar->FindById(Menu_Subs_Snap_End_To_Video)->Enable(isVideo && selRows > 0);
toolbar->FindById(Menu_Subs_Snap_Video_To_Start)->Enable(isVideo && selRows == 1); toolbar->FindById(Menu_Subs_Snap_Video_To_Start)->Enable(isVideo && selRows == 1);
@ -1310,6 +1310,7 @@ void FrameMain::DetachVideo(bool detach) {
detachedVideo = NULL; detachedVideo = NULL;
} }
} }
UpdateToolbar();
} }

21
aegisub/src/frame_main_events.cpp
View file

@ -312,22 +312,23 @@ void FrameMain::OnMenuOpen (wxMenuEvent &event) {
// Video menu // Video menu
else if (curMenu == videoMenu) { else if (curMenu == videoMenu) {
bool state = VideoContext::Get()->IsLoaded(); bool state = VideoContext::Get()->IsLoaded();
bool attached = state && !detachedVideo;
// Set states // Set states
MenuBar->Enable(Menu_Video_JumpTo,state); MenuBar->Enable(Menu_Video_JumpTo,state);
MenuBar->Enable(Menu_Subs_Snap_Video_To_Start,state); MenuBar->Enable(Menu_Subs_Snap_Video_To_Start,state);
MenuBar->Enable(Menu_Subs_Snap_Video_To_End,state); MenuBar->Enable(Menu_Subs_Snap_Video_To_End,state);
MenuBar->Enable(Menu_View_Zoom,state); MenuBar->Enable(Menu_View_Zoom,attached);
MenuBar->Enable(Menu_View_Zoom_50,state); MenuBar->Enable(Menu_View_Zoom_50,attached);
MenuBar->Enable(Menu_View_Zoom_100,state); MenuBar->Enable(Menu_View_Zoom_100,attached);
MenuBar->Enable(Menu_View_Zoom_200,state); MenuBar->Enable(Menu_View_Zoom_200,attached);
MenuBar->Enable(Menu_File_Close_Video,state); MenuBar->Enable(Menu_File_Close_Video,state);
MenuBar->Enable(Menu_Video_AR,state); MenuBar->Enable(Menu_Video_AR,attached);
MenuBar->Enable(Menu_Video_AR_Default,state); MenuBar->Enable(Menu_Video_AR_Default,attached);
MenuBar->Enable(Menu_Video_AR_Full,state); MenuBar->Enable(Menu_Video_AR_Full,attached);
MenuBar->Enable(Menu_Video_AR_Wide,state); MenuBar->Enable(Menu_Video_AR_Wide,attached);
MenuBar->Enable(Menu_Video_AR_235,state); MenuBar->Enable(Menu_Video_AR_235,attached);
MenuBar->Enable(Menu_Video_AR_Custom,state); MenuBar->Enable(Menu_Video_AR_Custom,attached);
MenuBar->Enable(Menu_Video_Detach,state && !detachedVideo); MenuBar->Enable(Menu_Video_Detach,state && !detachedVideo);
MenuBar->Enable(Menu_File_Save_VFR,VFR_Output.GetFrameRateType() == VFR); MenuBar->Enable(Menu_File_Save_VFR,VFR_Output.GetFrameRateType() == VFR);
MenuBar->Enable(Menu_File_Close_VFR,VFR_Output.GetFrameRateType() == VFR); MenuBar->Enable(Menu_File_Close_VFR,VFR_Output.GetFrameRateType() == VFR);