Hack to fix wxChoice heights on KDE (#2343).

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

diff --git a/src/wx/metadata_dialog.cc b/src/wx/metadata_dialog.cc
index 69dee0c4612d428864b9f6e0ea84c7f301f7d42e..c6f805ed6ed57751f7ad138ce6192d5d91a037bb 100644 (file)
--- a/src/wx/metadata_dialog.cc
+++ b/src/wx/metadata_dialog.cc
@@ -20,9 +20,12 @@
 
 
 #include "dcpomatic_button.h"
+#include "dcpomatic_choice.h"
+#include "editable_list.h"
 #include "full_language_tag_dialog.h"
 #include "language_tag_widget.h"
 #include "metadata_dialog.h"
+#include "rating_dialog.h"
 #include "wx_util.h"
 #include "lib/film.h"
 #include <dcp/warnings.h>
@@ -36,13 +39,16 @@ LIBDCP_ENABLE_WARNINGS
 
 
 using std::weak_ptr;
+using std::vector;
 
 
 MetadataDialog::MetadataDialog (wxWindow* parent, weak_ptr<Film> weak_film)
        : wxDialog (parent, wxID_ANY, _("Metadata"))
        , WeakFilm (weak_film)
 {
-
+       for (auto system: dcp::rating_systems()) {
+               _rating_system_agency_to_name[system.agency] = system.name;
+       }
 }
 
 
@@ -183,6 +189,29 @@ MetadataDialog::setup_standard (wxPanel* panel, wxSizer* sizer)
                s->Add (_edit_release_territory, 0, wxLEFT, DCPOMATIC_SIZER_GAP);
                sizer->Add (s, 0, wxEXPAND);
        }
+
+       vector<EditableListColumn> columns;
+       columns.push_back(EditableListColumn("Agency", 200, true));
+       columns.push_back(EditableListColumn("Label", 400, true));
+       _ratings = new EditableList<dcp::Rating, RatingDialog> (
+               panel,
+               columns,
+               boost::bind(&MetadataDialog::ratings, this),
+               boost::bind(&MetadataDialog::set_ratings, this, _1),
+               [this](dcp::Rating r, int c) {
+                       if (c == 0) {
+                               auto iter = _rating_system_agency_to_name.find(r.agency);
+                               if (iter != _rating_system_agency_to_name.end()) {
+                                       return iter->second;
+                               }
+                               return r.agency;
+                       }
+                       return r.label;
+               },
+               EditableListTitle::VISIBLE,
+               EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE
+               );
+       _ratings->SetMinSize(wxSize(600, -1));
 }
 
 
@@ -275,14 +304,13 @@ MetadataDialog::setup_advanced (wxPanel* panel, wxSizer* sizer)
                _luminance_value->SetDigits (1);
                _luminance_value->SetIncrement (0.1);
                s->Add (_luminance_value, 0);
-               _luminance_unit = new wxChoice (panel, wxID_ANY);
+               _luminance_unit = new Choice(panel);
                s->Add (_luminance_unit, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
                sizer->Add (s, 1, wxEXPAND);
        }
 
-       _luminance_unit->Append (_("candela per m²"));
-       _luminance_unit->Append (_("foot lambert"));
-
+       _luminance_unit->add(_("candela per m²"));
+       _luminance_unit->add(_("foot lambert"));
 }
 
 
@@ -387,7 +415,8 @@ void
 MetadataDialog::luminance_changed ()
 {
        dcp::Luminance::Unit unit;
-       switch (_luminance_unit->GetSelection()) {
+       DCPOMATIC_ASSERT(_luminance_unit->get());
+       switch (*_luminance_unit->get()) {
        case 0:
                unit = dcp::Luminance::Unit::CANDELA_PER_SQUARE_METRE;
                break;
@@ -408,3 +437,17 @@ MetadataDialog::sign_language_video_language_changed ()
        film()->set_sign_language_video_language(_sign_language_video_language->get());
 }
 
+
+vector<dcp::Rating>
+MetadataDialog::ratings() const
+{
+       return film()->ratings();
+}
+
+
+void
+MetadataDialog::set_ratings(vector<dcp::Rating> r)
+{
+       film()->set_ratings(r);
+}
+