FCL/sf/mw/hb: comparison src/hbservers/hbsplashgenerator/hbsplashgenerator.cpp

equal deleted inserted replaced

-:923ff622b8b9
+:4633027730f5
 HbSplashGenerator::HbSplashGenerator()
 : mMainWindowLocked(false),
 mProcessQueuePending(false),
 mForceRegen(false),
 mMainWindow(0),
-mFirstRegenerate(true)
+mFirstRegenerate(true),
+mSaveSplFailed(false)
 {
 #if defined(Q_OS_SYMBIAN)
 CCoeEnv::Static()->FsSession().CreatePrivatePath(EDriveC);
 QString iniFileName = QString("c:/private/%1/hbsplashgen.ini")
 .arg(QString::number(hbsplash_server_uid3.iUid, 16));
 // Queue the screenshot request for both orientations.
 mQueue.enqueue(QueueItem(themeName, Qt::Vertical));
 mQueue.enqueue(QueueItem(themeName, Qt::Horizontal));
 queueAppSpecificItems(themeName, Qt::Vertical);
 queueAppSpecificItems(themeName, Qt::Horizontal);
+mSaveSplFailed = false;
 qDebug() << PRE << "queue preparation time (ms):" << queuePrepTime.elapsed();
 QMetaObject::invokeMethod(this, "processQueue", Qt::QueuedConnection);
 } catch (const std::bad_alloc &) {
 cleanup();
 }
 }
 }
+// This function is for the splashviewer tool only, do not use from elsewhere.
 void HbSplashGenerator::regenerateOne(const QString &splashmlFileName, const QString &customTrDir)
 {
 mQueue.clear();
 QueueItem item(hbInstance->theme()->name(), Qt::Vertical);
 QString path = QFileInfo(splashmlFileName).path();
 if (mQueue.isEmpty()) {
 qDebug() << PRE << "queue is empty  regen finished";
 mSettings->setValue(last_theme_key, hbInstance->theme()->name());
 mSettings->setValue(last_lang_key, QLocale::system().name());
 QString outDir = hbsplash_output_dir();
-mSettings->setValue(last_file_count_key, updateOutputDirContents(outDir));
+// Notify the server and get the number of generated files...
+int fileCount = updateOutputDirContents(outDir);
+// ...but store zero if some file writing failed at some point
+// so there will be a regeneration on next boot at least.
+if (mSaveSplFailed) {
+fileCount = 0;
+qDebug() << PRE << "some files not ok, ignoring file count";
+} else {
+qDebug() << PRE << "all files ok";
+}
+mSettings->setValue(last_file_count_key, fileCount);
 mSettings->setValue(last_output_dir_key, outDir);
 emit finished();
 qDebug() << PRE << "processQueue() over";
 return;
 }
 qDebug() << PRE << "mainwindow init time (ms):" << mItemTime.elapsed();
 QTime setupTime;
 setupTime.start();
 setupAppSpecificWindow();
-finishWindow();
+qDebug() << PRE << "content setup time (ms):" << setupTime.elapsed();
-qDebug() << PRE << "content setup time(ms):" << setupTime.elapsed();
+// The async call chain goes like this:
-QMetaObject::invokeMethod(this, "processWindow", Qt::QueuedConnection);
+// processQueue -> finishWindow -> processWindow -> processQueue -> ...
+// finishWindow() cannot be called directly from here because that would
+// result in asserts in QGraphicsScene with certain Qt versions.
+QMetaObject::invokeMethod(this, "finishWindow", Qt::QueuedConnection);
 } catch (const std::bad_alloc &) {
 cleanup();
 }
 qDebug() << PRE << "processQueue() over";
 #if !defined(Q_OS_SYMBIAN) && defined(QT_DEBUG)
 image.save(splashFile + QLatin1String(".png"));
 #endif
 } else {
 qWarning() << PRE << "file write failed for" << splashFile;
+mSaveSplFailed = true;
 }
 qDebug() << PRE << "save time (ms):" << t.elapsed();
 log("takeScreenshot() over", mItem.mThemeName, mItem.mOrientation);
 } catch (const std::bad_alloc &) {
 cleanup();
 QString HbSplashGenerator::splashFileName()
 {
 QString outDirName = hbsplash_output_dir();
 QDir dir(outDirName);
 if (!dir.exists()) {
-if (!QDir(".").mkdir(outDirName)) {
+if (!QDir(".").mkpath(outDirName)) {
-qWarning() << PRE << "mkdir failed for" << outDirName;
+qWarning() << PRE << "mkpath failed for" << outDirName;
 }
 }
 // "splash_<orientation>_<appid>_<screenid>"
 QString splashFile = dir.filePath("splash_");
 splashFile.append(orientationName(mItem.mOrientation));
 f.write((char *) &w, sizeof(quint32));
 f.write((char *) &h, sizeof(quint32));
 f.write((char *) &bpl, sizeof(quint32));
 f.write((char *) &fmt, sizeof(qint32));
 f.write((char *) &extra, sizeof(quint32));
-f.write((const char *) image.bits(), bpl * h);
+qint64 wcount = f.write((const char *) image.bits(), bpl * h);
 f.close();
-return true;
+return wcount == bpl * h;
 }
 return false;
 }
 void HbSplashGenerator::cleanup()
 }
 }
 void HbSplashGenerator::finishWindow()
 {
+QTime prepTime;
+prepTime.start();
 // There must be a view always in order to support view-specific settings.
 if (mMainWindow->views().isEmpty()) {
 mMainWindow->addView(new HbWidget);
 }
 }
 }
 // Hide dynamic content from status bar (clock, indicators).
 setStatusBarElementsVisible(mMainWindow, false);
+qDebug() << PRE << "time spent in finishWindow() (ms):" << prepTime.elapsed();
+// Continue with rendering the graphics view in processWindow().
+QMetaObject::invokeMethod(this, "processWindow", Qt::QueuedConnection);
 }
 void HbSplashGenerator::setStatusBarElementsVisible(HbMainWindow *mw, bool visible)
 {
 HbMainWindowPrivate *mwd = HbMainWindowPrivate::d_ptr(mw);

changeset 21	4633027730f5
parent 7	923ff622b8b9
child 23	e6ad4ef83b23