X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be9abe3fd0edec7215fa00aa158f7581da4df2fe..20a8b34e2c6d43140cb8b38482536a49ed7e0e7a:/src/generic/progdlgg.cpp

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index e12b7f5616..542ffad161 100644
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -6,7 +6,7 @@
 // Created:     09.05.1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Karsten Ballüder
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -17,20 +17,24 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/utils.h"
-#include "wx/frame.h"
-#include "wx/button.h"
-#include "wx/stattext.h"
-#include "wx/layout.h"
-#include "wx/event.h"
-#include "wx/gauge.h"
-#include "wx/intl.h"
+    #include "wx/utils.h"
+    #include "wx/frame.h"
+    #include "wx/button.h"
+    #include "wx/stattext.h"
+    #include "wx/layout.h"
+    #include "wx/event.h"
+    #include "wx/gauge.h"
+    #include "wx/intl.h"
+    #include "wx/settings.h"
+    #include "wx/dcclient.h"
 #endif
 
+#if wxUSE_PROGRESSDLG
+
 #include "wx/generic/progdlgg.h"
 
 #define LAYOUT_X_MARGIN 8
@@ -53,32 +57,42 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
                                  wxWindow *parent,
                                  int style)
 {
+   wxWindow *lastWindow = NULL;
    bool hasAbortButton = (style & wxPD_CAN_ABORT) != 0;
    m_state = hasAbortButton ? Continue : Uncancelable;
    m_disableParentOnly = (style & wxPD_APP_MODAL) == 0;
    m_parent = parent;
    m_maximum = maximum;
-   
-   int height = 70;     // FIXME arbitrary numbers
-   if ( hasAbortButton )
-      height += 35;
-   wxFrame::Create(m_parent, -1, title,
-                   wxPoint(0, 0), wxSize(220, height),
-                   wxDEFAULT_DIALOG_STYLE);
+
+   m_elapsed = m_estimated = m_remaining = NULL;
+   if ((style & (wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME)) != 0) m_time = new wxTime;
+   else m_time = NULL;
+
+   wxFrame::Create(m_parent, -1, title, wxDefaultPosition,
+                   wxDefaultSize, wxDEFAULT_DIALOG_STYLE);
+   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
 
    wxLayoutConstraints *c;
 
+   wxClientDC dc(this);
+   dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+   long widthText;
+   dc.GetTextExtent(message, &widthText, NULL);
+
    m_msg = new wxStaticText(this, -1, message);
    c = new wxLayoutConstraints;
-   c->left.SameAs(this, wxLeft, 10);
-   c->top.SameAs(this, wxTop, 10);
+   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);
+   lastWindow = m_msg;
 
    if ( maximum > 0 )
    {
-      m_gauge = new wxGauge(this, -1, maximum);
+      m_gauge = new wxGauge(this, -1, maximum,
+                            wxDefaultPosition, wxDefaultSize,
+                            wxGA_HORIZONTAL | wxRAISED_BORDER);
       c = new wxLayoutConstraints;
       c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN);
       c->top.Below(m_msg, 2*LAYOUT_Y_MARGIN);
@@ -86,27 +100,100 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
       c->height.AsIs();
       m_gauge->SetConstraints(c);
       m_gauge->SetValue(0);
+      lastWindow = m_gauge;
    }
    else
       m_gauge = (wxGauge *)NULL;
+
    
+   if ( style & wxPD_ELAPSED_TIME )
+   {
+      m_elapsed = new wxStaticText(this, -1, "");
+      c = new wxLayoutConstraints;
+      c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
+      c->top.Below(lastWindow, LAYOUT_Y_MARGIN);
+      c->width.Absolute(60);
+      c->height.AsIs();
+      m_elapsed->SetConstraints(c);
+
+      wxStaticText *dummy = new wxStaticText(this, -1, _T("Elapsed time : "));
+      c = new wxLayoutConstraints;
+      c->right.LeftOf(m_elapsed);
+      c->top.SameAs(m_elapsed, wxTop, 0);
+      c->width.AsIs();
+      c->height.AsIs();
+      dummy->SetConstraints(c);      
+
+      lastWindow = m_elapsed;
+   }
+
+   if ( style & wxPD_ESTIMATED_TIME )
+   {
+      m_estimated = new wxStaticText(this, -1, "");
+      c = new wxLayoutConstraints;
+      c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
+      c->top.Below(lastWindow, 0);
+      c->width.Absolute(60);
+      c->height.AsIs();
+      m_estimated->SetConstraints(c);
+
+      wxStaticText *dummy = new wxStaticText(this, -1, _T("Estimated time : "));
+      c = new wxLayoutConstraints;
+      c->right.LeftOf(m_estimated);
+      c->top.SameAs(m_estimated, wxTop, 0);
+      c->width.AsIs();
+      c->height.AsIs();
+      dummy->SetConstraints(c);      
+
+      lastWindow = m_estimated;
+   }
+
+   if ( style & wxPD_REMAINING_TIME )
+   {
+      m_remaining = new wxStaticText(this, -1, "");
+      c = new wxLayoutConstraints;
+      c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
+      c->top.Below(lastWindow, 0);
+      c->width.Absolute(60);
+      c->height.AsIs();
+      m_remaining->SetConstraints(c);
+
+      wxStaticText *dummy = new wxStaticText(this, -1, _T("Remaining time : "));
+      c = new wxLayoutConstraints;
+      c->right.LeftOf(m_remaining);
+      c->top.SameAs(m_remaining, wxTop, 0);
+      c->width.AsIs();
+      c->height.AsIs();
+      dummy->SetConstraints(c);      
+
+      lastWindow = m_remaining;
+   }
+
    if ( hasAbortButton )
    {
       m_btnAbort = new wxButton(this, -1, _("Cancel"));
       c = new wxLayoutConstraints;
       c->centreX.SameAs(this, wxCentreX);
-      if(m_gauge)
-         c->top.Below(m_gauge, 2*LAYOUT_Y_MARGIN);
-      else
-         c->top.Below(m_btnAbort, 2*LAYOUT_Y_MARGIN);
+      c->top.Below(lastWindow, 2*LAYOUT_Y_MARGIN);
       c->width.AsIs();
       c->height.AsIs();
       m_btnAbort->SetConstraints(c);
    }
    else
