Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-02 17:09:26 +02:00
Code Issues Releases Wiki Activity

More NumericTextCtrl constructor options

Browse Source
This commit is contained in:
Paul Licameli 2018-01-30 18:44:44 -05:00
parent 5724780be9
commit 8625df6814
3 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/TimerRecordDialog.cpp
View File

@ -793,7 +793,7 @@ void TimerRecordDialog::PopulateOrExchange(ShuttleGui& S)
* displayed is minutes, and the 's' indicates that the third number displayed is seconds. * displayed is minutes, and the 's' indicates that the third number displayed is seconds.
*/ */
wxString strFormat = _("099 h 060 m 060 s"); wxString strFormat = _("099 h 060 m 060 s");
const auto options = NumericTextCtrl::Options{}.MenuEnabled(false); using Options = NumericTextCtrl::Options;
S.StartStatic(_("Start Date and Time"), true); S.StartStatic(_("Start Date and Time"), true);
{ {
m_pDatePickerCtrl_Start = m_pDatePickerCtrl_Start =
@ -810,11 +810,12 @@ void TimerRecordDialog::PopulateOrExchange(ShuttleGui& S)
m_pTimeTextCtrl_Start = safenew NumericTextCtrl( m_pTimeTextCtrl_Start = safenew NumericTextCtrl(
this, ID_TIMETEXT_START, NumericConverter::TIME, this, ID_TIMETEXT_START, NumericConverter::TIME,
wxEmptyString, 0, 44100, options); wxEmptyString, 0, 44100,
Options{}
.MenuEnabled(false)
.Format(strFormat)
.Value(true, wxDateTime_to_AudacityTime(m_DateTime_Start)));
m_pTimeTextCtrl_Start->SetName(_("Start Time")); m_pTimeTextCtrl_Start->SetName(_("Start Time"));
m_pTimeTextCtrl_Start->SetFormatString(strFormat);
m_pTimeTextCtrl_Start->
SetValue(wxDateTime_to_AudacityTime(m_DateTime_Start));
S.AddWindow(m_pTimeTextCtrl_Start); S.AddWindow(m_pTimeTextCtrl_Start);
} }
S.EndStatic(); S.EndStatic();
@ -838,10 +839,12 @@ void TimerRecordDialog::PopulateOrExchange(ShuttleGui& S)
m_pTimeTextCtrl_End = safenew NumericTextCtrl( m_pTimeTextCtrl_End = safenew NumericTextCtrl(
this, ID_TIMETEXT_END, NumericConverter::TIME, this, ID_TIMETEXT_END, NumericConverter::TIME,
wxEmptyString, 0, 44100, options); wxEmptyString, 0, 44100,
Options{}
.MenuEnabled(false)
.Format(strFormat)
.Value(true, wxDateTime_to_AudacityTime(m_DateTime_End)));
m_pTimeTextCtrl_End->SetName(_("End Time")); m_pTimeTextCtrl_End->SetName(_("End Time"));
m_pTimeTextCtrl_End->SetFormatString(strFormat);
m_pTimeTextCtrl_End->SetValue(wxDateTime_to_AudacityTime(m_DateTime_End));
S.AddWindow(m_pTimeTextCtrl_End); S.AddWindow(m_pTimeTextCtrl_End);
} }
S.EndStatic(); S.EndStatic();
@ -859,10 +862,12 @@ void TimerRecordDialog::PopulateOrExchange(ShuttleGui& S)
wxString strFormat1 = _("099 days 024 h 060 m 060 s"); wxString strFormat1 = _("099 days 024 h 060 m 060 s");
m_pTimeTextCtrl_Duration = safenew NumericTextCtrl( m_pTimeTextCtrl_Duration = safenew NumericTextCtrl(
this, ID_TIMETEXT_DURATION, NumericConverter::TIME, this, ID_TIMETEXT_DURATION, NumericConverter::TIME,
wxEmptyString, 0, 44100, options); wxEmptyString, 0, 44100,
Options{}
.MenuEnabled(false)
.Format(strFormat1)
.Value(true, m_TimeSpan_Duration.GetSeconds().ToDouble()));
m_pTimeTextCtrl_Duration->SetName(_("Duration")); m_pTimeTextCtrl_Duration->SetName(_("Duration"));
m_pTimeTextCtrl_Duration->SetFormatString(strFormat1);
m_pTimeTextCtrl_Duration->SetValue(m_TimeSpan_Duration.GetSeconds().ToDouble());
S.AddWindow(m_pTimeTextCtrl_Duration); S.AddWindow(m_pTimeTextCtrl_Duration);
} }
S.EndStatic(); S.EndStatic();

6
src/widgets/NumericTextCtrl.cpp
View File

@ -1284,6 +1284,12 @@ NumericTextCtrl::NumericTextCtrl(wxWindow *parent, wxWindowID id,
if (options.hasInvalidValue) if (options.hasInvalidValue)
SetInvalidValue( options.invalidValue ); SetInvalidValue( options.invalidValue );
if (!options.format.empty())
SetFormatString( options.format );
if (options.hasValue)
SetValue( options.value );
} }
NumericTextCtrl::~NumericTextCtrl() NumericTextCtrl::~NumericTextCtrl()

6
src/widgets/NumericTextCtrl.h
View File

@ -151,6 +151,9 @@ class NumericTextCtrl final : public wxControl, public NumericConverter
bool menuEnabled { true }; bool menuEnabled { true };
bool hasInvalidValue { false }; bool hasInvalidValue { false };
double invalidValue { -1.0 }; double invalidValue { -1.0 };
wxString format {};
bool hasValue { false };
double value{ -1.0 };
Options() {} Options() {}
@ -159,6 +162,9 @@ class NumericTextCtrl final : public wxControl, public NumericConverter
Options &MenuEnabled (bool value) { menuEnabled = value; return *this; } Options &MenuEnabled (bool value) { menuEnabled = value; return *this; }
Options &InvalidValue (bool has, double value = -1.0) Options &InvalidValue (bool has, double value = -1.0)
{ hasInvalidValue = has, invalidValue = value; return *this; } { hasInvalidValue = has, invalidValue = value; return *this; }
Options &Format (const wxString &value) { format = value; return *this; }
Options &Value (bool has, double v)
{ hasValue = has, value = v; return *this; }
}; };
NumericTextCtrl(wxWindow *parent, wxWindowID winid, NumericTextCtrl(wxWindow *parent, wxWindowID winid,