DictTypeSelectDialog ported to qml. Remove empty qml files.

[mdictionary] / src / mdictionary / gui / WelcomeScreenWidget.cpp

diff --git a/src/mdictionary/gui/WelcomeScreenWidget.cpp b/src/mdictionary/gui/WelcomeScreenWidget.cpp
index ee4d286..47a2ac3 100644 (file)
--- a/src/mdictionary/gui/WelcomeScreenWidget.cpp
+++ b/src/mdictionary/gui/WelcomeScreenWidget.cpp
@@ -19,8 +19,11 @@
 
 *******************************************************************************/
 
-//! \file WelcomeScreenWidget.cpp
-//! \author Mateusz Półrola <mateusz.polrola@comarch.pl>
+/*! \file WelcomeScreenWidget.cpp
+    \brief Implements widget that displays welcome screen to user
+
+    \author Mateusz Półrola <mateusz.polrola@comarch.pl>
+*/
 
 #include "WelcomeScreenWidget.h"
 
@@ -34,6 +37,15 @@ WelcomeScreenWidget::WelcomeScreenWidget(QWidget *parent) :
     mainLayout = new QVBoxLayout(this);
     setLayout(mainLayout);
 
+    #ifndef Q_WS_MAEMO_5
+    qmlView = new QDeclarativeView(this);
+    qmlView->setSource(QUrl::fromLocalFile("/usr/share/mdictionary/qml/WelcomeScreenWidget.qml"));
+
+    mainLayout->addWidget(qmlView, 0, Qt::AlignCenter);
+
+    #endif
+    #ifdef Q_WS_MAEMO_5
+
     imageLabel = new QLabel(this);
     mainLabel = new QLabel(infoNote, this);
 
@@ -47,9 +59,10 @@ WelcomeScreenWidget::WelcomeScreenWidget(QWidget *parent) :
     imageLabel->resize(imageLabel->pixmap()->size());
 
 
-    //mainLabel->setWordWrap(true);
+    mainLabel->setWordWrap(true);
+    #endif
 
     #ifdef Q_WS_MAEMO_5
-        mainLayout->addSpacing(20);
+        //mainLayout->addSpacing(20);
     #endif
 }