X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/453535a739f649ce43a65fd7e6b9730363bb1b7c..cd15bcaf50ead53ccf9d50965312f0dc754affb4:/samples/widgets/gauge.cpp diff --git a/samples/widgets/gauge.cpp b/samples/widgets/gauge.cpp index 7093f874c4..6b16d3757a 100644 --- a/samples/widgets/gauge.cpp +++ b/samples/widgets/gauge.cpp @@ -6,7 +6,7 @@ // Created: 27.03.01 // Id: $Id$ // Copyright: (c) 2001 Vadim Zeitlin -// License: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -54,6 +54,7 @@ enum { GaugePage_Reset = wxID_HIGHEST, GaugePage_Progress, + GaugePage_IndeterminateProgress, GaugePage_Clear, GaugePage_SetValue, GaugePage_SetRange, @@ -61,6 +62,7 @@ enum GaugePage_ValueText, GaugePage_RangeText, GaugePage_Timer, + GaugePage_IndeterminateTimer, GaugePage_Gauge }; @@ -84,6 +86,7 @@ protected: // event handlers void OnButtonReset(wxCommandEvent& event); void OnButtonProgress(wxCommandEvent& event); + void OnButtonIndeterminateProgress(wxCommandEvent& event); void OnButtonClear(wxCommandEvent& event); void OnButtonSetValue(wxCommandEvent& event); void OnButtonSetRange(wxCommandEvent& event); @@ -97,6 +100,7 @@ protected: void OnUpdateUICurValueText(wxUpdateUIEvent& event); void OnProgressTimer(wxTimerEvent& event); + void OnIndeterminateProgressTimer(wxTimerEvent& event); // reset the gauge parameters void Reset(); @@ -104,8 +108,11 @@ protected: // (re)create the gauge void CreateGauge(); + // start progress timer + void StartTimer(wxButton*); + // stop the progress timer - void StopTimer(); + void StopTimer(wxButton*); // the gauge range unsigned long m_range; @@ -140,6 +147,7 @@ private: BEGIN_EVENT_TABLE(GaugeWidgetsPage, WidgetsPage) EVT_BUTTON(GaugePage_Reset, GaugeWidgetsPage::OnButtonReset) EVT_BUTTON(GaugePage_Progress, GaugeWidgetsPage::OnButtonProgress) + EVT_BUTTON(GaugePage_IndeterminateProgress, GaugeWidgetsPage::OnButtonIndeterminateProgress) EVT_BUTTON(GaugePage_Clear, GaugeWidgetsPage::OnButtonClear) EVT_BUTTON(GaugePage_SetValue, GaugeWidgetsPage::OnButtonSetValue) EVT_BUTTON(GaugePage_SetRange, GaugeWidgetsPage::OnButtonSetRange) @@ -154,6 +162,7 @@ BEGIN_EVENT_TABLE(GaugeWidgetsPage, WidgetsPage) EVT_RADIOBOX(wxID_ANY, GaugeWidgetsPage::OnCheckOrRadioBox) EVT_TIMER(GaugePage_Timer, GaugeWidgetsPage::OnProgressTimer) + EVT_TIMER(GaugePage_IndeterminateTimer, GaugeWidgetsPage::OnIndeterminateProgressTimer) END_EVENT_TABLE() // ============================================================================ @@ -166,7 +175,7 @@ END_EVENT_TABLE() #define FAMILY_CTRLS NATIVE_CTRLS #endif -IMPLEMENT_WIDGETS_PAGE(GaugeWidgetsPage, _T("Gauge"), FAMILY_CTRLS ); +IMPLEMENT_WIDGETS_PAGE(GaugeWidgetsPage, wxT("Gauge"), FAMILY_CTRLS ); GaugeWidgetsPage::GaugeWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist) @@ -189,25 +198,24 @@ void GaugeWidgetsPage::CreateContent() wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL); // left pane - wxStaticBox *box = new wxStaticBox(this, wxID_ANY, _T("&Set style")); + wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxT("&Set style")); wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL); - m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Vertical")); - m_chkSmooth = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Smooth")); + m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Vertical")); + m_chkSmooth = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Smooth")); sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer - wxButton *btn = new wxButton(this, GaugePage_Reset, _T("&Reset")); + wxButton *btn = new wxButton(this, GaugePage_Reset, wxT("&Reset")); sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15); // middle pane - wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, - _T("&Change gauge value")); + wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, wxT("&Change gauge value")); wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL); wxTextCtrl *text; - wxSizer *sizerRow = CreateSizerWithTextAndLabel(_T("Current value"), + wxSizer *sizerRow = CreateSizerWithTextAndLabel(wxT("Current value"), GaugePage_CurValueText, &text); text->SetEditable(false); @@ -215,22 +223,26 @@ void GaugeWidgetsPage::CreateContent() sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); sizerRow = CreateSizerWithTextAndButton(GaugePage_SetValue, - _T("Set &value"), + wxT("Set &value"), GaugePage_ValueText, &m_textValue); sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); sizerRow = CreateSizerWithTextAndButton(GaugePage_SetRange, - _T("Set &range"), + wxT("Set &range"), GaugePage_RangeText, &m_textRange); - m_textRange->SetValue( wxString::Format(_T("%lu"), m_range) ); + m_textRange->SetValue( wxString::Format(wxT("%lu"), m_range) ); sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); - btn = new wxButton(this, GaugePage_Progress, _T("Simulate &progress")); + btn = new wxButton(this, GaugePage_Progress, wxT("Simulate &progress")); + sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5); + + btn = new wxButton(this, GaugePage_IndeterminateProgress, + wxT("Simulate &indeterminate job")); sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5); - btn = new wxButton(this, GaugePage_Clear, _T("&Clear")); + btn = new wxButton(this, GaugePage_Clear, wxT("&Clear")); sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5); // right pane @@ -249,8 +261,6 @@ void GaugeWidgetsPage::CreateContent() Reset(); SetSizer(sizerTop); - - sizerTop->Fit(this); } GaugeWidgetsPage::~GaugeWidgetsPage() @@ -302,6 +312,45 @@ void GaugeWidgetsPage::CreateGauge() m_sizerGauge->Layout(); } +void GaugeWidgetsPage::StartTimer(wxButton *clicked) +{ + static const int INTERVAL = 300; + + wxLogMessage(wxT("Launched progress timer (interval = %d ms)"), INTERVAL); + + m_timer = new wxTimer(this, + clicked->GetId() == GaugePage_Progress ? GaugePage_Timer : GaugePage_IndeterminateTimer); + m_timer->Start(INTERVAL); + + clicked->SetLabel(wxT("&Stop timer")); + + if (clicked->GetId() == GaugePage_Progress) + FindWindow(GaugePage_IndeterminateProgress)->Disable(); + else + FindWindow(GaugePage_Progress)->Disable(); +} + +void GaugeWidgetsPage::StopTimer(wxButton *clicked) +{ + wxCHECK_RET( m_timer, wxT("shouldn't be called") ); + + m_timer->Stop(); + wxDELETE(m_timer); + + if (clicked->GetId() == GaugePage_Progress) + { + clicked->SetLabel(wxT("Simulate &progress")); + FindWindow(GaugePage_IndeterminateProgress)->Enable(); + } + else + { + clicked->SetLabel(wxT("Simulate indeterminate job")); + FindWindow(GaugePage_Progress)->Enable(); + } + + wxLogMessage(wxT("Progress finished.")); +} + // ---------------------------------------------------------------------------- // event handlers // ---------------------------------------------------------------------------- @@ -315,23 +364,33 @@ void GaugeWidgetsPage::OnButtonReset(wxCommandEvent& WXUNUSED(event)) void GaugeWidgetsPage::OnButtonProgress(wxCommandEvent& event) { + wxButton *b = (wxButton *)event.GetEventObject(); if ( !m_timer ) { - static const int INTERVAL = 300; - - wxLogMessage(_T("Launched progress timer (interval = %d ms)"), INTERVAL); + StartTimer(b); + } + else // stop the running timer + { + StopTimer(b); - m_timer = new wxTimer(this, GaugePage_Timer); - m_timer->Start(INTERVAL); + wxLogMessage(wxT("Stopped the timer.")); + } +} - wxButton *btn = (wxButton *)event.GetEventObject(); - btn->SetLabel(_T("&Stop timer")); +void GaugeWidgetsPage::OnButtonIndeterminateProgress(wxCommandEvent& event) +{ + wxButton *b = (wxButton *)event.GetEventObject(); + if ( !m_timer ) + { + StartTimer(b); } else // stop the running timer { - StopTimer(); + StopTimer(b); - wxLogMessage(_T("Stopped the timer.")); + m_gauge->SetValue(0); + + wxLogMessage(wxT("Stopped the timer.")); } } @@ -390,29 +449,21 @@ void GaugeWidgetsPage::OnProgressTimer(wxTimerEvent& WXUNUSED(event)) } else // reached the end { - StopTimer(); + wxButton *btn = (wxButton *)FindWindow(GaugePage_Progress); + wxCHECK_RET( btn, wxT("no progress button?") ); + + StopTimer(btn); } } -void GaugeWidgetsPage::OnUpdateUICurValueText(wxUpdateUIEvent& event) +void GaugeWidgetsPage::OnIndeterminateProgressTimer(wxTimerEvent& WXUNUSED(event)) { - event.SetText( wxString::Format(_T("%d"), m_gauge->GetValue())); + m_gauge->Pulse(); } -void GaugeWidgetsPage::StopTimer() +void GaugeWidgetsPage::OnUpdateUICurValueText(wxUpdateUIEvent& event) { - wxCHECK_RET( m_timer, _T("shouldn't be called") ); - - m_timer->Stop(); - delete m_timer; - m_timer = NULL; - - wxButton *btn = (wxButton *)FindWindow(GaugePage_Progress); - wxCHECK_RET( btn, _T("no progress button?") ); - - btn->SetLabel(_T("Simulate &progress")); - - wxLogMessage(_T("Progress finished.")); + event.SetText( wxString::Format(wxT("%d"), m_gauge->GetValue())); } #endif