// wxProgressDialog creation
// ----------------------------------------------------------------------------
-wxProgressDialog::wxProgressDialog(wxString const &title,
- wxString const &message,
+wxProgressDialog::wxProgressDialog(const wxString& title,
+ const wxString& message,
int maximum,
wxWindow *parent,
int style)
m_hasAbortButton = (style & wxPD_CAN_ABORT) != 0;
m_hasSkipButton = (style & wxPD_CAN_SKIP) != 0;
- bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
-
#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
// we have to remove the "Close" button from the title bar then as it is
// confusing to have it - it doesn't work anyhow
wxCoord widthText = 0;
dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL);
- wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+ // top-level sizerTop
+ wxSizer * const sizerTop = new wxBoxSizer(wxVERTICAL);
m_msg = new wxStaticText(this, wxID_ANY, message);
- sizer->Add(m_msg, 0, wxLEFT | wxTOP, 2*LAYOUT_MARGIN);
-
- wxSize sizeDlg,
- sizeLabel = m_msg->GetSize();
- sizeDlg.y = 2*LAYOUT_MARGIN + sizeLabel.y;
+ sizerTop->Add(m_msg, 0, wxLEFT | wxTOP, 2*LAYOUT_MARGIN);
+ wxSize sizeLabel = m_msg->GetSize();
if ( maximum > 0 )
{
int gauge_style = wxGA_HORIZONTAL;
- if ( ( style & wxPD_SMOOTH ) == wxPD_SMOOTH )
+ if ( style & wxPD_SMOOTH )
gauge_style |= wxGA_SMOOTH;
- m_gauge = new wxGauge(this, wxID_ANY, m_maximum,
- wxDefaultPosition, wxDefaultSize,
- gauge_style );
-
- sizer->Add(m_gauge, 0, wxLEFT | wxRIGHT | wxTOP | wxEXPAND, 2*LAYOUT_MARGIN);
+ m_gauge = new wxGauge
+ (
+ this,
+ wxID_ANY,
+ m_maximum,
+ wxDefaultPosition,
+ // make the progress bar sufficiently long
+ wxSize(wxMin(wxGetClientDisplayRect().width/3, 300), -1),
+ gauge_style
+ );
+
+ sizerTop->Add(m_gauge, 0, wxLEFT | wxRIGHT | wxTOP | wxEXPAND, 2*LAYOUT_MARGIN);
m_gauge->SetValue(0);
-
- wxSize sizeGauge = m_gauge->GetSize();
- sizeDlg.y += 2*LAYOUT_MARGIN + sizeGauge.y;
}
else
- m_gauge = (wxGauge *)NULL;
+ {
+ m_gauge = 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_elapsed =
+ m_estimated =
+ m_remaining = NULL;
+ m_display_estimated =
+ m_last_timeupdate =
+ m_break = 0;
m_ctdelay = 0;
- // if we are going to have at least one label, remember it in this var
- wxStaticText *label = NULL;
-
// also count how many labels we really have
size_t nTimeLabels = 0;
+ wxSizer * const sizerLabels = new wxFlexGridSizer(2);
+
if ( style & wxPD_ELAPSED_TIME )
{
nTimeLabels++;
- label =
- m_elapsed = CreateLabel(_("Elapsed time : "), sizer);
+ m_elapsed = CreateLabel(_("Elapsed time:"), sizerLabels);
}
if ( style & wxPD_ESTIMATED_TIME )
{
nTimeLabels++;
- label =
- m_estimated = CreateLabel(_("Estimated time : "), sizer);
+ m_estimated = CreateLabel(_("Estimated time:"), sizerLabels);
}
if ( style & wxPD_REMAINING_TIME )
{
nTimeLabels++;
- label =
- m_remaining = CreateLabel(_("Remaining time : "), sizer);
+ m_remaining = CreateLabel(_("Remaining time:"), sizerLabels);
}
+ sizerTop->Add(sizerLabels, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, LAYOUT_MARGIN);
if ( nTimeLabels > 0 )
{
// set it to the current time
m_timeStart = wxGetCurrentTime();
- sizeDlg.y += nTimeLabels * (label->GetSize().y + LAYOUT_MARGIN);
}
#if defined(__SMARTPHONE__)
if ( m_hasAbortButton )
SetLeftMenu(wxID_CANCEL);
#else
- m_btnAbort = m_btnSkip = (wxButton *)NULL;
- bool sizeDlgModified = false;
+ m_btnAbort =
+ m_btnSkip = NULL;
+
wxBoxSizer *buttonSizer = new wxBoxSizer(wxHORIZONTAL);
+ // Windows dialogs usually have buttons in the lower right corner
const int sizerFlags =
#if defined(__WXMSW__) || defined(__WXPM__)
wxALIGN_RIGHT | wxALL
if ( m_hasSkipButton )
{
- m_btnSkip = new wxButton(this, wxID_SKIP, _("Skip"));
+ m_btnSkip = new wxButton(this, wxID_SKIP, _("&Skip"));
- // Windows dialogs usually have buttons in the lower right corner
buttonSizer->Add(m_btnSkip, 0, sizerFlags, LAYOUT_MARGIN);
- sizeDlg.y += 2*LAYOUT_MARGIN + wxButton::GetDefaultSize().y;
- sizeDlgModified = true;
}
if ( m_hasAbortButton )
{
m_btnAbort = new wxButton(this, wxID_CANCEL);
- // Windows dialogs usually have buttons in the lower right corner
buttonSizer->Add(m_btnAbort, 0, sizerFlags, LAYOUT_MARGIN);
- if(!sizeDlgModified)
- sizeDlg.y += 2*LAYOUT_MARGIN + wxButton::GetDefaultSize().y;
}
- sizer->Add(buttonSizer, 0, sizerFlags, LAYOUT_MARGIN );
+ sizerTop->Add(buttonSizer, 0, sizerFlags, LAYOUT_MARGIN );
#endif // __SMARTPHONE__/!__SMARTPHONE__
- SetSizerAndFit(sizer);
-
- if (!isPda)
- {
- sizeDlg.y += 2*LAYOUT_MARGIN;
-
- // try to make the dialog not square but rectangular of reasonable width
- sizeDlg.x = (wxCoord)wxMax(3*widthText/2, 4*sizeDlg.y/3);
- SetClientSize(sizeDlg);
- }
+ SetSizerAndFit(sizerTop);
Centre(wxCENTER_FRAME | wxBOTH);
Update();
}
-wxStaticText *wxProgressDialog::CreateLabel(const wxString& text,
- wxSizer *sizer)
+wxStaticText *
+wxProgressDialog::CreateLabel(const wxString& text, wxSizer *sizer)
{
- wxBoxSizer *locsizer = new wxBoxSizer(wxLARGESMALL(wxHORIZONTAL,wxVERTICAL));
-
- wxStaticText *dummy = new wxStaticText(this, wxID_ANY, text);
- wxStaticText *label = new wxStaticText(this, wxID_ANY, _("unknown"));
+ wxStaticText *label = new wxStaticText(this, wxID_ANY, text);
+ wxStaticText *value = new wxStaticText(this, wxID_ANY, _("unknown"));
// select placement most native or nice on target GUI
#if defined(__SMARTPHONE__)
- // label and time to the left in two rows
- locsizer->Add(dummy, 1, wxALIGN_LEFT);
- locsizer->Add(label, 1, wxALIGN_LEFT);
- sizer->Add(locsizer, 0, wxALIGN_LEFT | wxTOP | wxLEFT, LAYOUT_MARGIN);
+ // value and time to the left in two rows
+ sizer->Add(label, 1, wxALIGN_LEFT);
+ sizer->Add(value, 1, wxALIGN_LEFT);
#elif defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMAC__) || defined(__WXGTK20__)
- // label and time centered in one row
- locsizer->Add(dummy, 1, wxLARGESMALL(wxALIGN_RIGHT,wxALIGN_LEFT));
- locsizer->Add(label, 1, wxALIGN_LEFT | wxLEFT, LAYOUT_MARGIN);
- sizer->Add(locsizer, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, LAYOUT_MARGIN);
+ // value and time centered in one row
+ sizer->Add(label, 1, wxLARGESMALL(wxALIGN_RIGHT,wxALIGN_LEFT) | wxTOP | wxRIGHT, LAYOUT_MARGIN);
+ sizer->Add(value, 1, wxALIGN_LEFT | wxTOP, LAYOUT_MARGIN);
#else
- // label and time to the right in one row
- sizer->Add(locsizer, 0, wxALIGN_RIGHT | wxRIGHT | wxTOP, LAYOUT_MARGIN);
- locsizer->Add(dummy);
- locsizer->Add(label, 0, wxLEFT, LAYOUT_MARGIN);
+ // value and time to the right in one row
+ sizer->Add(label);
+ sizer->Add(value, 0, wxLEFT, LAYOUT_MARGIN);
#endif
- return label;
+ return value;
}
// ----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff