summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/wx/content_advanced_dialog.cc97
-rw-r--r--src/wx/content_advanced_dialog.h14
-rw-r--r--src/wx/table_dialog.cc37
-rw-r--r--src/wx/table_dialog.h12
4 files changed, 79 insertions, 81 deletions
diff --git a/src/wx/content_advanced_dialog.cc b/src/wx/content_advanced_dialog.cc
index be32ff9e6..32f72bc58 100644
--- a/src/wx/content_advanced_dialog.cc
+++ b/src/wx/content_advanced_dialog.cc
@@ -55,61 +55,60 @@ using dcp::locale_convert;
-ContentAdvancedDialog::ContentAdvancedDialog (wxWindow* parent, shared_ptr<Content> content)
- : wxDialog (parent, wxID_ANY, _("Advanced content settings"))
- , _content (content)
+ContentAdvancedDialog::ContentAdvancedDialog(wxWindow* parent, shared_ptr<Content> content)
+ : wxDialog(parent, wxID_ANY, _("Advanced content settings"))
+ , _content(content)
{
- auto sizer = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ auto sizer = new wxGridBagSizer(DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
int r = 0;
- wxClientDC dc (this);
+ wxClientDC dc(this);
auto size = dc.GetTextExtent(char_to_wx("A quite long name"));
#ifdef __WXGTK3__
- size.SetWidth (size.GetWidth() + 64);
+ size.SetWidth(size.GetWidth() + 64);
#endif
- size.SetHeight (-1);
+ size.SetHeight(-1);
- add_label_to_sizer (sizer, this, _("Video filters"), true, wxGBPosition(r, 0));
- _filters = new StaticText (this, _("None"), wxDefaultPosition, size);
- _filters_button = new Button (this, _("Edit..."));
+ add_label_to_sizer(sizer, this, _("Video filters"), true, wxGBPosition(r, 0));
+ _filters = new StaticText(this, _("None"), wxDefaultPosition, size);
+ _filters_button = new Button(this, _("Edit..."));
sizer->Add(_filters, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
sizer->Add(_filters_button, wxGBPosition(r, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
++r;
wxStaticText* video_frame_rate_label;
if (_content->video) {
- video_frame_rate_label = add_label_to_sizer (sizer, this, _("Override detected video frame rate"), true, wxGBPosition(r, 0));
+ video_frame_rate_label = add_label_to_sizer(sizer, this, _("Override detected video frame rate"), true, wxGBPosition(r, 0));
} else {
- video_frame_rate_label = add_label_to_sizer (sizer, this, _("Video frame rate that content was prepared for"), true, wxGBPosition(r, 0));
+ video_frame_rate_label = add_label_to_sizer(sizer, this, _("Video frame rate that content was prepared for"), true, wxGBPosition(r, 0));
}
_video_frame_rate = new wxTextCtrl(this, wxID_ANY, {}, wxDefaultPosition, wxDefaultSize, 0, wxNumericPropertyValidator(wxNumericPropertyValidator::Float));
sizer->Add(_video_frame_rate, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
- _set_video_frame_rate = new Button (this, _("Set"));
- _set_video_frame_rate->Enable (false);
+ _set_video_frame_rate = new Button(this, _("Set"));
+ _set_video_frame_rate->Enable(false);
sizer->Add(_set_video_frame_rate, wxGBPosition(r, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
++r;
/// TRANSLATORS: next to this control is a language selector, so together they will read, for example
/// "Video has burnt-in subtitles in the language fr-FR"
_burnt_subtitle = new CheckBox(this, _("Video has burnt-in subtitles in the language"));
- sizer->Add (_burnt_subtitle, wxGBPosition(r, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
- _burnt_subtitle_language = new LanguageTagWidget (this, _("Language of burnt-in subtitles in this content"), content->video ? content->video->burnt_subtitle_language() : boost::none);
- sizer->Add (_burnt_subtitle_language->sizer(), wxGBPosition(r, 1), wxGBSpan(1, 2), wxEXPAND);
+ sizer->Add(_burnt_subtitle, wxGBPosition(r, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+ _burnt_subtitle_language = new LanguageTagWidget(this, _("Language of burnt-in subtitles in this content"), content->video ? content->video->burnt_subtitle_language() : boost::none);
+ sizer->Add(_burnt_subtitle_language->sizer(), wxGBPosition(r, 1), wxGBSpan(1, 2), wxEXPAND);
++r;
_ignore_video = new CheckBox(this, _("Ignore this content's video and use only audio, subtitles and closed captions"));
sizer->Add(_ignore_video, wxGBPosition(r, 0), wxGBSpan(1, 3));
++r;
- auto overall = new wxBoxSizer (wxVERTICAL);
- overall->Add (sizer, 1, wxALL, DCPOMATIC_DIALOG_BORDER);
- auto buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
- if (buttons) {
- overall->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+ auto overall = new wxBoxSizer(wxVERTICAL);
+ overall->Add(sizer, 1, wxALL, DCPOMATIC_DIALOG_BORDER);
+ if (auto buttons = CreateSeparatedButtonSizer(wxOK | wxCANCEL)) {
+ overall->Add(buttons, wxSizerFlags().Expand().DoubleBorder());
}
- SetSizerAndFit (overall);
+ SetSizerAndFit(overall);
_ignore_video->Enable(static_cast<bool>(_content->video));
_ignore_video->SetValue(_content->video ? !content->video->use() : false);
@@ -119,26 +118,26 @@ ContentAdvancedDialog::ContentAdvancedDialog (wxWindow* parent, shared_ptr<Conte
if (fcs) {
_filters_list = fcs->filters();
}
- setup_filters ();
+ setup_filters();
bool const single_frame_image_content = dynamic_pointer_cast<const ImageContent>(_content) && _content->number_of_paths() == 1;
- video_frame_rate_label->Enable (!single_frame_image_content);
- _video_frame_rate->Enable (!single_frame_image_content);
+ video_frame_rate_label->Enable(!single_frame_image_content);
+ _video_frame_rate->Enable(!single_frame_image_content);
if (auto const vfr = _content->video_frame_rate()) {
_video_frame_rate->SetValue(std_to_wx(locale_convert<string>(*vfr)));
_video_frame_rate_value = *vfr;
}
- _burnt_subtitle->SetValue (_content->video && static_cast<bool>(_content->video->burnt_subtitle_language()));
- _burnt_subtitle_language->set (_content->video ? _content->video->burnt_subtitle_language() : boost::none);
+ _burnt_subtitle->SetValue(_content->video && static_cast<bool>(_content->video->burnt_subtitle_language()));
+ _burnt_subtitle_language->set(_content->video ? _content->video->burnt_subtitle_language() : boost::none);
- _filters_button->Bind (wxEVT_BUTTON, bind(&ContentAdvancedDialog::edit_filters, this));
- _set_video_frame_rate->Bind (wxEVT_BUTTON, bind(&ContentAdvancedDialog::set_video_frame_rate, this));
- _video_frame_rate->Bind (wxEVT_TEXT, boost::bind(&ContentAdvancedDialog::video_frame_rate_changed, this));
+ _filters_button->Bind(wxEVT_BUTTON, bind(&ContentAdvancedDialog::edit_filters, this));
+ _set_video_frame_rate->Bind(wxEVT_BUTTON, bind(&ContentAdvancedDialog::set_video_frame_rate, this));
+ _video_frame_rate->Bind(wxEVT_TEXT, boost::bind(&ContentAdvancedDialog::video_frame_rate_changed, this));
_burnt_subtitle->bind(&ContentAdvancedDialog::burnt_subtitle_changed, this);
- setup_sensitivity ();
+ setup_sensitivity();
}
@@ -150,29 +149,29 @@ ContentAdvancedDialog::ignore_video() const
void
-ContentAdvancedDialog::setup_filters ()
+ContentAdvancedDialog::setup_filters()
{
if (!_filters_allowed) {
- checked_set (_filters, _("None"));
- _filters->Enable (false);
- _filters_button->Enable (false);
+ checked_set(_filters, _("None"));
+ _filters->Enable(false);
+ _filters_button->Enable(false);
return;
}
auto p = Filter::ffmpeg_string(_filters_list);
if (p.empty()) {
- checked_set (_filters, _("None"));
+ checked_set(_filters, _("None"));
} else {
if (p.length() > 25) {
p = p.substr(0, 25) + "...";
}
- checked_set (_filters, p);
+ checked_set(_filters, p);
}
}
void
-ContentAdvancedDialog::edit_filters ()
+ContentAdvancedDialog::edit_filters()
{
if (!_filters_allowed) {
return;
@@ -188,7 +187,7 @@ void
ContentAdvancedDialog::filters_changed(vector<Filter> const& filters)
{
_filters_list = filters;
- setup_filters ();
+ setup_filters();
}
@@ -200,9 +199,9 @@ ContentAdvancedDialog::video_frame_rate() const
void
-ContentAdvancedDialog::set_video_frame_rate ()
+ContentAdvancedDialog::set_video_frame_rate()
{
- _set_video_frame_rate->Enable (false);
+ _set_video_frame_rate->Enable(false);
auto const value = _video_frame_rate->GetValue();
if (!value.IsEmpty()) {
_video_frame_rate_value = locale_convert<double>(wx_to_std(_video_frame_rate->GetValue()));
@@ -213,7 +212,7 @@ ContentAdvancedDialog::set_video_frame_rate ()
void
-ContentAdvancedDialog::video_frame_rate_changed ()
+ContentAdvancedDialog::video_frame_rate_changed()
{
bool enable = true;
/* If the user clicks "set" now, with no frame rate entered, it would unset the video
@@ -223,22 +222,22 @@ ContentAdvancedDialog::video_frame_rate_changed ()
enable = false;
}
- _set_video_frame_rate->Enable (enable);
+ _set_video_frame_rate->Enable(enable);
}
void
-ContentAdvancedDialog::setup_sensitivity ()
+ContentAdvancedDialog::setup_sensitivity()
{
- _burnt_subtitle->Enable (static_cast<bool>(_content->video));
- _burnt_subtitle_language->enable (_content->video && _burnt_subtitle->GetValue());
+ _burnt_subtitle->Enable(static_cast<bool>(_content->video));
+ _burnt_subtitle_language->enable(_content->video && _burnt_subtitle->GetValue());
}
void
-ContentAdvancedDialog::burnt_subtitle_changed ()
+ContentAdvancedDialog::burnt_subtitle_changed()
{
- setup_sensitivity ();
+ setup_sensitivity();
}
diff --git a/src/wx/content_advanced_dialog.h b/src/wx/content_advanced_dialog.h
index 4b00c4d30..3b625f7ed 100644
--- a/src/wx/content_advanced_dialog.h
+++ b/src/wx/content_advanced_dialog.h
@@ -38,7 +38,7 @@ class LanguageTagWidget;
class ContentAdvancedDialog : public wxDialog
{
public:
- ContentAdvancedDialog (wxWindow* parent, std::shared_ptr<Content> content);
+ ContentAdvancedDialog(wxWindow* parent, std::shared_ptr<Content> content);
bool ignore_video() const;
@@ -50,13 +50,13 @@ public:
boost::optional<dcp::LanguageTag> burnt_subtitle_language() const;
private:
- void edit_filters ();
+ void edit_filters();
void filters_changed(std::vector<Filter> const& filters);
- void setup_filters ();
- void set_video_frame_rate ();
- void video_frame_rate_changed ();
- void setup_sensitivity ();
- void burnt_subtitle_changed ();
+ void setup_filters();
+ void set_video_frame_rate();
+ void video_frame_rate_changed();
+ void setup_sensitivity();
+ void burnt_subtitle_changed();
std::shared_ptr<Content> _content;
bool _filters_allowed = false;
diff --git a/src/wx/table_dialog.cc b/src/wx/table_dialog.cc
index 7653f8663..6009ea3ce 100644
--- a/src/wx/table_dialog.cc
+++ b/src/wx/table_dialog.cc
@@ -24,42 +24,41 @@
#include "wx_util.h"
-TableDialog::TableDialog (wxWindow* parent, wxString title, int columns, int growable, bool cancel)
- : wxDialog (parent, wxID_ANY, title)
+TableDialog::TableDialog(wxWindow* parent, wxString title, int columns, int growable, bool cancel)
+ : wxDialog(parent, wxID_ANY, title)
{
- _overall_sizer = new wxBoxSizer (wxVERTICAL);
- SetSizer (_overall_sizer);
+ _overall_sizer = new wxBoxSizer(wxVERTICAL);
+ SetSizer(_overall_sizer);
- _table = new wxFlexGridSizer (columns, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
- _table->AddGrowableCol (growable, 1);
+ _table = new wxFlexGridSizer(columns, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ _table->AddGrowableCol(growable, 1);
- _overall_sizer->Add (_table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
+ _overall_sizer->Add(_table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
long int flags = wxOK;
if (cancel) {
flags |= wxCANCEL;
}
- auto buttons = CreateSeparatedButtonSizer (flags);
- if (buttons) {
- _overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+ if (auto buttons = CreateSeparatedButtonSizer(flags)) {
+ _overall_sizer->Add(buttons, wxSizerFlags().Expand().DoubleBorder());
}
}
void
-TableDialog::layout ()
+TableDialog::layout()
{
- _overall_sizer->Layout ();
- _overall_sizer->SetSizeHints (this);
+ _overall_sizer->Layout();
+ _overall_sizer->SetSizeHints(this);
}
wxStaticText *
#ifdef DCPOMATIC_OSX
-TableDialog::add (wxString text, bool label, int flags)
+TableDialog::add(wxString text, bool label, int flags)
#else
-TableDialog::add (wxString text, bool, int flags)
+TableDialog::add(wxString text, bool, int flags)
#endif
{
#ifdef DCPOMATIC_OSX
@@ -69,14 +68,14 @@ TableDialog::add (wxString text, bool, int flags)
}
#endif
auto m = new StaticText(this, {});
- m->SetLabelMarkup (text);
- _table->Add (m, 0, flags, 6);
+ m->SetLabelMarkup(text);
+ _table->Add(m, 0, flags, 6);
return m;
}
void
-TableDialog::add_spacer ()
+TableDialog::add_spacer()
{
- _table->AddSpacer (0);
+ _table->AddSpacer(0);
}
diff --git a/src/wx/table_dialog.h b/src/wx/table_dialog.h
index c9eeb3ef8..dbc05693d 100644
--- a/src/wx/table_dialog.h
+++ b/src/wx/table_dialog.h
@@ -29,19 +29,19 @@ LIBDCP_ENABLE_WARNINGS
class TableDialog : public wxDialog
{
public:
- TableDialog (wxWindow* parent, wxString title, int columns, int growable, bool cancel);
+ TableDialog(wxWindow* parent, wxString title, int columns, int growable, bool cancel);
protected:
template<class T>
- T* add (T* w, int proportion = 1, int flag = wxEXPAND) {
- _table->Add (w, proportion, flag);
+ T* add(T* w, int proportion = 1, int flag = wxEXPAND) {
+ _table->Add(w, proportion, flag);
return w;
}
- wxStaticText* add (wxString text, bool label, int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT);
- void add_spacer ();
+ wxStaticText* add(wxString text, bool label, int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT);
+ void add_spacer();
- void layout ();
+ void layout();
wxFlexGridSizer* _table;
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-05 14:05:39 +0000