@@ -326,8 +326,8 @@ SCIRunMainWindow::SCIRunMainWindow() : shortcuts_(nullptr), returnCode_(0), quit
326326 // TODO: store in xml file, add to app resources
327327 connect (actionForwardInverse_, SIGNAL (triggered ()), this , SLOT (toolkitDownload ()));
328328 actionForwardInverse_->setProperty (ToolkitIconURL, QString (" http://www.sci.utah.edu/images/software/forward-inverse/forward-inverse-mod.png" ));
329- actionForwardInverse_->setProperty (ToolkitURL, QString (" http://sci.utah.edu/devbuilds/scirun5/toolkits/FwdInvToolkit_v1.zip" ));
330- actionForwardInverse_->setProperty (ToolkitFilename, QString (" FwdInvToolkit_v1.zip" ));
329+ actionForwardInverse_->setProperty (ToolkitURL, QString (" http://sci.utah.edu/devbuilds/scirun5/toolkits/FwdInvToolkit_v1.2. zip" ));
330+ actionForwardInverse_->setProperty (ToolkitFilename, QString (" FwdInvToolkit_v1.2. zip" ));
331331 actionForwardInverse_->setIcon (QPixmap (" :/general/Resources/download.png" ));
332332
333333 connect (actionBrainStimulator_, SIGNAL (triggered ()), this , SLOT (toolkitDownload ()));
@@ -1940,7 +1940,11 @@ void FileDownloader::fileDownloaded(QNetworkReply* reply)
19401940void FileDownloader::downloadProgress (qint64 received, qint64 total)
19411941{
19421942 if (statusBar_)
1943+ {
19431944 statusBar_->showMessage (tr (" File progress: %1 / %2" ).arg (received).arg (total), 1000 );
1945+ if (received == total)
1946+ statusBar_->showMessage (" File downloaded." , 1000 );
1947+ }
19441948}
19451949
19461950void SCIRunMainWindow::toolkitDownload ()
@@ -1983,7 +1987,7 @@ void ToolkitDownloader::showMessageBox()
19831987#else
19841988 toolkitInfo.setText (" Toolkit information" );
19851989#endif
1986- toolkitInfo.setInformativeText (" Click OK to download the latest version of this toolkit. " );
1990+ toolkitInfo.setInformativeText (" Click OK to download the latest version of this toolkit: \n\n " + fileUrl_ );
19871991 toolkitInfo.setStandardButtons (QMessageBox::Ok | QMessageBox::Cancel);
19881992 toolkitInfo.setIconPixmap (image);
19891993 toolkitInfo.setDefaultButton (QMessageBox::Ok);
@@ -2012,4 +2016,5 @@ void ToolkitDownloader::saveToolkit()
20122016 file.open (QIODevice::WriteOnly);
20132017 file.write (zipDownloader_->downloadedData ());
20142018 file.close ();
2019+ statusBar_->showMessage (" Toolkit file saved." , 1000 );
20152020}
0 commit comments