Added welcome screen widget

diff --git a/trunk/src/base/base.pro b/trunk/src/base/base.pro
index 590366f..8d29e8a 100644 (file)
--- a/trunk/src/base/base.pro
+++ b/trunk/src/base/base.pro
@@ -56,36 +56,6 @@ HEADERS  += gui/MainWindow.h \
 FORMS    += gui/MainWindow.ui
 RESOURCES += gui/gui.qrc
 
-unix {
-  #VARIABLES
-  isEmpty(PREFIX) {
-    PREFIX = /usr
-  }
-  BINDIR = $$PREFIX/bin
-  DATADIR =$$PREFIX/share
-
-  DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
-
-  #MAKE INSTALL
-
-  INSTALLS += target desktop icon64 configs
-
-  configs.path = ~/.mdictionary
-  configs.files += ../../../data/mdictionary.defaults
-
-  target.path =$$BINDIR
-
-maemo5 {
-  desktop.path = $$DATADIR/applications/hildon
-  icon64.path = $$DATADIR/icons/hicolor/64x64/hildon
-}
-
-!maemo5 {
-  desktop.path = $$DATADIR/applications
-  icon64.path = $$DATADIR/icons
-}
-  desktop.files += ../../../data/other/$${TARGET}.desktop
-  icon64.files += ../../../data/icons/64x64/$${TARGET}.png
 unix { 
     # VARIABLES
     isEmpty(PREFIX):PREFIX = /usr

diff --git a/trunk/src/base/gui/MainWindow.cpp b/trunk/src/base/gui/MainWindow.cpp
index c04dec4..cb6000d 100644 (file)
--- a/trunk/src/base/gui/MainWindow.cpp
+++ b/trunk/src/base/gui/MainWindow.cpp
@@ -82,6 +82,8 @@ void MainWindow::initializeUI() {
 
     #ifdef Q_WS_MAEMO_5
         ui->centralWidget->layout()->addWidget(welcomeScreenWidget);
+        QVBoxLayout* vl = (QVBoxLayout*)(ui->centralWidget->layout());
+        vl->addWidget(searchBarWidget, 0, Qt::AlignBottom);
     #else
         translationWidget->hide();
         splitter = new QSplitter(Qt::Horizontal);
@@ -89,10 +91,10 @@ void MainWindow::initializeUI() {
         splitter->addWidget(welcomeScreenWidget);
         splitter->setStretchFactor(1, 150);
         ui->centralWidget->layout()->addWidget(splitter);
+        ui->centralWidget->layout()->addWidget(searchBarWidget);
     #endif
 
-    QVBoxLayout* vl = (QVBoxLayout*)(ui->centralWidget->layout());
-    vl->addWidget(searchBarWidget, 0, Qt::AlignBottom);
+
 
     dictManagerWidget = new DictManagerWidget(this);
     dictManagerWidget->hide();