Modifications from cfd4f8d1c5 merged.

src/domain/UBGraphicsWidgetItem.cpp

@@ -110,7 +110,7 @@ void UBGraphicsWidgetItem::initialize()
 
     connect(page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(javaScriptWindowObjectCleared()));
     connect(page(), SIGNAL(geometryChangeRequested(const QRect&)), this, SLOT(geometryChangeRequested(const QRect&)));
-    connect(page(), SIGNAL(loadFinished(bool)), this, SLOT(mainFrameLoadFinished (bool)));
+    connect(this, SIGNAL(loadFinished(bool)), this, SLOT(mainFrameLoadFinished (bool)));
 }
 
 QUrl UBGraphicsWidgetItem::mainHtml()
@@ -566,18 +566,15 @@ void UBGraphicsWidgetItem::paint( QPainter *painter, const QStyleOptionGraphicsI
 {
     if (mIsFrozen)
         painter->drawPixmap(0, 0, mSnapshot);
-    else if(mIsTakingSnapshot || (mInitialLoadDone && !mLoadIsErronous))
+    else
         QGraphicsWebView::paint(painter, option, widget);
-    else {
-        QString message = tr("Loading ...");
+    if (!mInitialLoadDone || mLoadIsErronous) {
+        QString message;
 
-        /* this is the right way of doing but we receive two callback and the one return always that the
-         * load as failed... to check
-            if (mLoadIsErronous)
+        if (mInitialLoadDone && mLoadIsErronous)
             message = tr("Cannot load content");
         else
             message = tr("Loading ...");
-         */
 
         painter->setFont(QFont("Arial", 12));