Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Subsonic: add LibraryFilterWidget and basic context menu

This commit is contained in:
Alan Briolat 2013-01-17 21:01:54 +00:00
parent 34553d8238
commit e8ab6ed40a
2 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/internet/subsonicservice.cpp
View File

@ -7,6 +7,7 @@
#include "core/utilities.h"
#include "ui/iconloader.h"
#include "library/librarybackend.h"
#include "library/libraryfilterwidget.h"
#include "core/mergedproxymodel.h"
#include "core/database.h"
#include "core/closure.h"
@ -17,6 +18,7 @@
#include <QSslConfiguration>
#include <QXmlStreamReader>
#include <QSortFilterProxyModel>
#include <QMenu>
const char* SubsonicService::kServiceName = "Subsonic";
const char* SubsonicService::kSettingsGroup = "Subsonic";
@ -31,8 +33,11 @@ SubsonicService::SubsonicService(Application* app, InternetModel *parent)
network_(new QNetworkAccessManager(this)),
url_handler_(new SubsonicUrlHandler(this, this)),
scanner_(new SubsonicLibraryScanner(this, this)),
context_menu_(NULL),
root_(NULL),
library_backend_(NULL),
library_model_(NULL),
library_filter_(NULL),
library_sort_model_(new QSortFilterProxyModel(this)),
login_state_(LoginState_OtherError)
{
@ -53,6 +58,12 @@ SubsonicService::SubsonicService(Application* app, InternetModel *parent)
library_model_->set_show_various_artists(false);
library_model_->set_show_smart_playlists(false);
library_filter_ = new LibraryFilterWidget(0);
library_filter_->SetSettingsGroup(kSettingsGroup);
library_filter_->SetLibraryModel(library_model_);
library_filter_->SetFilterHint(tr("Search Subsonic"));
library_filter_->SetAgeFilterEnabled(false);
library_sort_model_->setSourceModel(library_model_);
library_sort_model_->setSortRole(LibraryModel::Role_SortText);
library_sort_model_->setDynamicSortFilter(true);
@ -60,6 +71,11 @@ SubsonicService::SubsonicService(Application* app, InternetModel *parent)
connect(this, SIGNAL(LoginStateChanged(SubsonicService::LoginState)),
SLOT(onLoginStateChanged(SubsonicService::LoginState)));
context_menu_ = new QMenu;
context_menu_->addActions(GetPlaylistActions());
context_menu_->addSeparator();
context_menu_->addMenu(library_filter_->menu());
}
SubsonicService::~SubsonicService()
@ -68,9 +84,9 @@ SubsonicService::~SubsonicService()
QStandardItem* SubsonicService::CreateRootItem()
{
QStandardItem* item = new QStandardItem(QIcon(":providers/subsonic.png"), kServiceName);
item->setData(true, InternetModel::Role_CanLazyLoad);
return item;
root_ = new QStandardItem(QIcon(":providers/subsonic.png"), kServiceName);
root_->setData(true, InternetModel::Role_CanLazyLoad);
return root_;
}
void SubsonicService::LazyPopulate(QStandardItem *item)
@ -89,6 +105,21 @@ void SubsonicService::LazyPopulate(QStandardItem *item)
}
}
void SubsonicService::ShowContextMenu(const QPoint &global_pos)
{
const bool is_valid = model()->current_index().model() == library_sort_model_;
GetAppendToPlaylistAction()->setEnabled(is_valid);
GetReplacePlaylistAction()->setEnabled(is_valid);
GetOpenInNewPlaylistAction()->setEnabled(is_valid);
context_menu_->popup(global_pos);
}
QWidget* SubsonicService::HeaderWidget() const
{
return library_filter_;
}
void SubsonicService::ReloadSettings()
{
QSettings s;
@ -149,11 +180,6 @@ QNetworkReply* SubsonicService::Send(const QUrl &url)
return reply;
}
QModelIndex SubsonicService::GetCurrentIndex()
{
return context_item_;
}
void SubsonicService::onLoginStateChanged(SubsonicService::LoginState newstate)
{
// TODO: library refresh logic?

12
src/internet/subsonicservice.h
View File

@ -60,6 +60,8 @@ class SubsonicService : public InternetService
QStandardItem* CreateRootItem();
void LazyPopulate(QStandardItem *item);
void ShowContextMenu(const QPoint &global_pos);
QWidget* HeaderWidget() const;
void ReloadSettings();
void Login();
@ -86,17 +88,19 @@ class SubsonicService : public InternetService
signals:
void LoginStateChanged(SubsonicService::LoginState newstate);
protected:
QModelIndex GetCurrentIndex();
private:
QModelIndex context_item_;
void EnsureMenuCreated();
QNetworkAccessManager* network_;
SubsonicUrlHandler* url_handler_;
SubsonicLibraryScanner* scanner_;
QMenu* context_menu_;
QStandardItem* root_;
LibraryBackend* library_backend_;
LibraryModel* library_model_;
LibraryFilterWidget* library_filter_;
QSortFilterProxyModel* library_sort_model_;
// Configuration