Commit 26029929 authored by Mike Sheldon's avatar Mike Sheldon

Display a message in the meego client when trying to access a station with no content

parent 69667fca
#############################################################################
# Makefile for building: librefm
# Generated by qmake (2.01a) (Qt 4.7.4) on: Fri Jul 1 01:50:42 2011
# Project: librefm.pro
# Template: subdirs
# Command: /usr/bin/qmake -o Makefile librefm.pro
#############################################################################
first: make_default
MAKEFILE = Makefile
QMAKE = /usr/bin/qmake
DEL_FILE = rm -f
CHK_DIR_EXISTS= test -d
MKDIR = mkdir -p
COPY = cp -f
COPY_FILE = $(COPY)
COPY_DIR = $(COPY) -r
INSTALL_FILE = install -m 644 -p
INSTALL_PROGRAM = install -m 755 -p
INSTALL_DIR = $(COPY_DIR)
DEL_FILE = rm -f
SYMLINK = ln -f -s
DEL_DIR = rmdir
MOVE = mv -f
CHK_DIR_EXISTS= test -d
MKDIR = mkdir -p
SUBTARGETS = \
sub-src
src/$(MAKEFILE):
@$(CHK_DIR_EXISTS) src/ || $(MKDIR) src/
cd src/ && $(QMAKE) /home/mike/scratchbox/src/Libre.fm/librefm-0.1/src/src.pro -o $(MAKEFILE)
sub-src-qmake_all: FORCE
@$(CHK_DIR_EXISTS) src/ || $(MKDIR) src/
cd src/ && $(QMAKE) /home/mike/scratchbox/src/Libre.fm/librefm-0.1/src/src.pro -o $(MAKEFILE)
sub-src: src/$(MAKEFILE) FORCE
cd src/ && $(MAKE) -f $(MAKEFILE)
sub-src-make_default: src/$(MAKEFILE) FORCE
cd src/ && $(MAKE) -f $(MAKEFILE)
sub-src-make_first: src/$(MAKEFILE) FORCE
cd src/ && $(MAKE) -f $(MAKEFILE) first
sub-src-all: src/$(MAKEFILE) FORCE
cd src/ && $(MAKE) -f $(MAKEFILE) all
sub-src-clean: src/$(MAKEFILE) FORCE
cd src/ && $(MAKE) -f $(MAKEFILE) clean
sub-src-distclean: src/$(MAKEFILE) FORCE
cd src/ && $(MAKE) -f $(MAKEFILE) distclean
sub-src-install_subtargets: src/$(MAKEFILE) FORCE
cd src/ && $(MAKE) -f $(MAKEFILE) install
sub-src-uninstall_subtargets: src/$(MAKEFILE) FORCE
cd src/ && $(MAKE) -f $(MAKEFILE) uninstall
Makefile: librefm.pro /targets/HARMATTAN_X86/usr/share/qt4/mkspecs/linux-g++-maemo/qmake.conf /targets/HARMATTAN_X86/usr/share/qt4/mkspecs/common/g++.conf \
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/common/unix.conf \
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/common/linux.conf \
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/qconfig.pri \
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/qt_functions.prf \
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/qt_config.prf \
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/default_pre.prf \
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/debug.prf \
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/default_post.prf \
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/warn_on.prf \
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/qt.prf \
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/unix/thread.prf \
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/moc.prf \
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/resources.prf \
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/uic.prf \
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/yacc.prf \
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/lex.prf \
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf
$(QMAKE) -o Makefile librefm.pro
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/common/g++.conf:
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/common/unix.conf:
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/common/linux.conf:
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/qconfig.pri:
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/qt_functions.prf:
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/qt_config.prf:
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/default_pre.prf:
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/debug.prf:
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/default_post.prf:
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/warn_on.prf:
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/qt.prf:
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/unix/thread.prf:
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/moc.prf:
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/resources.prf:
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/uic.prf:
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/yacc.prf:
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/lex.prf:
/targets/HARMATTAN_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf:
qmake: qmake_all FORCE
@$(QMAKE) -o Makefile librefm.pro
qmake_all: sub-src-qmake_all FORCE
make_default: sub-src-make_default FORCE
make_first: sub-src-make_first FORCE
all: sub-src-all FORCE
clean: sub-src-clean FORCE
distclean: sub-src-distclean FORCE
-$(DEL_FILE) Makefile
install_subtargets: sub-src-install_subtargets FORCE
uninstall_subtargets: sub-src-uninstall_subtargets FORCE
sub-src-check: src/$(MAKEFILE)
cd src/ && $(MAKE) check
check: sub-src-check
mocclean: compiler_moc_header_clean compiler_moc_source_clean
mocables: compiler_moc_header_make_all compiler_moc_source_make_all
install: install_subtargets FORCE
uninstall: uninstall_subtargets FORCE
FORCE:
......@@ -2,7 +2,7 @@ Source: librefm
Section: user/Other
Priority: extra
Maintainer: Michael Sheldon <elleo@gnu.org>
Build-Depends: debhelper (>= 7), dpatch
Build-Depends: debhelper (>= 7), dpatch, libqt4-dev
Standards-Version: 3.8.4
Homepage: http://libre.fm
......
librefm_0.1-1_i386.deb user/Other extra
librefm_0.1-1_armel.deb user/Other extra
shlibs:Depends=libc6 (>= 2.0), libc6 (>= 2.3.6-6~), libgcc1 (>= 1:4.1.1), libqt4-declarative (>= 4.7.4~git20110516), libqt4-network (>= 4.7.4~git20110516), libqt4-xml (>= 4.7.4~git20110516), libqtcore4 (>= 4.7.4~git20110516), libqtgui4 (>= 4.7.4~git20110516), libstdc++6 (>= 4.1.1)
shlibs:Depends=libc6 (>= 2.4), libgcc1 (>= 1:4.1.1), libqt4-declarative (>= 4.7.4~git20110516), libqt4-network (>= 4.7.4~git20110516), libqt4-phonon (>= 4.7.4~git20110516), libqt4-xml (>= 4.7.4~git20110516), libqtcore4 (>= 4.7.4~git20110516), libqtgui4 (>= 4.7.4~git20110516), libstdc++6 (>= 4.4.0)
misc:Depends=
......@@ -30,6 +30,7 @@
<value type="QString">LOCAL</value>
<value type="QString">1</value>
</valuelist>
<value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
</valuemap>
<valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
<value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
......@@ -79,6 +80,7 @@
<value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
<valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
<value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
</valuemap>
<valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
<value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
......
This diff is collapsed.
......@@ -10,20 +10,25 @@ Page {
target: serverComm
onTuned: {
lblStationName.text = stationName;
lblArtist.text = "Fetching playlist..."
lblArtist.text = "Fetching playlist...";
}
onPlaying: {
lblArtist.text = artist;
lblSpacer.text = " - "
lblSpacer.text = " - ";
lblTrack.text = title;
imgCover.source = imageurl
imgCover.source = imageurl;
}
onPositionUpdate: {
songProgress.value = position;
}
onNoContent: {
pause();
msg_no_content.open();
}
}
states: [
......@@ -225,4 +230,14 @@ Page {
}
QueryDialog {
id: msg_no_content
titleText: "No more content"
message: "This station doesn't appear to have any more content. If this is one of your loved, mix, recommendation or neighbourhood stations then you may need to love a few more songs first."
rejectButtonText: "Okay"
onAccepted: pageStack.pop();
onRejected: pageStack.pop();
}
}
......@@ -190,7 +190,10 @@ void ServerComm::playlistReply(QNetworkReply *reply) {
}
}
}
if(currentSong == -1) {
if(playlist->length() == currentSong + 1) {
noContent();
} else if(currentSong == -1) {
loadSong(0);
}
}
......
......@@ -37,6 +37,7 @@ signals:
void tuned(QString stationName);
void playing(QString artist, QString album, QString title, QString imageurl);
void positionUpdate(double position);
void noContent();
private slots:
void wsLoginReply(QNetworkReply *reply);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment