From: EliasWoods@gmail.com Date: Thu, 22 Jul 2010 17:48:42 +0000 (-0400) Subject: UI bugfixes X-Git-Url: http://git.maemo.org/git/?p=groove;a=commitdiff_plain;h=810ad0d7cae54b293ddebe4e3874fd2f0e6e38a1;hp=4adbefb36e52cb33564e704d8ea6a49425db8caf UI bugfixes --- diff --git a/Groove.pro.user b/Groove.pro.user index 158a9e8..4e3a7ce 100644 --- a/Groove.pro.user +++ b/Groove.pro.user @@ -2,7 +2,7 @@ ProjectExplorer.Project.ActiveTarget - 0 + 1 ProjectExplorer.Project.EditorSettings @@ -13,36 +13,24 @@ ProjectExplorer.Project.Target.0 - Maemo - Qt4ProjectManager.Target.MaemoDeviceTarget + Desktop + Qt4ProjectManager.Target.DesktopTarget 0 0 qmake QtProjectManager.QMakeBuildStep - - INCLUDEPATH+=../qjson/src - + Make Qt4ProjectManager.MakeStep false - - -j2 - + - - - Qt4ProjectManager.MaemoPackageCreationStep - - true - /usr/local/bin/groove - - - 3 + 2 Make Qt4ProjectManager.MakeStep @@ -58,10 +46,10 @@ Debug Qt4ProjectManager.Qt4BuildConfiguration 2 - /home/eli/Projects/Groove-build-maemo - 3 - 9 - true + /scratchbox/users/eli/home/eli/qt4/Groove + 6 + 0 + false @@ -76,15 +64,7 @@ - - - Qt4ProjectManager.MaemoPackageCreationStep - - true - /usr/local/bin/groove - - - 3 + 2 Make Qt4ProjectManager.MakeStep @@ -100,27 +80,92 @@ Release Qt4ProjectManager.Qt4BuildConfiguration 0 - /home/eli/Projects/Groove-build-maemo - 3 + /scratchbox/users/eli/home/eli/qt4/Groove + 6 + 0 + false + + 2 + + Groove + Qt4ProjectManager.Qt4RunConfiguration + 2 + + Groove.pro + false + false + + false + false + + + 1 + + + + ProjectExplorer.Project.Target.1 + + Maemo + Qt4ProjectManager.Target.MaemoDeviceTarget + 0 + 0 + + + qmake + QtProjectManager.QMakeBuildStep + + INCLUDEPATH+=../qjson/src LIBS+=-L~/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1014-slim/usr/lib -lqjson + + + + Make + Qt4ProjectManager.MakeStep + false + + + + 2 + + Make + Qt4ProjectManager.MakeStep + true + + clean + + + + 1 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + /scratchbox/users/eli/home/eli/qt4/Groove-build + 5 9 true - 2 + 1 Groove.pro - New Maemo Run Configuration + Groove on Maemo device Qt4ProjectManager.MaemoRunConfiguration - - 0 - + + 2010-07-20T16:55:17 + + 1 + + 2010-07-21T16:20:24 + + 1 ProjectExplorer.Project.TargetCount - 1 + 2 ProjectExplorer.Project.Updater.FileVersion diff --git a/Makefile b/Makefile index 73d0690..39e106d 100644 --- a/Makefile +++ b/Makefile @@ -1,22 +1,22 @@ ############################################################################# # 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 @@ -50,13 +50,22 @@ SOURCES = main.cpp \ 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 \ @@ -65,13 +74,22 @@ OBJECTS = main.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 \ @@ -80,12 +98,14 @@ DIST = /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 \ @@ -120,7 +140,7 @@ first: all 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 \ @@ -131,22 +151,25 @@ Makefile: Groove.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4 /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: @@ -155,27 +178,30 @@ Makefile: Groove.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4 /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 @@ -194,15 +220,17 @@ mocclean: compiler_moc_header_clean compiler_moc_source_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 @@ -238,22 +266,79 @@ moc_grooveprogressbar.cpp: qmaemo5rotator.h \ 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 @@ -263,7 +348,9 @@ main.o: main.cpp groove.h \ 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 \ @@ -272,7 +359,10 @@ 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 @@ -305,6 +395,23 @@ grooveprogressbar.o: grooveprogressbar.cpp grooveprogressbar.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 @@ -326,12 +433,26 @@ moc_downloadmanager.o: moc_downloadmanager.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)" diff --git a/bottombar.cpp b/bottombar.cpp index 8a12aa0..a5a5b96 100644 --- a/bottombar.cpp +++ b/bottombar.cpp @@ -1,6 +1,7 @@ #include "bottombar.h" #include "ui_bottombar.h" + bottomBar::bottomBar(QWidget *parent) : QWidget(parent), ui(new Ui::bottomBar) @@ -20,10 +21,11 @@ bottomBar::~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() diff --git a/bottombar.h b/bottombar.h index 175fe9b..0108b2f 100644 --- a/bottombar.h +++ b/bottombar.h @@ -18,7 +18,7 @@ public: 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(); diff --git a/groove.cpp b/groove.cpp index 7d0df67..6405135 100644 --- a/groove.cpp +++ b/groove.cpp @@ -3,7 +3,6 @@ #include "qmaemo5rotator.h" #endif #include -#include "bottombar.h" groove::groove(QWidget *parent) : QWidget(parent) @@ -30,12 +29,10 @@ groove::groove(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); @@ -70,7 +67,7 @@ groove::groove(QWidget *parent) : //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); @@ -92,11 +89,11 @@ groove::groove(QWidget *parent) : 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))); @@ -108,7 +105,7 @@ groove::groove(QWidget *parent) : 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) @@ -179,9 +176,6 @@ void groove::play() return; //gs->getSong(); player->play(pl->addSong(item)); - pd->setMaximum(100); - pd->setValue(0); - pd->show(); } //selected. //if @@ -201,9 +195,6 @@ void groove::addSongPlaylist() } else pl->addSong(item); - pd->setMaximum(100); - pd->setValue(0); - pd->show(); model->item(selected.first().row(),1)->setText("Added to Playlist");; } } @@ -220,10 +211,7 @@ void groove::progressUpdate(int p, qint64 d, qint64 t) { //if(!pd->isHidden()) //{ - - - pd->setMaximum(t); - pd->setValue(d); + bBar->setPlaybackProgress(d,t); //} } diff --git a/groove.h b/groove.h index f29f337..325708d 100644 --- a/groove.h +++ b/groove.h @@ -11,6 +11,7 @@ #include "grooveprogressbar.h" #include "topbar.h" #include "vkb.h" +#include "bottombar.h" class groove : public QWidget { @@ -34,6 +35,7 @@ private slots: void addSongPlaylist(); void showOthers(); private: + bottomBar *bBar; sPlayer *player; QMenuBar *mBar; QPushButton *sMethod; @@ -47,7 +49,6 @@ private: QMaemo5Rotator *rot; #endif playlist *pl; - grooveProgressBar *pd; }; diff --git a/playlist.cpp b/playlist.cpp index e79229d..3d437a5 100644 --- a/playlist.cpp +++ b/playlist.cpp @@ -18,11 +18,14 @@ void playlist::markPlayed(int position) 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); } @@ -43,7 +46,7 @@ void playlist::setBufferRdy(int b) } 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) @@ -59,7 +62,14 @@ bool playlist::setCurrentPlaying(int position) return true; } else + { + if(position = -1) + { + this->currentplayingitem = -1; + } + else return false; + } } QIODevice * playlist::getBuffer(int position) { @@ -90,7 +100,7 @@ void playlist::beginDownload(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); } @@ -134,7 +144,7 @@ int playlist::addSong(QStandardItem *item) 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; diff --git a/splayer.cpp b/splayer.cpp index 23fe2a0..1a3ec0e 100644 --- a/splayer.cpp +++ b/splayer.cpp @@ -13,6 +13,8 @@ sPlayer::sPlayer(QObject *parent) : 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) { @@ -34,6 +36,11 @@ void sPlayer::markComplete() else pl->setCurrentPlaying(-1); } +void sPlayer::updatePlayPosition(qint64 time) +{ + //qDebug() << time << ":" << media->totalTime(); +} + void sPlayer::pause() { if(media->state() == Phonon::PausedState) diff --git a/splayer.h b/splayer.h index 9390c8b..920fa0d 100644 --- a/splayer.h +++ b/splayer.h @@ -33,6 +33,7 @@ public slots: void back(); private slots: void markComplete(); + void updatePlayPosition(qint64 time); private: QNetworkAccessManager *manager; Phonon::AudioOutput *audioOutput; @@ -45,5 +46,6 @@ private: QTime startStreamT; grooveProgressBar *pd; playlist *pl; + }; #endif // SPLAYER_H