From: timoph <timop.harkonen@gmail.com>
Date: Sat, 29 May 2010 19:11:56 +0000 (+0000)
Subject: fixing default image not displayed
X-Git-Tag: 0.7.2~9
X-Git-Url: http://git.maemo.org/git/?p=impuzzle;a=commitdiff_plain;h=6ccd3c118b19d854dfa0fe9396cdf8885b52994a

fixing default image not displayed

git-svn-id: file:///svnroot/impuzzle/trunk@25 e6bec12f-0854-4cc4-ad26-6875f1509f77
---

diff --git a/src/imageimporter.cpp b/src/imageimporter.cpp
index e666335..bb6d000 100644
--- a/src/imageimporter.cpp
+++ b/src/imageimporter.cpp
@@ -46,15 +46,15 @@ QList<PuzzleItem *> ImageImporter::newPieces(const QPixmap &pixmap, const int co
     QPixmap tmp;
 
     if(pixmap.isNull()) {
-        qDebug() << "Got NULL image - using default.jpg";
+        qDebug() << "Got NULL image - using default image";
         tmp = QPixmap(":/images/default.jpg");
     }
     else {
         tmp = pixmap;
-    }
 
-    if(tmp.size().height() != IMAGE_HEIGHT || tmp.size().width() != IMAGE_WIDTH) {
-        tmp = pixmap.scaled(QSize(IMAGE_WIDTH, IMAGE_HEIGHT), Qt::KeepAspectRatioByExpanding);
+        if(tmp.size().height() != IMAGE_HEIGHT || tmp.size().width() != IMAGE_WIDTH) {
+            tmp = pixmap.scaled(QSize(IMAGE_WIDTH, IMAGE_HEIGHT), Qt::KeepAspectRatioByExpanding);
+        }
     }
 
     QList<PuzzleItem *> list;
diff --git a/src/images/default.jpg b/src/images/default.jpg
index 1dd5320..741ecab 100644
Binary files a/src/images/default.jpg and b/src/images/default.jpg differ
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index b2cb6f8..019ca48 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -106,7 +106,7 @@ void SettingsDialog::imageSelectionChanged(const QString &txt)
 
         QStringList pics = dir.entryList(filters, QDir::Files | QDir::NoSymLinks);
 
-        qDebug() << QString("pics list contains %1 entries").arg(pics.count());
+        //qDebug() << QString("pics list contains %1 entries").arg(pics.count());
 
         if(!pics.isEmpty()) {
             QString path = QDir::homePath() + QLatin1String("/MyDocs/.images/") + pics.at(qrand() % pics.count());
@@ -114,8 +114,8 @@ void SettingsDialog::imageSelectionChanged(const QString &txt)
             Settings::instance()->setImagePath(path);
         }
         else {
-            Settings::instance()->setImage(0);
-            Settings::instance()->setImagePath("");
+            Settings::instance()->setImage(QPixmap(":/images/default.jpg"));
+            Settings::instance()->setImagePath("default");
         }
 
         if(selectedImageLabel_->isVisible()) {
@@ -123,7 +123,7 @@ void SettingsDialog::imageSelectionChanged(const QString &txt)
         }
     }
     else if(txt == SELECT_IMAGE_TXT) {
-        qDebug() << "Select image... selected";
+        //qDebug() << "Select image... selected";
 
         // Open file selection dialog
         QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"),