From 2918fd61b33f54269e2143f659d320ff555c4e8a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 19 Jul 2013 01:01:18 +0100 Subject: Provide explicit update button in timecode controls to calm things down a bit. --- src/wx/timecode.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/wx/timecode.h') diff --git a/src/wx/timecode.h b/src/wx/timecode.h index 9b6fe6654..465239fe5 100644 --- a/src/wx/timecode.h +++ b/src/wx/timecode.h @@ -33,11 +33,12 @@ public: private: void changed (wxCommandEvent &); + void update_clicked (wxCommandEvent &); wxTextCtrl* _hours; wxTextCtrl* _minutes; wxTextCtrl* _seconds; wxTextCtrl* _frames; - - bool _in_set; + wxButton* _update_button; }; + -- cgit v1.2.3 From ba17803f7e33be2bea1363b5a7115e4713dd5997 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 19 Jul 2013 01:17:28 +0100 Subject: Update -> set in timecode control. --- src/wx/timecode.cc | 14 +++++++------- src/wx/timecode.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/wx/timecode.h') diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc index 3e61f02bc..82c27c5b5 100644 --- a/src/wx/timecode.cc +++ b/src/wx/timecode.cc @@ -59,16 +59,16 @@ Timecode::Timecode (wxWindow* parent) _frames = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator); _frames->SetMaxLength (2); sizer->Add (_frames); - _update_button = new wxButton (this, wxID_ANY, _("Update")); - sizer->Add (_update_button, 0, wxLEFT | wxRIGHT, 8); + _set_button = new wxButton (this, wxID_ANY, _("Set")); + sizer->Add (_set_button, 0, wxLEFT | wxRIGHT, 8); _hours->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (Timecode::changed), 0, this); _minutes->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (Timecode::changed), 0, this); _seconds->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (Timecode::changed), 0, this); _frames->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (Timecode::changed), 0, this); - _update_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (Timecode::update_clicked), 0, this); + _set_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (Timecode::set_clicked), 0, this); - _update_button->Enable (false); + _set_button->Enable (false); SetSizerAndFit (sizer); } @@ -109,12 +109,12 @@ Timecode::get (int fps) const void Timecode::changed (wxCommandEvent &) { - _update_button->Enable (true); + _set_button->Enable (true); } void -Timecode::update_clicked (wxCommandEvent &) +Timecode::set_clicked (wxCommandEvent &) { Changed (); - _update_button->Enable (false); + _set_button->Enable (false); } diff --git a/src/wx/timecode.h b/src/wx/timecode.h index 465239fe5..ca6deb969 100644 --- a/src/wx/timecode.h +++ b/src/wx/timecode.h @@ -33,12 +33,12 @@ public: private: void changed (wxCommandEvent &); - void update_clicked (wxCommandEvent &); + void set_clicked (wxCommandEvent &); wxTextCtrl* _hours; wxTextCtrl* _minutes; wxTextCtrl* _seconds; wxTextCtrl* _frames; - wxButton* _update_button; + wxButton* _set_button; }; -- cgit v1.2.3