Mercurial > hg > svgui
comparison widgets/ImageDialog.cpp @ 373:0895517bb2d1 1.2-stable
* merge from trunk (1.2 ended up being tracked from trunk, but we may want
this branch for fixes later)
author | Chris Cannam |
---|---|
date | Wed, 27 Feb 2008 10:32:45 +0000 |
parents | 07aa52466142 |
children | 22b72f0f6a4e |
comparison
equal
deleted
inserted
replaced
337:813170c57b13 | 373:0895517bb2d1 |
---|---|
184 if (!FileSource::canHandleScheme(url)) { | 184 if (!FileSource::canHandleScheme(url)) { |
185 QMessageBox::critical(this, tr("Unsupported scheme in URL"), | 185 QMessageBox::critical(this, tr("Unsupported scheme in URL"), |
186 tr("The URL scheme \"%1\" is not supported") | 186 tr("The URL scheme \"%1\" is not supported") |
187 .arg(url.scheme())); | 187 .arg(url.scheme())); |
188 } else { | 188 } else { |
189 m_remoteFile = new FileSource(url, true); | 189 m_remoteFile = new FileSource(url, FileSource::ProgressDialog); |
190 m_remoteFile->waitForData(); | 190 m_remoteFile->waitForData(); |
191 if (!m_remoteFile->isOK()) { | 191 if (!m_remoteFile->isOK()) { |
192 QMessageBox::critical(this, tr("File download failed"), | 192 QMessageBox::critical(this, tr("File download failed"), |
193 tr("Failed to download URL \"%1\": %2") | 193 tr("Failed to download URL \"%1\": %2") |
194 .arg(url.toString()).arg(m_remoteFile->getErrorString())); | 194 .arg(url.toString()).arg(m_remoteFile->getErrorString())); |