From: Richard B. <bo...@us...> - 2004-04-30 21:18:06
|
Update of /cvsroot/rosegarden/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8829/gui Modified Files: audiomanagerdialog.cpp rosegardenguidoc.cpp rosegardenguidoc.h Log Message: Bug 944227 - can't cancel "generating audio preview" Should be able to cancel from audiomanagerdialog ok. Cancelling from RG file load isn't quite working yet. Index: rosegardenguidoc.h =================================================================== RCS file: /cvsroot/rosegarden/gui/rosegardenguidoc.h,v retrieving revision 1.130 retrieving revision 1.131 diff -C2 -d -r1.130 -r1.131 *** rosegardenguidoc.h 17 Mar 2004 17:27:20 -0000 1.130 --- rosegardenguidoc.h 30 Apr 2004 21:17:57 -0000 1.131 *************** *** 438,441 **** --- 438,445 ---- void slotDocColoursChanged(); + // Cancelling an audio preview + // + void slotPreviewCancel(); + signals: /** Index: audiomanagerdialog.cpp =================================================================== RCS file: /cvsroot/rosegarden/gui/audiomanagerdialog.cpp,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** audiomanagerdialog.cpp 30 Apr 2004 14:33:21 -0000 1.101 --- audiomanagerdialog.cpp 30 Apr 2004 21:17:56 -0000 1.102 *************** *** 994,1001 **** 100, this); - /* connect(&progressDlg, SIGNAL(cancelClicked()), this, SLOT(slotAddCancel())); - */ CurrentProgressDialog::set(&progressDlg); --- 994,999 ---- *************** *** 1056,1059 **** --- 1054,1060 ---- } + disconnect(&progressDlg, SIGNAL(cancelClicked()), + this, SLOT(slotAddCancel())); + slotPopulateFileList(); *************** *** 1068,1073 **** { RG_DEBUG << "AudioManagerDialog::slotAddCancel" << endl; - CurrentProgressDialog::freeze(); m_doc->getAudioFileManager().stopPreview(); } --- 1069,1074 ---- { RG_DEBUG << "AudioManagerDialog::slotAddCancel" << endl; m_doc->getAudioFileManager().stopPreview(); + CurrentProgressDialog::freeze(); } Index: rosegardenguidoc.cpp =================================================================== RCS file: /cvsroot/rosegarden/gui/rosegardenguidoc.cpp,v retrieving revision 1.383 retrieving revision 1.384 diff -C2 -d -r1.383 -r1.384 *** rosegardenguidoc.cpp 30 Apr 2004 11:40:56 -0000 1.383 --- rosegardenguidoc.cpp 30 Apr 2004 21:17:56 -0000 1.384 *************** *** 372,375 **** --- 372,379 ---- 100, (QWidget*)parent()); + + connect(&progressDlg, SIGNAL(cancelClicked()), + this, SLOT(slotPreviewCancel())); + progressDlg.setMinimumDuration(500); progressDlg.setAutoReset(true); // we're re-using it for the preview generation *************** *** 483,486 **** --- 487,500 ---- } + void + RosegardenGUIDoc::slotPreviewCancel() + { + RG_DEBUG << "RosegardenGUIDoc::slotPreviewCancel" << endl; + m_audioFileManager.stopPreview(); + CurrentProgressDialog::freeze(); + } + + + void RosegardenGUIDoc::mergeDocument(RosegardenGUIDoc *doc, *************** *** 1915,1918 **** --- 1929,1935 ---- 100, (QWidget*)parent()); + connect(&progressDlg, SIGNAL(cancelClicked()), + this, SLOT(slotPreviewCancel())); + connect(&m_audioFileManager, SIGNAL(setProgress(int)), progressDlg.progressBar(), SLOT(setValue(int))); |