Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv25903
Modified Files:
Project.cpp SmartRecordDialog.cpp
Log Message:
Convert to use general progress dialog and adds the elapsed time to the dialog
Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -d -r1.275 -r1.276
--- Project.cpp 25 Aug 2006 05:12:16 -0000 1.275
+++ Project.cpp 7 Sep 2006 05:27:10 -0000 1.276
@@ -3181,6 +3181,7 @@
1000,
this,
wxPD_CAN_ABORT |
+ wxPD_ELAPSED_TIME |
wxPD_REMAINING_TIME |
wxPD_AUTO_HIDE);
}
Index: SmartRecordDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/SmartRecordDialog.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SmartRecordDialog.cpp 7 Sep 2006 03:40:48 -0000 1.2
+++ SmartRecordDialog.cpp 7 Sep 2006 05:27:10 -0000 1.3
@@ -211,16 +211,10 @@
_("Recording start: ") + m_DateTime_Start.Format() +
_("\n\nRecording end: ") + m_DateTime_End.Format() +
_(" Duration: ") + m_TimeSpan_Duration.Format() + wxT("\n");
- //vvvvv Need to change these to Leland's new shared prog dlg?
- wxProgressDialog* progDlg =
- new wxProgressDialog(
+
+ pProject->ProgressShow(
_("Audacity Smart Record Progress"), // const wxString& title,
- strMsg, // const wxString& message,
- MAX_PROG, // int maximum = 100,
- NULL, // wxWindow * parent = NULL,
- wxPD_AUTO_HIDE | wxPD_APP_MODAL |
- wxPD_CAN_ABORT | wxPD_ELAPSED_TIME | wxPD_REMAINING_TIME);
// int style = wxPD_AUTO_HIDE | wxPD_APP_MODAL
- progDlg->Show();
+ strMsg); // const wxString& message
wxTimeSpan done_TimeSpan;
wxLongLong llProgValue;
@@ -237,11 +231,11 @@
nProgValue = llProgValue.ToLong(); //v ToLong truncates, so may fail.
// strNewMsg = strMsg + _("\nDone: ") + done_TimeSpan.Format() + _("
Remaining: ") + remaining_TimeSpan.Format();
- bDidCancel = !progDlg->Update(nProgValue); // , strNewMsg);
+ bDidCancel = !pProject->ProgressUpdate(nProgValue); // , strNewMsg);
bIsRecording = (wxDateTime::UNow() < m_DateTime_End);
}
pProject->OnStop();
- delete progDlg;
+ pProject->ProgressHide();
}
this->EndModal(wxID_OK);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
