diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-07 17:09:43 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-09 13:44:57 +0100 |
| commit | 76196d4356ca5d92047e46ce8d617c688ad88c91 (patch) | |
| tree | 83a9b23bfab8ea1c699dd6f2e6c0908ba60f5433 /src | |
| parent | f001a5020a6307f1adf650bd33a0c2a2ea26d468 (diff) | |
Update for TableDialog constructor change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/audio_gain_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/cinema_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/content_properties_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/download_certificate_dialog.cc | 4 | ||||
| -rw-r--r-- | src/wx/gain_calculator_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/image_sequence_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/isdcf_metadata_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/key_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/make_chain_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/new_film_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/repeat_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/screen_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/server_dialog.cc | 3 |
13 files changed, 13 insertions, 16 deletions
diff --git a/src/wx/audio_gain_dialog.cc b/src/wx/audio_gain_dialog.cc index 75a993d8c..fddf67148 100644 --- a/src/wx/audio_gain_dialog.cc +++ b/src/wx/audio_gain_dialog.cc @@ -23,7 +23,7 @@ #include "wx_util.h" AudioGainDialog::AudioGainDialog (wxWindow* parent, int c, int d, float v) - : TableDialog (parent, _("Channel gain"), 3, true) + : TableDialog (parent, _("Channel gain"), 3, 1, true) { add (wxString::Format (_("Gain for content channel %d in DCP channel %d"), c + 1, d + 1), false); _gain = add (new wxSpinCtrlDouble (this)); diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc index 782481d54..a54dd7335 100644 --- a/src/wx/cinema_dialog.cc +++ b/src/wx/cinema_dialog.cc @@ -23,7 +23,7 @@ using std::string; CinemaDialog::CinemaDialog (wxWindow* parent, string title, string name, string email) - : TableDialog (parent, std_to_wx (title), 2, true) + : TableDialog (parent, std_to_wx (title), 2, 1, true) { add (_("Name"), true); _name = add (new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (256, -1))); diff --git a/src/wx/content_properties_dialog.cc b/src/wx/content_properties_dialog.cc index 4f92e53ce..0b9bd0bb8 100644 --- a/src/wx/content_properties_dialog.cc +++ b/src/wx/content_properties_dialog.cc @@ -33,7 +33,7 @@ using boost::shared_ptr; using boost::dynamic_pointer_cast; ContentPropertiesDialog::ContentPropertiesDialog (wxWindow* parent, shared_ptr<Content> content) - : TableDialog (parent, _("Content Properties"), 2, false) + : TableDialog (parent, _("Content Properties"), 2, 1, false) { string n = content->path(0).string(); boost::algorithm::replace_all (n, "&", "&&"); diff --git a/src/wx/download_certificate_dialog.cc b/src/wx/download_certificate_dialog.cc index 90d383298..275c943db 100644 --- a/src/wx/download_certificate_dialog.cc +++ b/src/wx/download_certificate_dialog.cc @@ -24,7 +24,7 @@ using boost::function; DownloadCertificateDialog::DownloadCertificateDialog (wxWindow* parent, function<void (boost::filesystem::path)> load) - : TableDialog (parent, _("Download certificate"), 2, true) + : TableDialog (parent, _("Download certificate"), 2, 1, true) , _load (load) , _message (0) , _download (0) @@ -61,5 +61,3 @@ DownloadCertificateDialog::downloaded (bool done) wxButton* ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK, this)); ok->Enable (done); } - - diff --git a/src/wx/gain_calculator_dialog.cc b/src/wx/gain_calculator_dialog.cc index 133d84c21..a840aebef 100644 --- a/src/wx/gain_calculator_dialog.cc +++ b/src/wx/gain_calculator_dialog.cc @@ -24,7 +24,7 @@ using namespace boost; GainCalculatorDialog::GainCalculatorDialog (wxWindow* parent) - : TableDialog (parent, _("Gain Calculator"), 2, true) + : TableDialog (parent, _("Gain Calculator"), 2, 1, true) { add (_("I want to play this back at fader"), true); _wanted = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator (wxFILTER_NUMERIC))); diff --git a/src/wx/image_sequence_dialog.cc b/src/wx/image_sequence_dialog.cc index 12d12182f..0cdf653a5 100644 --- a/src/wx/image_sequence_dialog.cc +++ b/src/wx/image_sequence_dialog.cc @@ -22,7 +22,7 @@ #include "lib/raw_convert.h" ImageSequenceDialog::ImageSequenceDialog (wxWindow* parent) - : TableDialog (parent, _("Add image sequence"), 2, true) + : TableDialog (parent, _("Add image sequence"), 2, 1, true) { add (_("Frame rate"), true); _frame_rate = add (new wxTextCtrl (this, wxID_ANY, N_("24"))); diff --git a/src/wx/isdcf_metadata_dialog.cc b/src/wx/isdcf_metadata_dialog.cc index a25a2b8df..aac452355 100644 --- a/src/wx/isdcf_metadata_dialog.cc +++ b/src/wx/isdcf_metadata_dialog.cc @@ -28,7 +28,7 @@ using boost::shared_ptr; /** @param threed true if the film is in 3D */ ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm, bool threed) - : TableDialog (parent, _("ISDCF name"), 2, true) + : TableDialog (parent, _("ISDCF name"), 2, 1, true) { add (_("Content version"), true); _content_version = add (new wxSpinCtrl (this, wxID_ANY)); diff --git a/src/wx/key_dialog.cc b/src/wx/key_dialog.cc index d8005a600..2062a2341 100644 --- a/src/wx/key_dialog.cc +++ b/src/wx/key_dialog.cc @@ -24,7 +24,7 @@ using std::cout; KeyDialog::KeyDialog (wxWindow* parent, dcp::Key key) - : TableDialog (parent, _("Key"), 3, true) + : TableDialog (parent, _("Key"), 3, 1, true) { add (_("Key"), true); diff --git a/src/wx/make_chain_dialog.cc b/src/wx/make_chain_dialog.cc index be9908ab9..17af48554 100644 --- a/src/wx/make_chain_dialog.cc +++ b/src/wx/make_chain_dialog.cc @@ -30,7 +30,7 @@ MakeChainDialog::MakeChainDialog ( string intermediate_common_name, string leaf_common_name ) - : TableDialog (parent, _("Make certificate chain"), 2, true) + : TableDialog (parent, _("Make certificate chain"), 2, 1, true) { wxTextValidator validator (wxFILTER_EXCLUDE_CHAR_LIST); validator.SetCharExcludes (wxT ("/")); diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc index eae14df74..99cd735f4 100644 --- a/src/wx/new_film_dialog.cc +++ b/src/wx/new_film_dialog.cc @@ -32,7 +32,7 @@ using namespace boost; boost::optional<boost::filesystem::path> NewFilmDialog::_directory; NewFilmDialog::NewFilmDialog (wxWindow* parent) - : TableDialog (parent, _("New Film"), 2, true) + : TableDialog (parent, _("New Film"), 2, 1, true) { add (_("Film name"), true); _name = add (new wxTextCtrl (this, wxID_ANY)); diff --git a/src/wx/repeat_dialog.cc b/src/wx/repeat_dialog.cc index 574dcd1c0..aeaf0420e 100644 --- a/src/wx/repeat_dialog.cc +++ b/src/wx/repeat_dialog.cc @@ -21,7 +21,7 @@ #include "wx_util.h" RepeatDialog::RepeatDialog (wxWindow* parent) - : TableDialog (parent, _("Repeat Content"), 3, true) + : TableDialog (parent, _("Repeat Content"), 3, 1, true) { add (_("Repeat"), true); _number = add (new wxSpinCtrl (this, wxID_ANY)); diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc index da813e32a..e312af920 100644 --- a/src/wx/screen_dialog.cc +++ b/src/wx/screen_dialog.cc @@ -33,7 +33,7 @@ using std::cout; using boost::optional; ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optional<dcp::Certificate> certificate) - : TableDialog (parent, std_to_wx (title), 2, true) + : TableDialog (parent, std_to_wx (title), 2, 1, true) , _certificate (certificate) { add (_("Name"), true); diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc index 37f68da29..8b32ad3b9 100644 --- a/src/wx/server_dialog.cc +++ b/src/wx/server_dialog.cc @@ -25,7 +25,7 @@ using std::string; using boost::shared_ptr; ServerDialog::ServerDialog (wxWindow* parent) - : TableDialog (parent, _("Server"), 2, true) + : TableDialog (parent, _("Server"), 2, 1, true) { wxClientDC dc (parent); /* XXX: bit of a mystery why we need such a long string here */ @@ -52,4 +52,3 @@ ServerDialog::get () const { return wx_to_std (_host->GetValue ()); } - |
