Video box: tweak the tab order

Move the slider before the buttons,
and move the video display before the slider.

Originally committed to SVN as r6895.
This commit is contained in:
cantabile 2012-06-12 02:59:41 +00:00 committed by Thomas Goyne
parent 46c83d7f1c
commit 4b78e05695

View file

@ -79,6 +79,10 @@ VideoBox::VideoBox(wxWindow *parent, bool isDetached, agi::Context *context)
: wxPanel(parent,-1) : wxPanel(parent,-1)
, context(context) , context(context)
{ {
// Seek
VideoSlider *videoSlider = new VideoSlider(this, context);
videoSlider->SetToolTip(_("Seek video"));
// Buttons // Buttons
wxSizer *videoBottomSizer = new wxBoxSizer(wxHORIZONTAL); wxSizer *videoBottomSizer = new wxBoxSizer(wxHORIZONTAL);
add_button(this, videoBottomSizer, "video/play", context); add_button(this, videoBottomSizer, "video/play", context);
@ -86,10 +90,6 @@ VideoBox::VideoBox(wxWindow *parent, bool isDetached, agi::Context *context)
add_button(this, videoBottomSizer, "video/stop", context); add_button(this, videoBottomSizer, "video/stop", context);
videoBottomSizer->Add(new ToggleBitmap(this, context, "video/opt/autoscroll", 24, "Video"), 0, wxTOP | wxLEFT | wxBOTTOM | wxALIGN_CENTER, 2); videoBottomSizer->Add(new ToggleBitmap(this, context, "video/opt/autoscroll", 24, "Video"), 0, wxTOP | wxLEFT | wxBOTTOM | wxALIGN_CENTER, 2);
// Seek
VideoSlider *videoSlider = new VideoSlider(this, context);
videoSlider->SetToolTip(_("Seek video"));
// Position // Position
VideoPosition = new wxTextCtrl(this,-1,"",wxDefaultPosition,wxSize(110,20),wxTE_READONLY); VideoPosition = new wxTextCtrl(this,-1,"",wxDefaultPosition,wxSize(110,20),wxTE_READONLY);
VideoPosition->SetToolTip(_("Current frame time and number")); VideoPosition->SetToolTip(_("Current frame time and number"));
@ -117,6 +117,7 @@ VideoBox::VideoBox(wxWindow *parent, bool isDetached, agi::Context *context)
visualSubToolBar->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); visualSubToolBar->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
VideoDisplay *videoDisplay = new VideoDisplay(visualSubToolBar, isDetached, zoomBox, this, context); VideoDisplay *videoDisplay = new VideoDisplay(visualSubToolBar, isDetached, zoomBox, this, context);
videoDisplay->MoveBeforeInTabOrder(videoSlider);
wxSizer *toolbarSizer = new wxBoxSizer(wxVERTICAL); wxSizer *toolbarSizer = new wxBoxSizer(wxVERTICAL);
toolbarSizer->Add(visualToolBar, wxSizerFlags(1)); toolbarSizer->Add(visualToolBar, wxSizerFlags(1));