Fix some buid issues on maemo, Also add some simple usability fixes

[groove] / Groove.pro

diff --git a/Groove.pro b/Groove.pro
index 1444540..b0d0698 100644 (file)
--- a/Groove.pro
+++ b/Groove.pro
@@ -11,15 +11,16 @@ TARGET = groove
 #CONFIG += build_all
 DEPENDPATH += .
 INCLUDEPATH += .
-INCLUDEPATH += /usr/include/qjson
+INCLUDEPATH += /usr/include/qjson /usr/include
 #INCLUDEPATH += ../qjson/src/
 #INCLUDEPATH += ./src/
 #LIBS += -L/usr/lib -lqjson ##Desktop Target
-LIBS += -L/usr/local/lib -lqjson ##Armel Target
+LIBS += -L/usr/local/lib -lqjson -lpulse-simple##Armel Target
 #LIBS += -L~/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1014-slim/usr/lib -lqjson ##Armel Target SDK
 #LIBS += -L../qjson/lib -lqjson ##X86 maemo
 QT += network
 QT += phonon
+
 # Input
 SOURCES += main.cpp \
     groove.cpp \
@@ -28,7 +29,13 @@ SOURCES += main.cpp \
     streamio.cpp \
     playlist.cpp \
     downloadmanager.cpp \
-    grooveprogressbar.cpp
+    grooveprogressbar.cpp \
+    topbar.cpp \
+    bottombar.cpp \
+    vkb.cpp \
+    searchresults.cpp \
+##  mpgplayer.cpp
+    plistwin.cpp
 
 HEADERS += \
     groove.h \
@@ -37,15 +44,36 @@ HEADERS += \
     streamio.h \
     playlist.h \
     downloadmanager.h \
-    grooveprogressbar.h
+    grooveprogressbar.h \
+    topbar.h \
+    bottombar.h \
+    vkb.h \
+    searchresults.h \
+##    mpgplayer.h
+    plistwin.h
 
 maemo5 {
 SOURCES += qmaemo5rotator.cpp
 HEADERS += qmaemo5rotator.h
+QT += dbus
 }
 OTHER_FILES += \
     icon.svg \
-    groove.png
+    groove.png \
+    general_fullsize.png \
+    general_search.png \
+    wmTaskSwitcherIconPressed.png \
+    wmTaskSwitcherIconHighlight.png \
+    wmTaskSwitcherIcon.png \
+    general_forward.png \
+    general_foldertree.png \
+    general_close.png \
+    general_back.png \
+    general_add.png \
+    camera_video_stop.png \
+    camera_video_pause.png \
+    camera_camera_setting.png \
+    wmTaskModified.png
 unix {
   PREFIX = /usr
   BINDIR = $$PREFIX/bin
@@ -65,3 +93,12 @@ unix {
   icon64.path = $$DATADIR/icons/hicolor/64x64/apps
   icon64.files += groove.png
 }
+
+RESOURCES += \
+    res.qrc
+
+FORMS += \
+    topbar.ui \
+    bottombar.ui \
+    vkb.ui \
+    searchresults.ui