-      m_btnAbort = (wxButton *)NULL; 
+      m_btnAbort = (wxButton *)NULL;
 
    SetAutoLayout(TRUE);
+   Layout();
+
+   // calc the height of the dialog
+   Fit();
+   // and set the width from it - unfortunately, Fit() makes the dialog way too
+   // wide under Windows, so try to find a reasonable value for the width, not
+   // too big and not too small
+   wxSize size = GetClientSize();
+   size.x = wxMax(3*widthText/2, 2*size.y);
+   SetClientSize(size);
+
    Show(TRUE);
    Centre(wxCENTER_FRAME | wxBOTH);
 
@@ -114,6 +201,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
       m_parent->Enable(FALSE);
    else
       wxEnableTopLevelWindows(FALSE);
+
    Enable(TRUE); // enable this window
    wxYield();
 }
@@ -122,14 +210,41 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
 bool
 wxProgressDialog::Update(int value, const wxString& newmsg)
 {
-   wxASSERT_MSG( value == -1 || m_gauge, "can't update non existent dialog" );
-   wxASSERT_MSG( value < m_maximum, "invalid progress value" );
+   wxASSERT_MSG( value == -1 || m_gauge, _T("cannot update non existent dialog") );
+   wxASSERT_MSG( value <= m_maximum, _T("invalid progress value") );
+
 
    if( m_gauge )
       m_gauge->SetValue(value + 1);
+
    if( !newmsg.IsEmpty() )
       m_msg->SetLabel(newmsg);
-   wxYield();
+
+   if ( (m_elapsed || m_remaining || m_estimated) && (value != 0) )
+   {
+      wxTime timenow;
+      wxTime diff = timenow -  *m_time;
+      unsigned long secs = diff.GetSecond() + 60 * diff.GetMinute() + 60 * 60 * diff.GetHour();
+      unsigned long estim = secs * m_maximum / value; 
+      unsigned long remai = estim - secs; 
+      wxString s;
+
+      if (m_elapsed) 
+      {
+         s.Printf(_T("%i:%02i:%02i"), diff.GetHour(), diff.GetMinute(), diff.GetSecond());
+         if (s != m_elapsed->GetLabel()) m_elapsed->SetLabel(s);
+      }
+      if (m_estimated) 
+      {
+         s.Printf(_T("%i:%02i:%02i"), estim / (60 * 60), (estim / 60) % 60, estim % 60);
+         if (s != m_estimated->GetLabel()) m_estimated->SetLabel(s);
+      }
+      if (m_remaining) 
+      {
+         s.Printf(_T("%i:%02i:%02i"), remai / (60 * 60), (remai / 60) % 60, remai % 60);
+         if (s != m_remaining->GetLabel()) m_remaining->SetLabel(s);
+      }
+   }
 
    if ( (value == m_maximum - 1) && !(GetWindowStyleFlag() & wxPD_AUTO_HIDE) )
    {
@@ -139,20 +254,22 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
            m_btnAbort->SetLabel(_("Close"));
        }
 
-       if ( !newmsg )
+/*I think the default should be the other way round. If the
+  application wants to set a "Done." message at the end, it should
+  supply it. Any serious objections to this change? Makes the
+  application programmers' work a little easier.
+  if ( !newmsg )
        {
            // also provide the finishing message if the application didn't
            m_msg->SetLabel(_("Done."));
        }
-
+*/
        m_state = Finished;
-       while ( m_state != Canceled ) // set from OnClose()
-           wxYield();
 
        // so that we return TRUE below
        m_state = Finished;
    }
-
+   wxYield();
    return m_state != Canceled;
 }
 
@@ -171,4 +288,7 @@ wxProgressDialog::~wxProgressDialog()
       m_parent->Enable(TRUE);
    else
       wxEnableTopLevelWindows(TRUE);
+   if (m_time) delete m_time;
 }
+
+#endif