iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Expand podcasts by default - if it is the only service, or if it and soundcloud are the only services

Browse Source
This commit is contained in:
craig.p.drummond
2013-10-01 18:27:27 +00:00
committed by craig.p.drummond
parent 3f36596d25
commit ccbb0dd87f
11 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
models/onlineservicesmodel.h
View File

@@ -83,6 +83,7 @@ public:
void deleteDownloadedPodcasts(MusicLibraryItemPodcast *pod, const QList<MusicLibraryItemPodcastEpisode *> &episodes);
bool isDownloading() const;
void cancelAll();
bool isHidden(OnlineService *srv) { return hiddenServices.contains(srv); }
QImage requestImage(const QString &id, const QString &artist, const QString &album, const QString &url,
const QString cacheName=QString(), int maxSize=-1);

2
online/onlineservice.h
View File

@@ -132,9 +132,9 @@ public:
const MusicLibraryItem * findSong(const Song &s) const;
bool songExists(const Song &s) const;
bool isConfigured() { return configured; }
QModelIndex index() const;
protected:
QModelIndex index() const;
QModelIndex createIndex(MusicLibraryItem *child) const;
void emitUpdated();
void emitError(const QString &msg);

22
online/onlineservicespage.cpp
View File

@@ -122,6 +122,9 @@ void OnlineServicesPage::setEnabled(bool e)
controlActions();
if (e) {
proxy.sort();
// TODO: Why do we need to call tis via a timer, whith such a large timeout?
// If we use a timeout < 75, then nothing gets expanded - eventhough the indexes are valid!
QTimer::singleShot(100, this, SLOT(expandPodcasts()));
}
}
@@ -767,3 +770,22 @@ void OnlineServicesPage::sortList()
{
proxy.sort();
}
void OnlineServicesPage::expandPodcasts()
{
// If we only have PodCast service enabled, or only PodCast and SoundCloud, then
// expand PodCast by default...
if (OnlineServicesModel::self()->rowCount()>0 && OnlineServicesModel::self()->rowCount()<3) {
OnlineService *pod=OnlineServicesModel::self()->service(PodcastService::constName);
if (!OnlineServicesModel::self()->isHidden(pod)) {
if (2==OnlineServicesModel::self()->rowCount()) {
OnlineService *sound=OnlineServicesModel::self()->service(SoundCloudService::constName);
if (OnlineServicesModel::self()->isHidden(sound)) {
return;
}
}
view->expand(proxy.mapFromSource(pod->index()), true);
}
}
}

1
online/onlineservicespage.h
View File

@@ -68,6 +68,7 @@ public Q_SLOTS:
void searchForPodcasts();
void downloadPodcast();
void deleteDownloadedPodcast();
void expandPodcasts();
Q_SIGNALS:
// These are for communicating with MPD object (which is in its own thread, so need to talk via signal/slots)

2
streams/streamspage.cpp
View File

@@ -158,7 +158,7 @@ void StreamsPage::refresh()
searchView->setLevel(0);
StreamsModel::self()->reloadFavourites();
exportAction->setEnabled(StreamsModel::self()->rowCount()>0);
view->expand(proxy->mapFromSource(StreamsModel::self()->favouritesIndex()));
view->expand(proxy->mapFromSource(StreamsModel::self()->favouritesIndex()), true);
}
}

10
widgets/groupedview.cpp
View File

@@ -820,14 +820,16 @@ void GroupedView::itemClicked(const QModelIndex &idx)
}
}
void GroupedView::expand(const QModelIndex &idx)
void GroupedView::expand(const QModelIndex &idx, bool singleOnly)
{
if (idx.isValid()) {
if (idx.data(GroupedView::Role_IsCollection).toBool()) {
setExpanded(idx, true);
quint32 count=model()->rowCount(idx);
for (quint32 i=0; i<count; ++i) {
expand(idx.child(i, 0));
if (!singleOnly) {
quint32 count=model()->rowCount(idx);
for (quint32 i=0; i<count; ++i) {
expand(idx.child(i, 0));
}
}
}
else if (AlbumHeader==getType(idx)) {

2
widgets/groupedview.h
View File

@@ -82,7 +82,7 @@ public:
QModelIndexList selectedIndexes(bool sorted) const;
void dropEvent(QDropEvent *event);
void collectionRemoved(quint32 key);
void expand(const QModelIndex &idx);
void expand(const QModelIndex &idx, bool singleOnly=false);
public Q_SLOTS:
void updateRows(const QModelIndex &parent);

6
widgets/itemview.cpp
View File

@@ -878,12 +878,12 @@ void ItemView::expandAll(const QModelIndex &index)
}
}
void ItemView::expand(const QModelIndex &index)
void ItemView::expand(const QModelIndex &index, bool singleOnly)
{
if (Mode_SimpleTree==mode || Mode_DetailedTree==mode) {
treeView->expand(index);
treeView->expand(index, singleOnly);
} else if (Mode_GroupedTree==mode && groupedView) {
groupedView->expand(index);
groupedView->expand(index, singleOnly);
}
}

2
widgets/itemview.h
View File

@@ -126,7 +126,7 @@ public:
void setStartClosed(bool sc);
bool isStartClosed();
void expandAll(const QModelIndex &index=QModelIndex());
void expand(const QModelIndex &index);
void expand(const QModelIndex &index, bool singleOnly=false);
void showMessage(const QString &message, int timeout);
void setBackgroundImage(const QIcon &icon);

10
widgets/treeview.cpp
View File

@@ -270,13 +270,15 @@ void TreeView::expandAll(const QModelIndex &idx)
}
}
void TreeView::expand(const QModelIndex &idx)
void TreeView::expand(const QModelIndex &idx, bool singleOnly)
{
if (idx.isValid()) {
setExpanded(idx, true);
quint32 count=model()->rowCount(idx);
for (quint32 i=0; i<count; ++i) {
expand(idx.child(i, 0));
if (!singleOnly) {
quint32 count=model()->rowCount(idx);
for (quint32 i=0; i<count; ++i) {
expand(idx.child(i, 0));
}
}
}
}

2
widgets/treeview.h
View File

@@ -54,7 +54,7 @@ public:
QModelIndexList selectedIndexes() const { return selectedIndexes(true); }
QModelIndexList selectedIndexes(bool sorted) const;
void expandAll(const QModelIndex &idx=QModelIndex());
virtual void expand(const QModelIndex &idx);
virtual void expand(const QModelIndex &idx, bool singleOnly=false);
virtual void setModel(QAbstractItemModel *m);
bool checkBoxClicked(const QModelIndex &idx) const;
void setUseSimpleDelegate();