diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-08-02 17:25:38 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-08-14 21:07:48 +0100 |
| commit | 86765a617035e0283c20c9f2696909743e618156 (patch) | |
| tree | 9134dd73b0cb0761533b7b798d8cb3b6ebfd2200 /src/wx | |
| parent | 7a3f4f1b6411f7d15bf00e863fb5e70a5d930dd8 (diff) | |
Stub player.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/film_viewer.cc | 10 | ||||
| -rw-r--r-- | src/wx/film_viewer.h | 2 | ||||
| -rw-r--r-- | src/wx/report_problem_dialog.h | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 0299b2462..776926fbe 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -72,7 +72,7 @@ rtaudio_callback (void* out, void *, unsigned int frames, double, RtAudioStreamS return reinterpret_cast<FilmViewer*>(data)->audio_callback (out, frames); } -FilmViewer::FilmViewer (wxWindow* p) +FilmViewer::FilmViewer (wxWindow* p, bool outline_content, bool jump_to_selected) : wxPanel (p) , _panel (new wxPanel (this)) , _outline_content (new wxCheckBox (this, wxID_ANY, _("Outline content"))) @@ -106,10 +106,14 @@ FilmViewer::FilmViewer (wxWindow* p) _v_sizer->Add (_panel, 1, wxEXPAND); wxBoxSizer* view_options = new wxBoxSizer (wxHORIZONTAL); - view_options->Add (_outline_content, 0, wxRIGHT, DCPOMATIC_SIZER_GAP); + if (outline_content) { + view_options->Add (_outline_content, 0, wxRIGHT, DCPOMATIC_SIZER_GAP); + } view_options->Add (_left_eye, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP); view_options->Add (_right_eye, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP); - view_options->Add (_jump_to_selected, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP); + if (jump_to_selected) { + view_options->Add (_jump_to_selected, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP); + } _v_sizer->Add (view_options, 0, wxALL, DCPOMATIC_SIZER_GAP); wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL); diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index 4a704ae6c..a411be5ec 100644 --- a/src/wx/film_viewer.h +++ b/src/wx/film_viewer.h @@ -41,7 +41,7 @@ class Butler; class FilmViewer : public wxPanel { public: - FilmViewer (wxWindow *); + FilmViewer (wxWindow *, bool outline_content = true, bool jump_to_selected = true); ~FilmViewer (); void set_film (boost::shared_ptr<Film>); diff --git a/src/wx/report_problem_dialog.h b/src/wx/report_problem_dialog.h index a13c6a671..9bd70a50e 100644 --- a/src/wx/report_problem_dialog.h +++ b/src/wx/report_problem_dialog.h @@ -29,7 +29,7 @@ class Film; class ReportProblemDialog : public wxDialog { public: - ReportProblemDialog (wxWindow* parent, boost::shared_ptr<Film> film); + ReportProblemDialog (wxWindow* parent, boost::shared_ptr<Film> film = boost::shared_ptr<Film>()); void report (); |