From efc8b7edff26b5e5dcb31b2a4866f86d529637a7 Mon Sep 17 00:00:00 2001
From: Anatoly Mihalchenko <tolik@scand.com>
Date: Fri, 10 Aug 2012 13:07:29 +0300
Subject: [PATCH] SANKORE-912

Import PDF: progress bar is not visible
---
 src/board/UBBoardController.cpp       | 8 ++++----
 src/board/UBBoardController.h         | 2 +-
 src/document/UBDocumentController.cpp | 8 ++++----
 src/document/UBDocumentController.h   | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp
index 587a3269..89cdfefd 100644
--- a/src/board/UBBoardController.cpp
+++ b/src/board/UBBoardController.cpp
@@ -954,12 +954,12 @@ UBItem *UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QStri
 
     if (!pSuccess)
     {
-        UBApplication::showMessage(tr("Downloading content %1 failed").arg(sourceUrl.toString()));
+        showMessage(tr("Downloading content %1 failed").arg(sourceUrl.toString()));
         return NULL;
     }
 
     if (!sourceUrl.toString().startsWith("file://") && !sourceUrl.toString().startsWith("uniboardTool://"))
-        UBApplication::showMessage(tr("Download finished"));
+        showMessage(tr("Download finished"));
 
     if (UBMimeType::RasterImage == itemMimeType)
     {
@@ -1237,7 +1237,7 @@ UBItem *UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QStri
         }
         else
         {
-            UBApplication::showMessage(tr("Unknown tool type %1").arg(sourceUrl.toString()));
+            showMessage(tr("Unknown tool type %1").arg(sourceUrl.toString()));
         }
     }
     else if (sourceUrl.toString().contains("edumedia-sciences.com"))
@@ -1292,7 +1292,7 @@ UBItem *UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QStri
     }
     else
     {
-        UBApplication::showMessage(tr("Unknown content type %1").arg(pContentTypeHeader));
+        showMessage(tr("Unknown content type %1").arg(pContentTypeHeader));
         qWarning() << "ignoring mime type" << pContentTypeHeader ;
     }
 
diff --git a/src/board/UBBoardController.h b/src/board/UBBoardController.h
index 7d0404e0..fbb6c3a4 100644
--- a/src/board/UBBoardController.h
+++ b/src/board/UBBoardController.h
@@ -193,7 +193,7 @@ class UBBoardController : public UBDocumentContainer
         UBItem *downloadFinished(bool pSuccess, QUrl sourceUrl, QString pHeader, QByteArray pData, QPointF pPos, QSize pSize, bool isBackground = false);
         void changeBackground(bool isDark, bool isCrossed);
         void setToolCursor(int tool);
-        void showMessage(const QString& message, bool showSpinningWheel);
+        void showMessage(const QString& message, bool showSpinningWheel = false);
         void hideMessage();
         void setDisabled(bool disable);
         void setColorIndex(int pColorIndex);
diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp
index e7a50345..dde842cb 100644
--- a/src/document/UBDocumentController.cpp
+++ b/src/document/UBDocumentController.cpp
@@ -623,7 +623,7 @@ void UBDocumentController::deleteSelectedItem()
                             toBeDeleted << proxyTi;
                     }
 
-                    UBApplication::showMessage(tr("Emptying trash"));
+                    showMessage(tr("Emptying trash"));
 
                     for (int i = 0; i < toBeDeleted.count(); i++)
                     {
@@ -633,7 +633,7 @@ void UBDocumentController::deleteSelectedItem()
                         UBPersistenceManager::persistenceManager()->deleteDocument(proxyTi->proxy());
                     }
 
-                    UBApplication::showMessage(tr("Emptied trash"));
+                    showMessage(tr("Emptied trash"));
 
                     QApplication::restoreOverrideCursor();
                     mMainWindow->actionDelete->setEnabled(false);
@@ -683,7 +683,7 @@ void UBDocumentController::deleteSelectedItem()
                     {
                         UBDocumentProxyTreeItem* proxyTi = toBeDeleted.at(i);
 
-                        UBApplication::showMessage(QString("Deleting %1").arg(proxyTi->proxy()->metaData(UBSettings::documentName).toString()));
+                        showMessage(QString("Deleting %1").arg(proxyTi->proxy()->metaData(UBSettings::documentName).toString()));
                         // Move document to trash
                         QString oldGroupName = proxyTi->proxy()->metaData(UBSettings::documentGroupName).toString();
                         proxyTi->proxy()->setMetaData(UBSettings::documentGroupName, UBSettings::trashedDocumentGroupNamePrefix + oldGroupName);
@@ -693,7 +693,7 @@ void UBDocumentController::deleteSelectedItem()
                         mTrashTi->addChild(proxyTi);
                         proxyTi->setFlags(proxyTi->flags() ^ Qt::ItemIsEditable);
 
-                        UBApplication::showMessage(QString("%1 deleted").arg(groupTi->groupName()));
+                        showMessage(QString("%1 deleted").arg(groupTi->groupName()));
                     }
 
                     // dont remove default group
diff --git a/src/document/UBDocumentController.h b/src/document/UBDocumentController.h
index 29077c4d..d27ca0a6 100644
--- a/src/document/UBDocumentController.h
+++ b/src/document/UBDocumentController.h
@@ -71,7 +71,7 @@ class UBDocumentController : public UBDocumentContainer
         void selectDocument(UBDocumentProxy* proxy, bool setAsCurrentDocument = true);
         void show();
         void hide();
-        void showMessage(const QString& message, bool showSpinningWheel);
+        void showMessage(const QString& message, bool showSpinningWheel = false);
         void hideMessage();
         void toggleDocumentToolsPalette();
         void cut();