Tweak layout of General tab in Config panel.

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

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 1d90c216ed5c54490d5b5250aea35c73e7650a71..887ef3de60c35c8a83ce5270024e35981e5fb183 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -162,6 +162,7 @@ private:
                _language = new wxChoice (_panel, wxID_ANY);
                vector<pair<string, string> > languages;
                languages.push_back (make_pair ("Čeština", "cs_CZ"));
+               languages.push_back (make_pair ("汉语/漢語", "zh_CN"));
                languages.push_back (make_pair ("Dansk", "da_DK"));
                languages.push_back (make_pair ("Deutsch", "de_DE"));
                languages.push_back (make_pair ("English", "en_GB"));
@@ -231,8 +232,16 @@ private:
                table->Add (bottom_table, wxGBPosition (r, 0), wxGBSpan (2, 2), wxEXPAND);
                ++r;
 
-               _set_language->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED,   boost::bind (&GeneralPage::set_language_changed, this));
-               _language->Bind     (wxEVT_COMMAND_CHOICE_SELECTED,    boost::bind (&GeneralPage::language_changed,     this));
+               add_label_to_grid_bag_sizer (table, _panel, _("JPEG2000 encoder"), true, wxGBPosition (r, 0));
+               _encoder = new wxChoice (_panel, wxID_ANY);
+               BOOST_FOREACH (shared_ptr<JPEG2000Encoder> i, JPEG2000Encoder::all()) {
+                       _encoder->Append (std_to_wx (i->name ()));
+               }
+               table->Add (_encoder, wxGBPosition (r, 1));
+               ++r;
+
+               _set_language->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::set_language_changed, this));
+               _language->Bind     (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&GeneralPage::language_changed,     this));
                _cinemas_file->Bind (wxEVT_COMMAND_FILEPICKER_CHANGED, boost::bind (&GeneralPage::cinemas_file_changed, this));
 
                _num_local_encoding_threads->SetRange (1, 128);
@@ -288,9 +297,23 @@ private:
                checked_set (_check_for_test_updates, config->check_for_test_updates ());
                checked_set (_issuer, config->dcp_issuer ());
                checked_set (_creator, config->dcp_creator ());
+<<<<<<< 0f3c2864599f9e5a5ec001266b4aefb0205d1e1f
                checked_set (_cinemas_file, config->cinemas_file());
 
                setup_sensitivity ();
+=======
+
+               if (!config->encoder ()) {
+                       checked_set (_encoder, 0);
+               } else {
+                       vector<shared_ptr<JPEG2000Encoder> > encoders = JPEG2000Encoder::all ();
+                       for (size_t i = 0; i < encoders.size(); ++i) {
+                               if (encoders[i]->id() == config->encoder().get ()) {
+                                       checked_set (_encoder, i);
+                               }
+                       }
+               }
+>>>>>>> Basic classes for different JPEG2000 encoders; config to choose one.
        }
 
        void setup_sensitivity ()
@@ -373,6 +396,7 @@ private:
        wxCheckBox* _check_for_test_updates;
        wxTextCtrl* _issuer;
        wxTextCtrl* _creator;
+       wxChoice* _encoder;
 };
 
 class DefaultsPage : public StandardPage