diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-04 01:15:05 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-04 01:15:05 +0100 |
| commit | 7bcf60f8ad3acd4dcae77a120216839b665c4335 (patch) | |
| tree | 1d4b72911f1b1ff901d0b725423173244186dfe6 /src/wx/timeline_dialog.cc | |
| parent | 42d7062fcd4025600c2f5e2539f1fa347d6db145 (diff) | |
Fix icons on Windows; zoom to all on initial open.
Diffstat (limited to 'src/wx/timeline_dialog.cc')
| -rw-r--r-- | src/wx/timeline_dialog.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc index 34706d620..d20f89db9 100644 --- a/src/wx/timeline_dialog.cc +++ b/src/wx/timeline_dialog.cc @@ -55,15 +55,14 @@ TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film) wxBoxSizer* controls = new wxBoxSizer (wxHORIZONTAL); -#ifdef DCPOMATIC_LINUX wxBitmap select (wxString::Format (wxT ("%s/select.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG); wxBitmap zoom (wxString::Format (wxT ("%s/zoom.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG); wxBitmap zoom_all (wxString::Format (wxT ("%s/zoom_all.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG); -#endif + wxToolBar* toolbar = new wxToolBar (this, wxID_ANY); - toolbar->AddRadioTool ((int) Timeline::SELECT, _("Select"), select); - toolbar->AddRadioTool ((int) Timeline::ZOOM, _("Zoom"), zoom); - toolbar->AddTool ((int) Timeline::ZOOM_ALL, _("Zoom to whole project"), zoom_all); + toolbar->AddRadioTool ((int) Timeline::SELECT, _("Select"), select, wxNullBitmap, _("Select and move content")); + toolbar->AddRadioTool ((int) Timeline::ZOOM, _("Zoom"), zoom, wxNullBitmap, _("Zoom in / out")); + toolbar->AddTool ((int) Timeline::ZOOM_ALL, _("Zoom all"), zoom_all, _("Zoom out to whole film")); controls->Add (toolbar); toolbar->Bind (wxEVT_TOOL, bind (&TimelineDialog::tool_clicked, this, _1)); |