Make player more tolerant of some DCP errors.

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

diff --git a/src/wx/initial_setup_dialog.cc b/src/wx/initial_setup_dialog.cc
index af2917990e62fba5618ef105e025c05ea3f2bce1..65b005207b1bc3fcbb5cc347cd8910f62d03d286 100644 (file)
--- a/src/wx/initial_setup_dialog.cc
+++ b/src/wx/initial_setup_dialog.cc
@@ -19,6 +19,7 @@
 */
 
 #include "initial_setup_dialog.h"
+#include "static_text.h"
 #include "lib/config.h"
 #include <boost/bind.hpp>
 
@@ -26,7 +27,7 @@ InitialSetupDialog::InitialSetupDialog ()
        : wxDialog (0, wxID_ANY, _("DCP-o-matic setup"))
 {
        wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
-       wxStaticText* text1 = new wxStaticText (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(600, -1));
+       wxStaticText* text1 = new StaticText (this, wxEmptyString, wxDefaultPosition, wxSize(600, -1));
        sizer->Add (text1, 1, wxEXPAND | wxALL, 12);
 
        text1->SetLabelMarkup (
@@ -36,14 +37,18 @@ InitialSetupDialog::InitialSetupDialog ()
                        "<i>Simple mode</i> is ideal for producing straightforward DCPs without too many confusing "
                        "options.\n\n"
                        "<i>Full mode</i> gives you the most control over the DCPs you make.\n\n"
-                       "Please choose which mode you would like to start DCP-o-matic in:\n\n"
+                       "Please choose which mode you would like to start DCP-o-matic in:"
                        )
                );
 
+       wxBoxSizer* mode_sizer = new wxBoxSizer (wxVERTICAL);
+
        _simple = new wxRadioButton (this, wxID_ANY, _("Simple mode"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
-       sizer->Add (_simple, 0, wxLEFT, 24);
+       mode_sizer->Add (_simple, 0, wxTOP, 12);
        _full = new wxRadioButton (this, wxID_ANY, _("Full mode"));
-       sizer->Add (_full, 0, wxLEFT, 24);
+       mode_sizer->Add (_full, 0, wxTOP, 8);
+
+       sizer->Add (mode_sizer, 0, wxLEFT, 24);
 
        if (Config::instance()->interface_complexity() == Config::INTERFACE_SIMPLE) {
                _simple->SetValue (true);
@@ -51,10 +56,10 @@ InitialSetupDialog::InitialSetupDialog ()
                _full->SetValue (true);
        }
 
-       wxStaticText* text2 = new wxStaticText (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(400, -1));
+       wxStaticText* text2 = new StaticText (this, wxEmptyString, wxDefaultPosition, wxSize(400, -1));
        sizer->Add (text2, 0, wxEXPAND | wxALL, 12);
 
-       text2->SetLabelMarkup (_("\nYou can change the mode at any time from the General page of Preferences."));
+       text2->SetLabel (_("\nYou can change the mode at any time from the General page of Preferences."));
 
        _simple->Bind (wxEVT_RADIOBUTTON, boost::bind(&InitialSetupDialog::interface_complexity_changed, this));
        _full->Bind (wxEVT_RADIOBUTTON, boost::bind(&InitialSetupDialog::interface_complexity_changed, this));