X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2706d2fedee4cfc34ba0c838bd157bc0d9718ce1..d1d276f23104cc30afaceb6beddcba738d5ad2d2:/src/generic/progdlgg.cpp?ds=sidebyside diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp index e6cfc0231c..b8c4bc3169 100644 --- a/src/generic/progdlgg.cpp +++ b/src/generic/progdlgg.cpp @@ -35,7 +35,7 @@ #include "wx/frame.h" #include "wx/button.h" #include "wx/stattext.h" - #include "wx/layout.h" + #include "wx/sizer.h" #include "wx/event.h" #include "wx/gauge.h" #include "wx/intl.h" @@ -50,8 +50,7 @@ // constants // ---------------------------------------------------------------------------- -#define LAYOUT_X_MARGIN 8 -#define LAYOUT_Y_MARGIN 8 +#define LAYOUT_MARGIN 8 // ---------------------------------------------------------------------------- // private functions @@ -85,7 +84,8 @@ wxProgressDialog::wxProgressDialog(wxString const &title, int maximum, wxWindow *parent, int style) - : wxDialog(parent, wxID_ANY, title) + : wxDialog(parent, wxID_ANY, title), + m_delay(3) { // we may disappear at any moment, let the others know about it SetExtraStyle(GetExtraStyle() | wxWS_EX_TRANSIENT); @@ -117,26 +117,19 @@ wxProgressDialog::wxProgressDialog(wxString const &title, m_parentTop = wxGetTopLevelParent(parent); - wxLayoutConstraints *c; - wxClientDC dc(this); dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); long widthText; dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL); + wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); + m_msg = new wxStaticText(this, wxID_ANY, message); - c = new wxLayoutConstraints; - c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN); - c->top.SameAs(this, wxTop, 2*LAYOUT_Y_MARGIN); - c->width.AsIs(); - c->height.AsIs(); - m_msg->SetConstraints(c); + sizer->Add(m_msg, 0, wxLEFT | wxTOP, 2*LAYOUT_MARGIN); wxSize sizeDlg, sizeLabel = m_msg->GetSize(); - sizeDlg.y = 2*LAYOUT_Y_MARGIN + sizeLabel.y; - - wxWindow *lastWindow = m_msg; + sizeDlg.y = 2*LAYOUT_MARGIN + sizeLabel.y; if ( maximum > 0 ) { @@ -147,23 +140,19 @@ wxProgressDialog::wxProgressDialog(wxString const &title, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL); - c = new wxLayoutConstraints; - c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN); - c->top.Below(m_msg, 2*LAYOUT_Y_MARGIN); - c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN); - c->height.AsIs(); - m_gauge->SetConstraints(c); + sizer->Add(m_gauge, 0, wxLEFT | wxRIGHT | wxTOP | wxEXPAND, 2*LAYOUT_MARGIN); m_gauge->SetValue(0); - lastWindow = m_gauge; wxSize sizeGauge = m_gauge->GetSize(); - sizeDlg.y += 2*LAYOUT_Y_MARGIN + sizeGauge.y; + sizeDlg.y += 2*LAYOUT_MARGIN + sizeGauge.y; } else m_gauge = (wxGauge *)NULL; // create the estimated/remaining/total time zones if requested m_elapsed = m_estimated = m_remaining = (wxStaticText*)NULL; + m_display_estimated = m_last_timeupdate = m_break = 0; + m_ctdelay = 0; // if we are going to have at least one label, remmeber it in this var wxStaticText *label = NULL; @@ -176,7 +165,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title, nTimeLabels++; label = - m_elapsed = CreateLabel(_("Elapsed time : "), &lastWindow); + m_elapsed = CreateLabel(_("Elapsed time : "), sizer); } if ( style & wxPD_ESTIMATED_TIME ) @@ -184,7 +173,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title, nTimeLabels++; label = - m_estimated = CreateLabel(_("Estimated time : "), &lastWindow); + m_estimated = CreateLabel(_("Estimated time : "), sizer); } if ( style & wxPD_REMAINING_TIME ) @@ -192,45 +181,36 @@ wxProgressDialog::wxProgressDialog(wxString const &title, nTimeLabels++; label = - m_remaining = CreateLabel(_("Remaining time : "), &lastWindow); + m_remaining = CreateLabel(_("Remaining time : "), sizer); } if ( nTimeLabels > 0 ) { // set it to the current time m_timeStart = wxGetCurrentTime(); - sizeDlg.y += nTimeLabels * (label->GetSize().y + LAYOUT_Y_MARGIN); + sizeDlg.y += nTimeLabels * (label->GetSize().y + LAYOUT_MARGIN); } if ( hasAbortButton ) { - m_btnAbort = new wxButton(this, wxID_CANCEL, _("Cancel")); - c = new wxLayoutConstraints; + m_btnAbort = new wxButton(this, wxID_CANCEL); // Windows dialogs usually have buttons in the lower right corner #if defined(__WXMSW__) || defined(__WXPM__) - c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN); + sizer->Add(m_btnAbort, 0, wxALIGN_RIGHT | wxALL, 2*LAYOUT_MARGIN); #else // !MSW - c->centreX.SameAs(this, wxCentreX); + sizer->Add(m_btnAbort, 0, wxALIGN_CENTER_HORIZONTAL | wxBOTTOM | wxTOP, 2*LAYOUT_MARGIN); #endif // MSW/!MSW - c->bottom.SameAs(this, wxBottom, 2*LAYOUT_Y_MARGIN); - - c->width.AsIs(); - c->height.AsIs(); - - m_btnAbort->SetConstraints(c); - - sizeDlg.y += 2*LAYOUT_Y_MARGIN + wxButton::GetDefaultSize().y; + sizeDlg.y += 2*LAYOUT_MARGIN + wxButton::GetDefaultSize().y; } else // no "Cancel" button { m_btnAbort = (wxButton *)NULL; } - SetAutoLayout(true); - Layout(); + SetSizerAndFit(sizer); - sizeDlg.y += 2*LAYOUT_Y_MARGIN; + sizeDlg.y += 2*LAYOUT_MARGIN; // try to make the dialog not square but rectangular of reasonabel width sizeDlg.x = (wxCoord)wxMax(widthText, 4*sizeDlg.y/3); @@ -266,34 +246,24 @@ wxProgressDialog::wxProgressDialog(wxString const &title, } wxStaticText *wxProgressDialog::CreateLabel(const wxString& text, - wxWindow **lastWindow) + wxSizer *sizer) { - wxLayoutConstraints *c; + wxBoxSizer *locsizer = new wxBoxSizer(wxHORIZONTAL); + wxStaticText *dummy = new wxStaticText(this, -1, text); wxStaticText *label = new wxStaticText(this, wxID_ANY, _("unknown")); - c = new wxLayoutConstraints; // VZ: I like the labels be centered - if the others don't mind, you may // remove "#ifdef __WXMSW__" and use it for all ports #if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMAC__) - c->left.SameAs(this, wxCentreX, LAYOUT_X_MARGIN); + locsizer->Add(dummy, 1, wxALIGN_RIGHT); + locsizer->Add(label, 1, wxALIGN_LEFT | wxLEFT, LAYOUT_MARGIN); + sizer->Add(locsizer, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, LAYOUT_MARGIN); #else // !MSW - c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN); + sizer->Add(locsizer, 0, wxALIGN_RIGHT | wxRIGHT | wxTOP, LAYOUT_MARGIN); + locsizer->Add(dummy); + locsizer->Add(label, 0, wxLEFT, LAYOUT_MARGIN); #endif // MSW/!MSW - c->top.Below(*lastWindow, LAYOUT_Y_MARGIN); - c->width.AsIs(); - c->height.AsIs(); - label->SetConstraints(c); - - wxStaticText *dummy = new wxStaticText(this, wxID_ANY, text); - c = new wxLayoutConstraints; - c->right.LeftOf(label); - c->top.SameAs(label, wxTop, 0); - c->width.AsIs(); - c->height.AsIs(); - dummy->SetConstraints(c); - - *lastWindow = label; return label; } @@ -330,16 +300,63 @@ wxProgressDialog::Update(int value, const wxString& newmsg) if ( (m_elapsed || m_remaining || m_estimated) && (value != 0) ) { unsigned long elapsed = wxGetCurrentTime() - m_timeStart; - unsigned long estimated = (unsigned long)(( (double) elapsed * m_maximum ) / ((double)value)) ; - unsigned long remaining = estimated - elapsed; + if ( m_last_timeupdate < elapsed + || value == m_maximum + ) + { + m_last_timeupdate = elapsed; + unsigned long estimated = m_break + + (unsigned long)(( (double) (elapsed-m_break) * m_maximum ) / ((double)value)) ; + if ( estimated > m_display_estimated + && m_ctdelay >= 0 + ) + { + ++m_ctdelay; + } + else if ( estimated < m_display_estimated + && m_ctdelay <= 0 + ) + { + --m_ctdelay; + } + else + { + m_ctdelay = 0; + } + if ( m_ctdelay >= m_delay // enough confirmations for a higher value + || m_ctdelay <= (m_delay*-1) // enough confirmations for a lower value + || value == m_maximum // to stay consistent + || elapsed > m_display_estimated // to stay consistent + || ( elapsed > 0 && elapsed < 4 ) // additional updates in the beginning + ) + { + m_display_estimated = estimated; + m_ctdelay = 0; + } + } + + unsigned long display_remaining = m_display_estimated - elapsed; + if ( display_remaining < 0 ) + { + display_remaining = 0; + } SetTimeLabel(elapsed, m_elapsed); - SetTimeLabel(estimated, m_estimated); - SetTimeLabel(remaining, m_remaining); + SetTimeLabel(m_display_estimated, m_estimated); + SetTimeLabel(display_remaining, m_remaining); } if ( value == m_maximum ) { + if ( m_state == Finished ) + { + // ignore multiple calls to Update(m_maximum): it may sometimes be + // troublesome to ensure that Update() is not called twice with the + // same value (e.g. because of the rounding errors) and if we don't + // return now we're going to generate asserts below + return true; + } + // so that we return true below and that out [Cancel] handler knew what // to do m_state = Finished; @@ -393,6 +410,8 @@ wxProgressDialog::Update(int value, const wxString& newmsg) void wxProgressDialog::Resume() { m_state = Continue; + m_ctdelay = m_delay; // force an update of the elapsed/estimated/remaining time + m_break += wxGetCurrentTime()-m_timeStop; // it may have been disabled by OnCancel(), so enable it back to let the // user interrupt us again if needed @@ -431,6 +450,9 @@ void wxProgressDialog::OnCancel(wxCommandEvent& event) // update the button state immediately so that the user knows that the // request has been noticed m_btnAbort->Disable(); + + // save the time when the dialog was stopped + m_timeStop = wxGetCurrentTime(); } } @@ -450,6 +472,8 @@ void wxProgressDialog::OnClose(wxCloseEvent& event) { // next Update() will notice it m_state = Canceled; + m_btnAbort->Disable(); + m_timeStop = wxGetCurrentTime(); } }