From 1c5601f3a42ac5d81a6d01129496c199ba16b0dc Mon Sep 17 00:00:00 2001 From: Yimgo Date: Wed, 8 Aug 2012 10:58:24 +0200 Subject: [PATCH] Forgot modifications in 786ae0354f12f86d2a2fdf19554b5fc7132b98da. --- src/domain/UBGraphicsWidgetItem.cpp | 9 +++++++-- src/domain/UBGraphicsWidgetItem.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/domain/UBGraphicsWidgetItem.cpp b/src/domain/UBGraphicsWidgetItem.cpp index 5c872772..7a4dc60a 100644 --- a/src/domain/UBGraphicsWidgetItem.cpp +++ b/src/domain/UBGraphicsWidgetItem.cpp @@ -120,6 +120,7 @@ QUrl UBGraphicsWidgetItem::mainHtml() void UBGraphicsWidgetItem::loadMainHtml() { + mInitialLoadDone = false; load(mMainHtmlUrl); } @@ -1074,8 +1075,7 @@ QString UBGraphicsW3CWidgetItem::freezedWidgetPage() static QString defaultcontent; if (defaultcontent.isNull()) { - QString etcPath = UBPlatformUtils::applicationResourcesDirectory() + "/etc/"; - QString freezedWidgetDefaultContentFilePath = etcPath + "freezedWidgetWrapper.html"; + QString freezedWidgetDefaultContentFilePath = freezedWidgetFilePath(); QFile wrapperFile(freezedWidgetDefaultContentFilePath); if (!wrapperFile.open(QIODevice::ReadOnly | QIODevice::Text)) { qDebug() << "can't open wrapper file " + freezedWidgetDefaultContentFilePath; @@ -1095,6 +1095,11 @@ QString UBGraphicsW3CWidgetItem::freezedWidgetPage() return defaultcontent; } +QString UBGraphicsW3CWidgetItem::freezedWidgetFilePath() +{ + return UBPlatformUtils::applicationResourcesDirectory() + "/etc/" + "freezedWidgetWrapper.html"; +} + bool UBGraphicsW3CWidgetItem::hasNPAPIWrapper(const QString& pMimeType) { loadNPAPIWrappersTemplates(); diff --git a/src/domain/UBGraphicsWidgetItem.h b/src/domain/UBGraphicsWidgetItem.h index dc61139c..c700b654 100644 --- a/src/domain/UBGraphicsWidgetItem.h +++ b/src/domain/UBGraphicsWidgetItem.h @@ -239,6 +239,7 @@ class UBGraphicsW3CWidgetItem : public UBGraphicsWidgetItem QMap preferences(); Metadata metadatas() const; + static QString freezedWidgetFilePath(); static QString createNPAPIWrapper(const QString& url, const QString& pMimeType = QString(), const QSize& sizeHint = QSize(300, 150), const QString& pName = QString()); static QString createNPAPIWrapperInDir(const QString& url, const QDir& pDir, const QString& pMimeType = QString(), const QSize& sizeHint = QSize(300, 150), const QString& pName = QString()); static QString createHtmlWrapperInDir(const QString& html, const QDir& pDir, const QSize& sizeHint, const QString& pName);