Commit 46eb8fd3 authored by Alexander Stippich's avatar Alexander Stippich
Browse files

adjust KSaneWidget to progress changes

parent 7ee62e9a
Pipeline #89355 passed with stage
in 32 seconds
...@@ -1160,13 +1160,11 @@ void KSaneWidgetPrivate::oneFinalScanDone(KSaneCore::KSaneScanStatus status, con ...@@ -1160,13 +1160,11 @@ void KSaneWidgetPrivate::oneFinalScanDone(KSaneCore::KSaneScanStatus status, con
void KSaneWidgetPrivate::setBusy(bool busy) void KSaneWidgetPrivate::setBusy(bool busy)
{ {
if (busy) { if (busy) {
m_warmingUp->show();
m_activityFrame->hide();
m_btnFrame->hide(); m_btnFrame->hide();
} else {
m_warmingUp->hide();
m_activityFrame->hide(); m_activityFrame->hide();
} else {
m_btnFrame->show(); m_btnFrame->show();
m_activityFrame->hide();
} }
m_optsTabWidget->setDisabled(busy); m_optsTabWidget->setDisabled(busy);
...@@ -1207,12 +1205,18 @@ void KSaneWidgetPrivate::invertPreview() ...@@ -1207,12 +1205,18 @@ void KSaneWidgetPrivate::invertPreview()
void KSaneWidgetPrivate::updateProgress(int progress) void KSaneWidgetPrivate::updateProgress(int progress)
{ {
if (progress < 0 && !m_warmingUp->isVisible()) {
m_warmingUp->show();
m_activityFrame->hide();
} else {
m_warmingUp->hide();
m_activityFrame->show();
}
if (m_isPreview) { if (m_isPreview) {
if (!m_progressBar->isVisible() || m_ksaneCoreInterface->scanImage()->height() != m_previewViewer->currentImageHeight() // the image size might have changed
if (m_ksaneCoreInterface->scanImage()->height() != m_previewViewer->currentImageHeight()
|| m_ksaneCoreInterface->scanImage()->width() != m_previewViewer->currentImageWidth() ) { || m_ksaneCoreInterface->scanImage()->width() != m_previewViewer->currentImageWidth() ) {
m_warmingUp->hide();
m_activityFrame->show();
// the image size might have changed
m_ksaneCoreInterface->lockScanImage(); m_ksaneCoreInterface->lockScanImage();
m_previewViewer->setQImage(m_ksaneCoreInterface->scanImage()); m_previewViewer->setQImage(m_ksaneCoreInterface->scanImage());
m_previewViewer->zoom2Fit(); m_previewViewer->zoom2Fit();
...@@ -1223,10 +1227,6 @@ void KSaneWidgetPrivate::updateProgress(int progress) ...@@ -1223,10 +1227,6 @@ void KSaneWidgetPrivate::updateProgress(int progress)
m_ksaneCoreInterface->unlockScanImage(); m_ksaneCoreInterface->unlockScanImage();
} }
} else { } else {
if (!m_progressBar->isVisible()) {
m_warmingUp->hide();
m_activityFrame->show();
}
m_previewViewer->setHighlightShown(progress); m_previewViewer->setHighlightShown(progress);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment