iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Use a real toolbar for the video box's buttons

This commit is contained in:
Thomas Goyne 2012-12-10 08:58:30 -08:00
parent 534f574a87
commit 7c477f3cd1
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
aegisub/src/libresrc/default_toolbar.json
View File

@ -63,6 +63,12 @@
"app/options", "app/options",
"grid/tag/cycle_hiding" "grid/tag/cycle_hiding"
], ],
"video" : [
"video/play",
"video/play/line",
"video/stop",
"video/opt/autoscroll"
],
"visual_tools" : [ "visual_tools" : [
"video/tool/cross", "video/tool/cross",
"video/tool/drag", "video/tool/drag",

2
aegisub/src/toolbar.cpp
View File

@ -163,7 +163,7 @@ namespace {
public: public:
Toolbar(wxWindow *parent, std::string const& name, agi::Context *c, std::string const& ht_context, bool vertical) Toolbar(wxWindow *parent, std::string const& name, agi::Context *c, std::string const& ht_context, bool vertical)
: wxToolBar(parent, -1, wxDefaultPosition, wxDefaultSize, wxTB_FLAT | (vertical ? wxTB_VERTICAL : wxTB_HORIZONTAL)) : wxToolBar(parent, -1, wxDefaultPosition, wxDefaultSize, wxTB_NODIVIDER | wxTB_FLAT | (vertical ? wxTB_VERTICAL : wxTB_HORIZONTAL))
, name(name) , name(name)
, context(c) , context(c)
, ht_context(ht_context) , ht_context(ht_context)

22
aegisub/src/video_box.cpp
View File

@ -63,14 +63,6 @@
#include "video_display.h" #include "video_display.h"
#include "video_slider.h" #include "video_slider.h"
static void add_button(wxWindow *parent, wxSizer *sizer, const char *command, agi::Context *context) {
cmd::Command *c = cmd::get(command);
wxBitmapButton *btn = new wxBitmapButton(parent, -1, c->Icon(24));
btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, std::bind(&cmd::Command::operator(), c, context));
ToolTipManager::Bind(btn, c->StrHelp(), "Video", command);
sizer->Add(btn, 0, wxTOP | wxLEFT | wxBOTTOM | wxALIGN_CENTER, 2);
}
VideoBox::VideoBox(wxWindow *parent, bool isDetached, agi::Context *context) VideoBox::VideoBox(wxWindow *parent, bool isDetached, agi::Context *context)
: wxPanel(parent,-1) : wxPanel(parent,-1)
, context(context) , context(context)
@ -80,11 +72,7 @@ VideoBox::VideoBox(wxWindow *parent, bool isDetached, agi::Context *context)
videoSlider->SetToolTip(_("Seek video")); videoSlider->SetToolTip(_("Seek video"));
// Buttons // Buttons
wxSizer *videoBottomSizer = new wxBoxSizer(wxHORIZONTAL); wxToolBar *mainToolbar = toolbar::GetToolbar(this, "video", context, "Video", false);
add_button(this, videoBottomSizer, "video/play", context);
add_button(this, videoBottomSizer, "video/play/line", 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);
// Position // Position
VideoPosition = new wxTextCtrl(this,-1,"",wxDefaultPosition,wxSize(110,20),wxTE_READONLY); VideoPosition = new wxTextCtrl(this,-1,"",wxDefaultPosition,wxSize(110,20),wxTE_READONLY);
@ -96,9 +84,8 @@ VideoBox::VideoBox(wxWindow *parent, bool isDetached, agi::Context *context)
// Zoom box // Zoom box
wxArrayString choices; wxArrayString choices;
for (int i = 1 ; i <= 24; ++i) { for (int i = 1 ; i <= 24; ++i)
choices.Add(wxString::Format("%g%%", i * 12.5)); choices.Add(wxString::Format("%g%%", i * 12.5));
}
wxComboBox *zoomBox = new wxComboBox(this, -1, "75%", wxDefaultPosition, wxDefaultSize, choices, wxCB_DROPDOWN | wxTE_PROCESS_ENTER); wxComboBox *zoomBox = new wxComboBox(this, -1, "75%", wxDefaultPosition, wxDefaultSize, choices, wxCB_DROPDOWN | wxTE_PROCESS_ENTER);
// Typesetting buttons // Typesetting buttons
@ -127,6 +114,9 @@ VideoBox::VideoBox(wxWindow *parent, bool isDetached, agi::Context *context)
// Sizers // Sizers
wxSizer *videoSliderSizer = new wxBoxSizer(wxHORIZONTAL); wxSizer *videoSliderSizer = new wxBoxSizer(wxHORIZONTAL);
videoSliderSizer->Add(videoSlider, wxSizerFlags(1).Expand()); videoSliderSizer->Add(videoSlider, wxSizerFlags(1).Expand());
wxSizer *videoBottomSizer = new wxBoxSizer(wxHORIZONTAL);
videoBottomSizer->Add(mainToolbar, wxSizerFlags(0).Center());
videoBottomSizer->Add(VideoPosition, wxSizerFlags(1).Center().Border(wxLEFT)); videoBottomSizer->Add(VideoPosition, wxSizerFlags(1).Center().Border(wxLEFT));
videoBottomSizer->Add(VideoSubsPos, wxSizerFlags(1).Center()); videoBottomSizer->Add(VideoSubsPos, wxSizerFlags(1).Center());
videoBottomSizer->Add(zoomBox, wxSizerFlags(0).Center()); videoBottomSizer->Add(zoomBox, wxSizerFlags(0).Center());
@ -135,7 +125,7 @@ VideoBox::VideoBox(wxWindow *parent, bool isDetached, agi::Context *context)
VideoSizer->Add(topSizer, 1, wxEXPAND, 0); VideoSizer->Add(topSizer, 1, wxEXPAND, 0);
VideoSizer->Add(new wxStaticLine(this), 0, wxEXPAND, 0); VideoSizer->Add(new wxStaticLine(this), 0, wxEXPAND, 0);
VideoSizer->Add(videoSliderSizer,0,wxEXPAND,0); VideoSizer->Add(videoSliderSizer,0,wxEXPAND,0);
VideoSizer->Add(videoBottomSizer,0,wxEXPAND,0); VideoSizer->Add(videoBottomSizer,0,wxEXPAND | wxBOTTOM,5);
SetSizer(VideoSizer); SetSizer(VideoSizer);
UpdateTimeBoxes(); UpdateTimeBoxes();