<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
- <value type="int">0</value>
+ <value type="int">1</value>
</data>
<data>
<variable>ProjectExplorer.Project.EditorSettings</variable>
<data>
<variable>ProjectExplorer.Project.Target.0</variable>
<valuemap type="QVariantMap">
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Maemo</value>
- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Target.MaemoDeviceTarget</value>
+ <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Desktop</value>
+ <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Target.DesktopTarget</value>
<value key="ProjectExplorer.Target.ActiveBuildConfiguration" type="int">0</value>
<value key="ProjectExplorer.Target.ActiveRunConfiguration" type="int">0</value>
<valuemap key="ProjectExplorer.Target.BuildConfiguration.0" type="QVariantMap">
<valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
- <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList">
- <value type="QString">INCLUDEPATH+=../qjson/src</value>
- </valuelist>
+ <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
</valuemap>
<valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap">
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
<value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
- <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
- <value type="QString">-j2</value>
- </valuelist>
+ <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
<value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
</valuemap>
- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.2" type="QVariantMap">
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MaemoPackageCreationStep</value>
- <valuelist key="Qt4ProjectManager.BuildStep.MaemoPackage.LocalFiles" type="QVariantList"/>
- <value key="Qt4ProjectManager.BuildStep.MaemoPackage.Modified" type="bool">true</value>
- <value key="Qt4ProjectManager.BuildStep.MaemoPackage.RemoteExe" type="QString">/usr/local/bin/groove</value>
- <valuelist key="Qt4ProjectManager.BuildStep.MaemoPackage.RemoteFiles" type="QVariantList"/>
- </valuemap>
- <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">3</value>
+ <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
<valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Debug</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/eli/Projects/Groove-build-maemo</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">3</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">9</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/scratchbox/users/eli/home/eli/qt4/Groove</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">6</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">false</value>
</valuemap>
<valuemap key="ProjectExplorer.Target.BuildConfiguration.1" type="QVariantMap">
<valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
<valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
<value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
</valuemap>
- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.2" type="QVariantMap">
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MaemoPackageCreationStep</value>
- <valuelist key="Qt4ProjectManager.BuildStep.MaemoPackage.LocalFiles" type="QVariantList"/>
- <value key="Qt4ProjectManager.BuildStep.MaemoPackage.Modified" type="bool">true</value>
- <value key="Qt4ProjectManager.BuildStep.MaemoPackage.RemoteExe" type="QString">/usr/local/bin/groove</value>
- <valuelist key="Qt4ProjectManager.BuildStep.MaemoPackage.RemoteFiles" type="QVariantList"/>
- </valuemap>
- <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">3</value>
+ <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
<valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Release</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/eli/Projects/Groove-build-maemo</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">3</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/scratchbox/users/eli/home/eli/qt4/Groove</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">6</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">false</value>
+ </valuemap>
+ <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">2</value>
+ <valuemap key="ProjectExplorer.Target.RunConfiguration.0" type="QVariantMap">
+ <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Groove</value>
+ <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4RunConfiguration</value>
+ <value key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase" type="int">2</value>
+ <valuelist key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments" type="QVariantList"/>
+ <value key="Qt4ProjectManager.Qt4RunConfiguration.ProFile" type="QString">Groove.pro</value>
+ <value key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix" type="bool">false</value>
+ <value key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal" type="bool">false</value>
+ <valuelist key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges" type="QVariantList"/>
+ <value key="Qt4ProjectManager.Qt4RunConfiguration.UserSetName" type="bool">false</value>
+ <value key="Qt4ProjectManager.Qt4RunConfiguration.UserSetWorkingDirectory" type="bool">false</value>
+ <value key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory" type="QString"></value>
+ </valuemap>
+ <value key="ProjectExplorer.Target.RunConfigurationCount" type="int">1</value>
+ </valuemap>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.Target.1</variable>
+ <valuemap type="QVariantMap">
+ <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Maemo</value>
+ <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Target.MaemoDeviceTarget</value>
+ <value key="ProjectExplorer.Target.ActiveBuildConfiguration" type="int">0</value>
+ <value key="ProjectExplorer.Target.ActiveRunConfiguration" type="int">0</value>
+ <valuemap key="ProjectExplorer.Target.BuildConfiguration.0" type="QVariantMap">
+ <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
+ <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value>
+ <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
+ <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList">
+ <value type="QString">INCLUDEPATH+=../qjson/src LIBS+=-L~/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1014-slim/usr/lib -lqjson</value>
+ </valuelist>
+ </valuemap>
+ <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap">
+ <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
+ <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
+ <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
+ <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
+ <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
+ </valuemap>
+ <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
+ <valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
+ <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
+ <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
+ <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
+ <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
+ <value type="QString">clean</value>
+ </valuelist>
+ <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
+ </valuemap>
+ <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
+ <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
+ <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
+ <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Debug</value>
+ <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/scratchbox/users/eli/home/eli/qt4/Groove-build</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">5</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">9</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
</valuemap>
- <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">2</value>
+ <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">1</value>
<valuemap key="ProjectExplorer.Target.RunConfiguration.0" type="QVariantMap">
<value key=".ProFile" type="QString">Groove.pro</value>
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">New Maemo Run Configuration</value>
+ <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Groove on Maemo device</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MaemoRunConfiguration</value>
<valuelist key="Qt4ProjectManager.MaemoRunConfiguration.Arguments" type="QVariantList"/>
- <valuemap key="Qt4ProjectManager.MaemoRunConfiguration.DebuggingHelpersLastDeployed" type="QVariantMap"/>
- <value key="Qt4ProjectManager.MaemoRunConfiguration.DeviceId" type="qulonglong">0</value>
- <valuemap key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployed" type="QVariantMap"/>
+ <valuemap key="Qt4ProjectManager.MaemoRunConfiguration.DebuggingHelpersLastDeployed" type="QVariantMap">
+ <value key="192.168.1.4" type="QDateTime">2010-07-20T16:55:17</value>
+ </valuemap>
+ <value key="Qt4ProjectManager.MaemoRunConfiguration.DeviceId" type="qulonglong">1</value>
+ <valuemap key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployed" type="QVariantMap">
+ <value key="192.168.1.4" type="QDateTime">2010-07-21T16:20:24</value>
+ </valuemap>
+ <value key="Qt4ProjectManager.MaemoRunConfiguration.Simulator" type="QString"></value>
</valuemap>
<value key="ProjectExplorer.Target.RunConfigurationCount" type="int">1</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.TargetCount</variable>
- <value type="int">1</value>
+ <value type="int">2</value>
</data>
<data>
<variable>ProjectExplorer.Project.Updater.FileVersion</variable>
#############################################################################
# Makefile for building: groove
-# Generated by qmake (2.01a) (Qt 4.6.2) on: Fri Jul 2 02:52:37 2010
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Tue Jul 20 16:35:58 2010
# Project: Groove.pro
# Template: app
-# Command: /usr/bin/qmake -unix -o Makefile Groove.pro
+# Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile Groove.pro
#############################################################################
####### Compiler, tools and options
CC = gcc
CXX = g++
-DEFINES = -DDATADIR="/usr/share" -DPKGDATADIR="" -DQT_NO_DEBUG -DQT_PHONON_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
-CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/phonon -I/usr/include/qt4 -I. -I/usr/include/qjson -I/usr/include/qt4/phonon_compat -I.
+DEFINES = -DDATADIR="/usr/share" -DPKGDATADIR="" -DQT_PHONON_LIB -DQT_DBUS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
+CFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
+CXXFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
+INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtDBus -I/usr/include/qt4/phonon -I/usr/include/qt4 -I. -I/usr/include/qjson -I/usr/include/qt4/phonon_compat -I. -I.
LINK = g++
-LFLAGS = -Wl,-O1
-LIBS = $(SUBLIBS) -L/usr/lib -L/usr/local/lib -lqjson -lphonon -lQtGui -lQtNetwork -lQtCore -lpthread
+LFLAGS =
+LIBS = $(SUBLIBS) -L/usr/lib -L/usr/local/lib -lqjson -lphonon -lQtDBus -lQtGui -lQtNetwork -lQtCore -lpthread
AR = ar cqs
RANLIB =
QMAKE = /usr/bin/qmake
streamio.cpp \
playlist.cpp \
downloadmanager.cpp \
- grooveprogressbar.cpp moc_groove.cpp \
+ grooveprogressbar.cpp \
+ topbar.cpp \
+ bottombar.cpp \
+ vkb.cpp \
+ searchresults.cpp moc_groove.cpp \
moc_gscom.cpp \
moc_splayer.cpp \
moc_streamio.cpp \
moc_playlist.cpp \
moc_downloadmanager.cpp \
- moc_grooveprogressbar.cpp
+ moc_grooveprogressbar.cpp \
+ moc_topbar.cpp \
+ moc_bottombar.cpp \
+ moc_vkb.cpp \
+ moc_searchresults.cpp \
+ qrc_res.cpp
OBJECTS = main.o \
groove.o \
gscom.o \
playlist.o \
downloadmanager.o \
grooveprogressbar.o \
+ topbar.o \
+ bottombar.o \
+ vkb.o \
+ searchresults.o \
moc_groove.o \
moc_gscom.o \
moc_splayer.o \
moc_streamio.o \
moc_playlist.o \
moc_downloadmanager.o \
- moc_grooveprogressbar.o
+ moc_grooveprogressbar.o \
+ moc_topbar.o \
+ moc_bottombar.o \
+ moc_vkb.o \
+ moc_searchresults.o \
+ qrc_res.o
DIST = /usr/share/qt4/mkspecs/common/g++.conf \
/usr/share/qt4/mkspecs/common/unix.conf \
/usr/share/qt4/mkspecs/common/linux.conf \
/usr/share/qt4/mkspecs/features/qt_config.prf \
/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
/usr/share/qt4/mkspecs/features/default_pre.prf \
- /usr/share/qt4/mkspecs/features/release.prf \
+ /usr/share/qt4/mkspecs/features/debug.prf \
/usr/share/qt4/mkspecs/features/default_post.prf \
/usr/share/qt4/mkspecs/features/warn_on.prf \
/usr/share/qt4/mkspecs/features/qt.prf \
- /usr/share/qt4/mkspecs/features/unix/thread.prf \
/usr/share/qt4/mkspecs/features/moc.prf \
+ /usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
+ /usr/share/qt4/mkspecs/features/dbusadaptors.prf \
+ /usr/share/qt4/mkspecs/features/unix/thread.prf \
/usr/share/qt4/mkspecs/features/resources.prf \
/usr/share/qt4/mkspecs/features/uic.prf \
/usr/share/qt4/mkspecs/features/yacc.prf \
all: Makefile $(TARGET)
-$(TARGET): $(OBJECTS)
+$(TARGET): ui_topbar.h ui_bottombar.h ui_vkb.h ui_searchresults.h $(OBJECTS)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
Makefile: Groove.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \
/usr/share/qt4/mkspecs/features/qt_config.prf \
/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
/usr/share/qt4/mkspecs/features/default_pre.prf \
- /usr/share/qt4/mkspecs/features/release.prf \
+ /usr/share/qt4/mkspecs/features/debug.prf \
/usr/share/qt4/mkspecs/features/default_post.prf \
/usr/share/qt4/mkspecs/features/warn_on.prf \
/usr/share/qt4/mkspecs/features/qt.prf \
- /usr/share/qt4/mkspecs/features/unix/thread.prf \
/usr/share/qt4/mkspecs/features/moc.prf \
+ /usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
+ /usr/share/qt4/mkspecs/features/dbusadaptors.prf \
+ /usr/share/qt4/mkspecs/features/unix/thread.prf \
/usr/share/qt4/mkspecs/features/resources.prf \
/usr/share/qt4/mkspecs/features/uic.prf \
/usr/share/qt4/mkspecs/features/yacc.prf \
/usr/share/qt4/mkspecs/features/lex.prf \
/usr/share/qt4/mkspecs/features/include_source_dir.prf \
/usr/lib/libphonon.prl \
+ /usr/lib/libQtDBus.prl \
/usr/lib/libQtGui.prl \
/usr/lib/libQtNetwork.prl \
/usr/lib/libQtCore.prl
- $(QMAKE) -unix -o Makefile Groove.pro
+ $(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile Groove.pro
/usr/share/qt4/mkspecs/common/g++.conf:
/usr/share/qt4/mkspecs/common/unix.conf:
/usr/share/qt4/mkspecs/common/linux.conf:
/usr/share/qt4/mkspecs/features/qt_config.prf:
/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
/usr/share/qt4/mkspecs/features/default_pre.prf:
-/usr/share/qt4/mkspecs/features/release.prf:
+/usr/share/qt4/mkspecs/features/debug.prf:
/usr/share/qt4/mkspecs/features/default_post.prf:
/usr/share/qt4/mkspecs/features/warn_on.prf:
/usr/share/qt4/mkspecs/features/qt.prf:
-/usr/share/qt4/mkspecs/features/unix/thread.prf:
/usr/share/qt4/mkspecs/features/moc.prf:
+/usr/share/qt4/mkspecs/features/dbusinterfaces.prf:
+/usr/share/qt4/mkspecs/features/dbusadaptors.prf:
+/usr/share/qt4/mkspecs/features/unix/thread.prf:
/usr/share/qt4/mkspecs/features/resources.prf:
/usr/share/qt4/mkspecs/features/uic.prf:
/usr/share/qt4/mkspecs/features/yacc.prf:
/usr/share/qt4/mkspecs/features/lex.prf:
/usr/share/qt4/mkspecs/features/include_source_dir.prf:
/usr/lib/libphonon.prl:
+/usr/lib/libQtDBus.prl:
/usr/lib/libQtGui.prl:
/usr/lib/libQtNetwork.prl:
/usr/lib/libQtCore.prl:
qmake: FORCE
- @$(QMAKE) -unix -o Makefile Groove.pro
+ @$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile Groove.pro
dist:
@$(CHK_DIR_EXISTS) .tmp/groove1.0.0 || $(MKDIR) .tmp/groove1.0.0
- $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/groove1.0.0/ && $(COPY_FILE) --parents groove.h gscom.h splayer.h streamio.h playlist.h downloadmanager.h grooveprogressbar.h .tmp/groove1.0.0/ && $(COPY_FILE) --parents main.cpp groove.cpp gscom.cpp splayer.cpp streamio.cpp playlist.cpp downloadmanager.cpp grooveprogressbar.cpp .tmp/groove1.0.0/ && (cd `dirname .tmp/groove1.0.0` && $(TAR) groove1.0.0.tar groove1.0.0 && $(COMPRESS) groove1.0.0.tar) && $(MOVE) `dirname .tmp/groove1.0.0`/groove1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/groove1.0.0
+ $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/groove1.0.0/ && $(COPY_FILE) --parents groove.h gscom.h splayer.h streamio.h playlist.h downloadmanager.h grooveprogressbar.h topbar.h bottombar.h vkb.h searchresults.h .tmp/groove1.0.0/ && $(COPY_FILE) --parents res.qrc .tmp/groove1.0.0/ && $(COPY_FILE) --parents main.cpp groove.cpp gscom.cpp splayer.cpp streamio.cpp playlist.cpp downloadmanager.cpp grooveprogressbar.cpp topbar.cpp bottombar.cpp vkb.cpp searchresults.cpp .tmp/groove1.0.0/ && $(COPY_FILE) --parents topbar.ui bottombar.ui vkb.ui searchresults.ui .tmp/groove1.0.0/ && (cd `dirname .tmp/groove1.0.0` && $(TAR) groove1.0.0.tar groove1.0.0 && $(COMPRESS) groove1.0.0.tar) && $(MOVE) `dirname .tmp/groove1.0.0`/groove1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/groove1.0.0
clean:compiler_clean
mocables: compiler_moc_header_make_all compiler_moc_source_make_all
-compiler_moc_header_make_all: moc_groove.cpp moc_gscom.cpp moc_splayer.cpp moc_streamio.cpp moc_playlist.cpp moc_downloadmanager.cpp moc_grooveprogressbar.cpp
+compiler_moc_header_make_all: moc_groove.cpp moc_gscom.cpp moc_splayer.cpp moc_streamio.cpp moc_playlist.cpp moc_downloadmanager.cpp moc_grooveprogressbar.cpp moc_topbar.cpp moc_bottombar.cpp moc_vkb.cpp moc_searchresults.cpp
compiler_moc_header_clean:
- -$(DEL_FILE) moc_groove.cpp moc_gscom.cpp moc_splayer.cpp moc_streamio.cpp moc_playlist.cpp moc_downloadmanager.cpp moc_grooveprogressbar.cpp
+ -$(DEL_FILE) moc_groove.cpp moc_gscom.cpp moc_splayer.cpp moc_streamio.cpp moc_playlist.cpp moc_downloadmanager.cpp moc_grooveprogressbar.cpp moc_topbar.cpp moc_bottombar.cpp moc_vkb.cpp moc_searchresults.cpp
moc_groove.cpp: gscom.h \
splayer.h \
streamio.h \
grooveprogressbar.h \
qmaemo5rotator.h \
playlist.h \
+ topbar.h \
+ vkb.h \
groove.h
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) groove.h -o moc_groove.cpp
grooveprogressbar.h
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) grooveprogressbar.h -o moc_grooveprogressbar.cpp
-compiler_rcc_make_all:
+moc_topbar.cpp: vkb.h \
+ topbar.h
+ /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) topbar.h -o moc_topbar.cpp
+
+moc_bottombar.cpp: bottombar.h
+ /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) bottombar.h -o moc_bottombar.cpp
+
+moc_vkb.cpp: vkb.h
+ /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) vkb.h -o moc_vkb.cpp
+
+moc_searchresults.cpp: searchresults.h
+ /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) searchresults.h -o moc_searchresults.cpp
+
+compiler_dbus_interface_source_make_all:
+compiler_dbus_interface_source_clean:
+compiler_dbus_adaptor_source_make_all:
+compiler_dbus_adaptor_source_clean:
+compiler_rcc_make_all: qrc_res.cpp
compiler_rcc_clean:
+ -$(DEL_FILE) qrc_res.cpp
+qrc_res.cpp: res.qrc \
+ general_fullsize.png \
+ wmTaskModified.png \
+ groove.png \
+ general_search.png \
+ general_add.png \
+ wmTaskSwitcherIconPressed.png \
+ camera_camera_setting.png \
+ general_forward.png \
+ camera_video_pause.png \
+ general_close.png \
+ general_foldertree.png \
+ camera_video_stop.png \
+ wmTaskSwitcherIcon.png \
+ general_back.png \
+ wmTaskSwitcherIconHighlight.png
+ /usr/bin/rcc -name res res.qrc -o qrc_res.cpp
+
compiler_image_collection_make_all: qmake_image_collection.cpp
compiler_image_collection_clean:
-$(DEL_FILE) qmake_image_collection.cpp
compiler_moc_source_make_all:
compiler_moc_source_clean:
-compiler_uic_make_all:
+compiler_dbus_interface_header_make_all:
+compiler_dbus_interface_header_clean:
+compiler_dbus_interface_moc_make_all:
+compiler_dbus_interface_moc_clean:
+compiler_dbus_adaptor_header_make_all:
+compiler_dbus_adaptor_header_clean:
+compiler_dbus_adaptor_moc_make_all:
+compiler_dbus_adaptor_moc_clean:
+compiler_uic_make_all: ui_topbar.h ui_bottombar.h ui_vkb.h ui_searchresults.h
compiler_uic_clean:
+ -$(DEL_FILE) ui_topbar.h ui_bottombar.h ui_vkb.h ui_searchresults.h
+ui_topbar.h: topbar.ui
+ /usr/bin/uic-qt4 topbar.ui -o ui_topbar.h
+
+ui_bottombar.h: bottombar.ui
+ /usr/bin/uic-qt4 bottombar.ui -o ui_bottombar.h
+
+ui_vkb.h: vkb.ui
+ /usr/bin/uic-qt4 vkb.ui -o ui_vkb.h
+
+ui_searchresults.h: searchresults.ui
+ /usr/bin/uic-qt4 searchresults.ui -o ui_searchresults.h
+
compiler_yacc_decl_make_all:
compiler_yacc_decl_clean:
compiler_yacc_impl_make_all:
compiler_yacc_impl_clean:
compiler_lex_make_all:
compiler_lex_clean:
-compiler_clean: compiler_moc_header_clean
+compiler_clean: compiler_moc_header_clean compiler_rcc_clean compiler_uic_clean
####### Compile
streamio.h \
grooveprogressbar.h \
qmaemo5rotator.h \
- playlist.h
+ playlist.h \
+ topbar.h \
+ vkb.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
groove.o: groove.cpp groove.h \
streamio.h \
grooveprogressbar.h \
qmaemo5rotator.h \
- playlist.h
+ playlist.h \
+ topbar.h \
+ vkb.h \
+ bottombar.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o groove.o groove.cpp
gscom.o: gscom.cpp gscom.h
qmaemo5rotator.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o grooveprogressbar.o grooveprogressbar.cpp
+topbar.o: topbar.cpp topbar.h \
+ vkb.h \
+ ui_topbar.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o topbar.o topbar.cpp
+
+bottombar.o: bottombar.cpp bottombar.h \
+ ui_bottombar.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o bottombar.o bottombar.cpp
+
+vkb.o: vkb.cpp vkb.h \
+ ui_vkb.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o vkb.o vkb.cpp
+
+searchresults.o: searchresults.cpp searchresults.h \
+ ui_searchresults.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o searchresults.o searchresults.cpp
+
moc_groove.o: moc_groove.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_groove.o moc_groove.cpp
moc_grooveprogressbar.o: moc_grooveprogressbar.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_grooveprogressbar.o moc_grooveprogressbar.cpp
+moc_topbar.o: moc_topbar.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_topbar.o moc_topbar.cpp
+
+moc_bottombar.o: moc_bottombar.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_bottombar.o moc_bottombar.cpp
+
+moc_vkb.o: moc_vkb.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_vkb.o moc_vkb.cpp
+
+moc_searchresults.o: moc_searchresults.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_searchresults.o moc_searchresults.cpp
+
+qrc_res.o: qrc_res.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_res.o qrc_res.cpp
+
####### Install
install_target: first FORCE
@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/bin/
-$(INSTALL_PROGRAM) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)"
- -$(STRIP) "$(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)"
uninstall_target: FORCE
-$(DEL_FILE) "$(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)"
#include "bottombar.h"
#include "ui_bottombar.h"
+
bottomBar::bottomBar(QWidget *parent) :
QWidget(parent),
ui(new Ui::bottomBar)
{
delete ui;
}
-void bottomBar::setPlaybackProgress(int min, int max)
+void bottomBar::setPlaybackProgress(qint64 min,qint64 max)
{
- this->playbackProgress->setRect(0,0,(min/max)*main->width(),15);
- ui->graphicsView->update();
+
+ this->playbackProgress->setRect(0,0,((float)min/(float)max)*QApplication::desktop()->screenGeometry().width(),15);
+ //ui->graphicsView->update();
}
void bottomBar::on_nextB_clicked()
explicit bottomBar(QWidget *parent = 0);
~bottomBar();
public slots:
- void setPlaybackProgress(int min,int max);
+ void setPlaybackProgress(qint64 min,qint64 max);
signals:
void addB();
void nextB();
#include "qmaemo5rotator.h"
#endif
#include <QtDBus>
-#include "bottombar.h"
groove::groove(QWidget *parent) :
QWidget(parent)
pushMenu->addAction("Song:");
//pushMenu->addAction("Artist:");
//pushMenu->addAction("Album:");
- pd = new grooveProgressBar(this);
- pd->hide();
QMenu *moreAction = new QMenu();
//moreAction->addAction("Playlist");
connect(moreAction->addAction("Play Now"),SIGNAL(triggered()),this,SLOT(play()));
- connect(moreAction->addAction("Show download Progress"),SIGNAL(triggered()),pd,SLOT(show()));
+ //connect(moreAction->addAction("Show download Progress"),SIGNAL(triggered()),pd,SLOT(show()));
moreButton->setMenu(moreAction);
//sMethod->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Maximum);
//vlayout->addLayout(layout);
vlayout->addWidget(resultView);
//vlayout->addLayout(bottomLayout);
- bottomBar *bBar = new bottomBar();
+ bBar = new bottomBar();
vlayout->addWidget(bBar);
vlayout->setSpacing(0);
bottomLayout->addWidget(dButton);
connect(stopButton,SIGNAL(clicked()),this,SLOT(stop()));
connect(moreButton,SIGNAL(clicked()),this,SLOT(moreB()));
//connect(rotator,SIGNAL(orientationChanged(Orientation)),this,SLOT(orientationChanged()));
- pl = new playlist();
+ pl = new playlist(this);
pl->setGscom(gs);
player->setPlaylist(pl);
connect(pl,SIGNAL(downloadProgress(int,qint64,qint64)),this,SLOT(progressUpdate(int,qint64,qint64)));
- connect(pl,SIGNAL(bufferReady(int)),pd,SLOT(close()));
+ //connect(pl,SIGNAL(bufferReady(int)),pd,SLOT(close()));
connect(pl,SIGNAL(freeze(bool)),resultView,SLOT(setDisabled(bool)));
connect(pl,SIGNAL(freeze(bool)),pushMenu,SLOT(setDisabled(bool)));
connect(pl,SIGNAL(freeze(bool)),dButton,SLOT(setDisabled(bool)));
connect(bBar,SIGNAL(nextB()),player,SLOT(playNext()));
connect(bBar,SIGNAL(pause()),this,SLOT(stop()));
connect(bBar,SIGNAL(back()),player,SLOT(back()));
- bBar->setPlaybackProgress(80,100);
+ bBar->setPlaybackProgress(100,100);
}
void groove::performSearch(QString s)
return;
//gs->getSong();
player->play(pl->addSong(item));
- pd->setMaximum(100);
- pd->setValue(0);
- pd->show();
}
//selected.
//if
}
else
pl->addSong(item);
- pd->setMaximum(100);
- pd->setValue(0);
- pd->show();
model->item(selected.first().row(),1)->setText("Added to Playlist");;
}
}
{
//if(!pd->isHidden())
//{
-
-
- pd->setMaximum(t);
- pd->setValue(d);
+ bBar->setPlaybackProgress(d,t);
//}
}
#include "grooveprogressbar.h"
#include "topbar.h"
#include "vkb.h"
+#include "bottombar.h"
class groove : public QWidget
{
void addSongPlaylist();
void showOthers();
private:
+ bottomBar *bBar;
sPlayer *player;
QMenuBar *mBar;
QPushButton *sMethod;
QMaemo5Rotator *rot;
#endif
playlist *pl;
- grooveProgressBar *pd;
};
void playlist::freeMemory(int position)
{
pList->at(position)->downloaded = false;
+ pList->at(position)->bufferready = false;
delete pList->at(position)->buffer;
pList->at(position)->buffer = new QBuffer();
}
bool playlist::existAt(int position)
{
+ if(position < 0)
+ return false;
return (pList->size() > position);
}
}
bool playlist::setCurrentPlaying(int position)
{
- if(pList->size() > position)
+ if(this->existAt(position))
{
this->currentplayingitem = position;
if(!pList->at(position)->downloaded && this->currentdownloaditem != this->currentplayingitem)
return true;
}
else
+ {
+ if(position = -1)
+ {
+ this->currentplayingitem = -1;
+ }
+ else
return false;
+ }
}
QIODevice * playlist::getBuffer(int position)
{
void playlist::getNError(QNetworkReply::NetworkError error)
{
qDebug() << "Network Error (if this is 99 then it will retry" << error;
- if(error == QNetworkReply::UnknownNetworkError)
+ if(error == QNetworkReply::UnknownNetworkError && this->currentdownloaditem != -1)
beginDownload(this->currentdownloaditem);
}
void playlist::downloadDone(int position)
{
- if(this->existAt(position+1) && this->currentSkeyItem == -1)
+ if(this->existAt(position+1) && this->currentSkeyItem == -1 && !pList->at(position+1)->downloaded && this->currentdownloaditem != position+1)
beginDownload(position+1);
else
this->currentdownloaditem = -1;
internal = parent;
//buffer->open(QIODevice::ReadWrite);
connect(media,SIGNAL(finished()),this,SLOT(markComplete()));
+ media->setTickInterval(200);
+ connect(media,SIGNAL(tick(qint64)),this,SLOT(updatePlayPosition(qint64)));
}
void sPlayer::setPlaylist(playlist *playList)
{
else
pl->setCurrentPlaying(-1);
}
+void sPlayer::updatePlayPosition(qint64 time)
+{
+ //qDebug() << time << ":" << media->totalTime();
+}
+
void sPlayer::pause()
{
if(media->state() == Phonon::PausedState)
void back();
private slots:
void markComplete();
+ void updatePlayPosition(qint64 time);
private:
QNetworkAccessManager *manager;
Phonon::AudioOutput *audioOutput;
QTime startStreamT;
grooveProgressBar *pd;
playlist *pl;
+
};
#endif // SPLAYER_H