Merge master.

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

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index bcec013324a2ad7149aae01a36b58e87753a6dc5..39650d15718de466e8e5847ef93a4e1b766b2c9e 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -35,20 +35,27 @@ AudioDialog::AudioDialog (wxWindow* parent)
        wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
 
        _plot = new AudioPlot (this);
-       sizer->Add (_plot, 1, wxALL, 12);
+       sizer->Add (_plot, 1, wxALL | wxEXPAND, 12);
 
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
+       wxBoxSizer* side = new wxBoxSizer (wxVERTICAL);
+
+       {
+               wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Channels"));
+               side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
+       }
+       
 
        for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
-               _channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, audio_channel_name (i));
-               table->Add (_channel_checkbox[i], 1, wxEXPAND);
-               table->AddSpacer (0);
+               _channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, std_to_wx (audio_channel_name (i)));
+               side->Add (_channel_checkbox[i], 1, wxEXPAND | wxALL, 3);
                _channel_checkbox[i]->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (AudioDialog::channel_clicked), 0, this);
        }
 
-       table->AddSpacer (0);
-       table->AddSpacer (0);
-
+       {
+               wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Type"));
+               side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
+       }
+       
        wxString const types[] = {
                _("Peak"),
                _("RMS")
@@ -56,17 +63,20 @@ AudioDialog::AudioDialog (wxWindow* parent)
 
        for (int i = 0; i < AudioPoint::COUNT; ++i) {
                _type_checkbox[i] = new wxCheckBox (this, wxID_ANY, types[i]);
-               table->Add (_type_checkbox[i], 1, wxEXPAND);
-               table->AddSpacer (0);
+               side->Add (_type_checkbox[i], 1, wxEXPAND | wxALL, 3);
                _type_checkbox[i]->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (AudioDialog::type_clicked), 0, this);
        }
 
-       _smoothing = new wxSlider (this, wxID_ANY, 1, 1, 128);
+       {
+               wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Smoothing"));
+               side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
+       }
+       
+       _smoothing = new wxSlider (this, wxID_ANY, AudioPlot::max_smoothing / 2, 1, AudioPlot::max_smoothing);
        _smoothing->Connect (wxID_ANY, wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler (AudioDialog::smoothing_changed), 0, this);
-       table->Add (_smoothing, 1, wxEXPAND);
-       table->AddSpacer (0);
+       side->Add (_smoothing, 1, wxEXPAND);
 
-       sizer->Add (table, 0, wxALL, 12);
+       sizer->Add (side, 0, wxALL, 12);
 
        SetSizer (sizer);
        sizer->Layout ();
@@ -77,7 +87,7 @@ void
 AudioDialog::set_film (boost::shared_ptr<Film> f)
 {
        _film_changed_connection.disconnect ();
-       _film_audio_analysis_finished_connection.disconnect ();
+       _film_audio_analysis_succeeded_connection.disconnect ();
        
        _film = f;
 
@@ -86,9 +96,9 @@ AudioDialog::set_film (boost::shared_ptr<Film> f)
        _plot->set_gain (_film->audio_gain ());
 
        _film_changed_connection = _film->Changed.connect (bind (&AudioDialog::film_changed, this, _1));
-       _film_audio_analysis_finished_connection = _film->AudioAnalysisFinished.connect (bind (&AudioDialog::try_to_load_analysis, this));
+       _film_audio_analysis_succeeded_connection = _film->AudioAnalysisSucceeded.connect (bind (&AudioDialog::try_to_load_analysis, this));
 
-       SetTitle (String::compose ("DVD-o-matic audio - %1", _film->name()));
+       SetTitle (wxString::Format (_("DVD-o-matic audio - %s"), std_to_wx(_film->name()).data()));
 }
 
 void