Warn if there is no mail server configured when one is needed (#1046).

[dcpomatic.git] / src / wx / video_waveform_dialog.cc

diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc
index e4b09b8eec0b2f9ecb24ddf012fbf3e0d143f81b..83253d335d61b4304619fd4168b719259396938c 100644 (file)
--- a/src/wx/video_waveform_dialog.cc
+++ b/src/wx/video_waveform_dialog.cc
@@ -27,15 +27,23 @@
 
 using std::cout;
 using boost::bind;
+using boost::weak_ptr;
 
-VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, FilmViewer* viewer)
+VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film> film, FilmViewer* viewer)
        : wxDialog (
                parent,
                wxID_ANY,
                _("Video Waveform"),
                wxDefaultPosition,
                wxSize (640, 512),
+#ifdef DCPOMATIC_OSX
+               /* I can't get wxFRAME_FLOAT_ON_PARENT to work on OS X, and although wxSTAY_ON_TOP keeps
+                  the window above all others (and not just our own) it's better than nothing for now.
+               */
+               wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxSTAY_ON_TOP
+#else
                wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxFRAME_FLOAT_ON_PARENT
+#endif
                )
        , _viewer (viewer)
 {
@@ -56,7 +64,18 @@ VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, FilmViewer* viewer)
 
        overall_sizer->Add (controls, 0, wxALL | wxEXPAND, DCPOMATIC_SIZER_X_GAP);
 
-       _plot = new VideoWaveformPlot (this, _viewer);
+       wxBoxSizer* position = new wxBoxSizer (wxHORIZONTAL);
+       add_label_to_sizer (position, this, _("Image X position"), true);
+       _x_position = new wxStaticText (this, wxID_ANY, "");
+       _x_position->SetMinSize (wxSize (64, -1));
+       position->Add (_x_position, 0, wxALL, DCPOMATIC_SIZER_X_GAP);
+       add_label_to_sizer (position, this, _("component value"), true);
+       _value = new wxStaticText (this, wxID_ANY, "");
+       _value->SetMinSize (wxSize (64, -1));
+       position->Add (_value, 0, wxALL, DCPOMATIC_SIZER_X_GAP);
+       overall_sizer->Add (position, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
+
+       _plot = new VideoWaveformPlot (this, film, _viewer);
        overall_sizer->Add (_plot, 1, wxALL | wxEXPAND, 12);
 
 #ifdef DCPOMATIC_LINUX
@@ -71,8 +90,9 @@ VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, FilmViewer* viewer)
        overall_sizer->SetSizeHints (this);
 
        Bind (wxEVT_SHOW, bind (&VideoWaveformDialog::shown, this, _1));
-       _component->Bind  (wxEVT_COMMAND_CHOICE_SELECTED, bind (&VideoWaveformDialog::component_changed, this));
+       _component->Bind (wxEVT_CHOICE, bind (&VideoWaveformDialog::component_changed, this));
        _contrast->Bind (wxEVT_SCROLL_THUMBTRACK, bind (&VideoWaveformDialog::contrast_changed, this));
+       _plot->MouseMoved.connect (bind (&VideoWaveformDialog::mouse_moved, this, _1, _2, _3, _4));
 
        _component->SetSelection (0);
        _contrast->SetValue (32);
@@ -101,3 +121,19 @@ VideoWaveformDialog::contrast_changed ()
 {
        _plot->set_contrast (_contrast->GetValue ());
 }
+
+void
+VideoWaveformDialog::mouse_moved (int x1, int x2, int y1, int y2)
+{
+       if (x1 != x2) {
+               _x_position->SetLabel (wxString::Format ("%d-%d", x1, x2));
+       } else {
+               _x_position->SetLabel (wxString::Format ("%d", x1));
+       }
+
+       if (y1 != y2) {
+               _value->SetLabel (wxString::Format ("%d-%d", y1, y2));
+       } else {
+               _value->SetLabel (wxString::Format ("%d", y1));
+       }
+}