X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.cc;h=be6e08341ddc6a49f65bc44e65e78359b071db2b;hb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c;hp=687f4d6ff24aea5311ae0a726b9b51e7ab56fd1b;hpb=527deef6f18c46badb396e4520d802333997add2;p=dcpomatic.git diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 687f4d6ff..be6e08341 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -19,6 +19,7 @@ #include "dcp_panel.h" #include "wx_util.h" +#include "key_dialog.h" #include "isdcf_metadata_dialog.h" #include "lib/ratio.h" #include "lib/config.h" @@ -26,6 +27,7 @@ #include "lib/util.h" #include "lib/film.h" #include "lib/ffmpeg_content.h" +#include #include #include #include @@ -75,9 +77,15 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr f) ++r; } - add_label_to_grid_bag_sizer (grid, _panel, _("DCP Name"), true, wxGBPosition (r, 0)); - _dcp_name = new wxStaticText (_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END); - grid->Add (_dcp_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxEXPAND); + /* wxST_ELLIPSIZE_MIDDLE works around a bug in GTK2 and/or wxWidgets, see + http://trac.wxwidgets.org/ticket/12539 + */ + _dcp_name = new wxStaticText ( + _panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, + wxALIGN_CENTRE_HORIZONTAL | wxST_NO_AUTORESIZE | wxST_ELLIPSIZE_MIDDLE + ); + + grid->Add (_dcp_name, wxGBPosition(r, 0), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL | wxEXPAND); ++r; add_label_to_grid_bag_sizer (grid, _panel, _("Content Type"), true, wxGBPosition (r, 0)); @@ -99,6 +107,21 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr f) grid->Add (_encrypted, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; + wxClientDC dc (_panel); + wxSize size = dc.GetTextExtent (wxT ("GGGGGGGG...")); + size.SetHeight (-1); + + { + add_label_to_grid_bag_sizer (grid, _panel, _("Key"), true, wxGBPosition (r, 0)); + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _key = new wxStaticText (_panel, wxID_ANY, "", wxDefaultPosition, size); + s->Add (_key, 1, wxALIGN_CENTER_VERTICAL); + _edit_key = new wxButton (_panel, wxID_ANY, _("Edit...")); + s->Add (_edit_key); + grid->Add (s, wxGBPosition (r, 1)); + ++r; + } + add_label_to_grid_bag_sizer (grid, _panel, _("Standard"), true, wxGBPosition (r, 0)); _standard = new wxChoice (_panel, wxID_ANY); grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); @@ -111,6 +134,7 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr f) _dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::dcp_content_type_changed, this)); _signed->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::signed_toggled, this)); _encrypted->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::encrypted_toggled, this)); + _edit_key->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::edit_key_clicked, this)); _standard->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::standard_changed, this)); vector const ct = DCPContentType::all (); @@ -124,6 +148,16 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr f) Config::instance()->Changed.connect (boost::bind (&DCPPanel::config_changed, this)); } +void +DCPPanel::edit_key_clicked () +{ + KeyDialog* d = new KeyDialog (_panel, _film->key ()); + if (d->ShowModal () == wxID_OK) { + _film->set_key (d->key ()); + } + d->Destroy (); +} + void DCPPanel::name_changed () { @@ -258,12 +292,20 @@ DCPPanel::film_changed (int p) if (_film->encrypted ()) { _film->set_signed (true); _signed->Enable (false); + _key->Enable (_generally_sensitive); + _edit_key->Enable (_generally_sensitive); } else { _signed->Enable (_generally_sensitive); + _key->Enable (false); + _edit_key->Enable (false); } break; + case Film::KEY: + checked_set (_key, _film->key().hex().substr (0, 8) + "..."); + break; case Film::RESOLUTION: checked_set (_resolution, _film->resolution() == RESOLUTION_2K ? 0 : 1); + setup_container (); setup_dcp_name (); break; case Film::J2K_BANDWIDTH: @@ -309,6 +351,7 @@ DCPPanel::film_changed (int p) break; case Film::INTEROP: checked_set (_standard, _film->interop() ? 1 : 0); + setup_dcp_name (); break; default: break; @@ -318,7 +361,7 @@ DCPPanel::film_changed (int p) void DCPPanel::film_content_changed (int property) { - if (property == FFmpegContentProperty::AUDIO_STREAM || + if (property == FFmpegContentProperty::AUDIO_STREAMS || property == SubtitleContentProperty::USE_SUBTITLES || property == VideoContentProperty::VIDEO_SCALE) { setup_dcp_name (); @@ -339,8 +382,11 @@ DCPPanel::setup_container () if (i == ratios.end()) { checked_set (_container, -1); + checked_set (_container_size, wxT ("")); } else { checked_set (_container, n); + dcp::Size const size = fit_ratio_within (_film->container()->ratio(), _film->full_frame ()); + checked_set (_container_size, wxString::Format ("%dx%d", size.width, size.height)); } setup_dcp_name (); @@ -390,6 +436,7 @@ DCPPanel::set_film (shared_ptr film) film_changed (Film::SIGNED); film_changed (Film::BURN_SUBTITLES); film_changed (Film::ENCRYPTED); + film_changed (Film::KEY); film_changed (Film::J2K_BANDWIDTH); film_changed (Film::ISDCF_METADATA); film_changed (Film::VIDEO_FRAME_RATE); @@ -416,6 +463,8 @@ DCPPanel::set_general_sensitivity (bool s) _signed->Enable (si); _encrypted->Enable (s); + _key->Enable (s && _film && _film->encrypted ()); + _edit_key->Enable (s && _film && _film->encrypted ()); _frame_rate_choice->Enable (s); _frame_rate_spin->Enable (s); _audio_channels->Enable (s); @@ -453,13 +502,7 @@ DCPPanel::edit_isdcf_button_clicked () void DCPPanel::setup_dcp_name () { - string s = _film->dcp_name (true); - if (s.length() > 28) { - _dcp_name->SetLabel (std_to_wx (s.substr (0, 28)) + N_("...")); - _dcp_name->SetToolTip (std_to_wx (s)); - } else { - _dcp_name->SetLabel (std_to_wx (s)); - } + _dcp_name->SetLabel (std_to_wx (_film->dcp_name (true))); } void @@ -515,9 +558,15 @@ DCPPanel::make_video_panel () int r = 0; add_label_to_grid_bag_sizer (grid, panel, _("Container"), true, wxGBPosition (r, 0)); - _container = new wxChoice (panel, wxID_ANY); - grid->Add (_container, wxGBPosition (r, 1)); - ++r; + { + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _container = new wxChoice (panel, wxID_ANY); + s->Add (_container, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP); + _container_size = new wxStaticText (panel, wxID_ANY, wxT ("")); + s->Add (_container_size, 1, wxLEFT | wxALIGN_CENTER_VERTICAL); + grid->Add (s, wxGBPosition (r,1 ), wxDefaultSpan, wxEXPAND); + ++r; + } { add_label_to_grid_bag_sizer (grid, panel, _("Frame Rate"), true, wxGBPosition (r, 0)); @@ -562,6 +611,8 @@ DCPPanel::make_video_panel () _best_frame_rate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::best_frame_rate_clicked, this)); _burn_subtitles->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::burn_subtitles_toggled, this)); _j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DCPPanel::j2k_bandwidth_changed, this)); + /* Also listen to wxEVT_COMMAND_TEXT_UPDATED so that typing numbers directly in is always noticed */ + _j2k_bandwidth->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DCPPanel::j2k_bandwidth_changed, this)); _resolution->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::resolution_changed, this)); _three_d->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::three_d_changed, this)); @@ -596,7 +647,7 @@ DCPPanel::make_audio_panel () int r = 0; add_label_to_grid_bag_sizer (grid, panel, _("Channels"), true, wxGBPosition (r, 0)); _audio_channels = new wxChoice (panel, wxID_ANY); - for (int i = 2; i <= 16; i += 2) { + for (int i = 2; i <= 12; i += 2) { _audio_channels->Append (wxString::Format ("%d", i)); } grid->Add (_audio_channels, wxGBPosition (r, 1));