Merge remote-tracking branch 'origin/master' into 2.0

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

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 009467afa0fbfdbc7aceaf1eb0de191323a59be9..fa7ccf7cc707b305d450acd00301927c0663ed22 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -317,31 +317,31 @@ public:
                
                _isdcf_metadata_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DefaultsPage::edit_isdcf_metadata_clicked, this, parent));
                
-               vector<Ratio const *> ratio = Ratio::all ();
-               int n = 0;
-               for (vector<Ratio const *>::iterator i = ratio.begin(); i != ratio.end(); ++i) {
-                       _scale->Append (std_to_wx ((*i)->nickname ()));
-                       if (*i == config->default_scale ()) {
-                               _scale->SetSelection (n);
+               vector<VideoContentScale> scales = VideoContentScale::all ();
+               for (size_t i = 0; i < scales.size(); ++i) {
+                       _scale->Append (std_to_wx (scales[i].name ()));
+                       if (scales[i] == config->default_scale ()) {
+                               _scale->SetSelection (i);
                        }
-                       _container->Append (std_to_wx ((*i)->nickname ()));
-                       if (*i == config->default_container ()) {
-                               _container->SetSelection (n);
+               }
+
+               vector<Ratio const *> ratios = Ratio::all ();
+               for (size_t i = 0; i < ratios.size(); ++i) {
+                       _container->Append (std_to_wx (ratios[i]->nickname ()));
+                       if (ratios[i] == config->default_container ()) {
+                               _container->SetSelection (i);
                        }
-                       ++n;
                }
                
                _scale->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::scale_changed, this));
                _container->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::container_changed, this));
                
                vector<DCPContentType const *> const ct = DCPContentType::all ();
-               n = 0;
-               for (vector<DCPContentType const *>::const_iterator i = ct.begin(); i != ct.end(); ++i) {
-                       _dcp_content_type->Append (std_to_wx ((*i)->pretty_name ()));
-                       if (*i == config->default_dcp_content_type ()) {
-                               _dcp_content_type->SetSelection (n);
+               for (size_t i = 0; i < ct.size(); ++i) {
+                       _dcp_content_type->Append (std_to_wx (ct[i]->pretty_name ()));
+                       if (ct[i] == config->default_dcp_content_type ()) {
+                               _dcp_content_type->SetSelection (i);
                        }
-                       ++n;
                }
                
                _dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::dcp_content_type_changed, this));
@@ -391,8 +391,8 @@ private:
 
        void scale_changed ()
        {
-               vector<Ratio const *> ratio = Ratio::all ();
-               Config::instance()->set_default_scale (ratio[_scale->GetSelection()]);
+               vector<VideoContentScale> scale = VideoContentScale::all ();
+               Config::instance()->set_default_scale (scale[_scale->GetSelection()]);
        }
        
        void container_changed ()
@@ -1117,18 +1117,26 @@ public:
                table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxALL);
                table->AddSpacer (0);
 
-               add_label_to_sizer (table, panel, _("Log"), true);
-               _log_general = new wxCheckBox (panel, wxID_ANY, _("General"));
-               table->Add (_log_general, 1, wxEXPAND | wxALL);
-               _log_warning = new wxCheckBox (panel, wxID_ANY, _("Warnings"));
-               table->AddSpacer (0);
-               table->Add (_log_warning, 1, wxEXPAND | wxALL);
-               _log_error = new wxCheckBox (panel, wxID_ANY, _("Errors"));
-               table->AddSpacer (0);
-               table->Add (_log_error, 1, wxEXPAND | wxALL);
-               _log_timing = new wxCheckBox (panel, wxID_ANY, S_("Config|Timing"));
-               table->AddSpacer (0);
-               table->Add (_log_timing, 1, wxEXPAND | wxALL);
+               int flags = wxALIGN_TOP | wxLEFT | wxRIGHT | wxEXPAND | wxALL;
+#ifdef __WXOSX__
+               flags |= wxALIGN_RIGHT;
+               t += wxT (":");
+#endif 
+               wxStaticText* m = new wxStaticText (panel, wxID_ANY, _("Log"));
+               table->Add (m, 0, flags, 6);
+               
+               {
+                       wxBoxSizer* t = new wxBoxSizer (wxVERTICAL);
+                       _log_general = new wxCheckBox (panel, wxID_ANY, _("General"));
+                       t->Add (_log_general, 1, wxEXPAND | wxALL);
+                       _log_warning = new wxCheckBox (panel, wxID_ANY, _("Warnings"));
+                       t->Add (_log_warning, 1, wxEXPAND | wxALL);
+                       _log_error = new wxCheckBox (panel, wxID_ANY, _("Errors"));
+                       t->Add (_log_error, 1, wxEXPAND | wxALL);
+                       _log_timing = new wxCheckBox (panel, wxID_ANY, S_("Config|Timing"));
+                       t->Add (_log_timing, 1, wxEXPAND | wxALL);
+                       table->Add (t, 0, wxALL, 6);
+               }
 
                Config* config = Config::instance ();