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

Config dialog

This commit is contained in:
David Sansome 2010-02-03 16:17:04 +00:00
parent b4313e3410
commit eb6a836b53
20 changed files with 718 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/data.qrc
View File

@ -53,5 +53,7 @@
<file>somafm.png</file> <file>somafm.png</file>
<file>refresh.png</file> <file>refresh.png</file>
<file>web.png</file> <file>web.png</file>
<file>library.png</file>
<file>media-playback-start-32.png</file>
</qresource> </qresource>
</RCC> </RCC>

BIN
data/library.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
data/media-playback-start-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

13
src/library.cpp
View File

@ -2,7 +2,7 @@
#include "librarybackend.h" #include "librarybackend.h"
#include "libraryitem.h" #include "libraryitem.h"
#include "songmimedata.h" #include "songmimedata.h"
#include "libraryconfig.h" #include "librarydirectorymodel.h"
#include <QStringList> #include <QStringList>
#include <QUrl> #include <QUrl>
@ -15,9 +15,9 @@ Library::Library(EngineBase* engine, QObject* parent)
engine_(engine), engine_(engine),
backend_(new BackgroundThread<LibraryBackend>(this)), backend_(new BackgroundThread<LibraryBackend>(this)),
watcher_(new BackgroundThread<LibraryWatcher>(this)), watcher_(new BackgroundThread<LibraryWatcher>(this)),
dir_model_(new LibraryDirectoryModel(this)),
artist_icon_(":artist.png"), artist_icon_(":artist.png"),
album_icon_(":album.png"), album_icon_(":album.png")
config_(new LibraryConfig)
{ {
root_->lazy_loaded = true; root_->lazy_loaded = true;
@ -28,7 +28,6 @@ Library::Library(EngineBase* engine, QObject* parent)
Library::~Library() { Library::~Library() {
delete root_; delete root_;
delete config_;
} }
void Library::StartThreads() { void Library::StartThreads() {
@ -44,7 +43,7 @@ void Library::BackendInitialised() {
connect(backend_->Worker().get(), SIGNAL(Error(QString)), SIGNAL(Error(QString))); connect(backend_->Worker().get(), SIGNAL(Error(QString)), SIGNAL(Error(QString)));
connect(backend_->Worker().get(), SIGNAL(TotalSongCountUpdated(int)), SIGNAL(TotalSongCountUpdated(int))); connect(backend_->Worker().get(), SIGNAL(TotalSongCountUpdated(int)), SIGNAL(TotalSongCountUpdated(int)));
config_->SetBackend(backend_->Worker()); dir_model_->SetBackend(backend_->Worker());
if (--waiting_for_threads_ == 0) if (--waiting_for_threads_ == 0)
Initialise(); Initialise();
@ -496,10 +495,6 @@ SongList Library::GetChildSongs(const QModelIndex& index) const {
return ret; return ret;
} }
void Library::ShowConfig() {
config_->show();
}
void Library::SetFilterAge(int age) { void Library::SetFilterAge(int age) {
query_options_.max_age = age; query_options_.max_age = age;
Reset(); Reset();

9
src/library.h
View File

@ -13,7 +13,7 @@
#include "libraryitem.h" #include "libraryitem.h"
#include "simpletreemodel.h" #include "simpletreemodel.h"
class LibraryConfig; class LibraryDirectoryModel;
class Library : public SimpleTreeModel<LibraryItem> { class Library : public SimpleTreeModel<LibraryItem> {
Q_OBJECT Q_OBJECT
@ -30,6 +30,8 @@ class Library : public SimpleTreeModel<LibraryItem> {
void StartThreads(); void StartThreads();
LibraryDirectoryModel* GetDirectoryModel() const { return dir_model_; }
// Get information about the library // Get information about the library
void GetChildSongs(LibraryItem* item, QList<QUrl>* urls, SongList* songs) const; void GetChildSongs(LibraryItem* item, QList<QUrl>* urls, SongList* songs) const;
SongList GetChildSongs(const QModelIndex& index) const; SongList GetChildSongs(const QModelIndex& index) const;
@ -49,8 +51,6 @@ class Library : public SimpleTreeModel<LibraryItem> {
void ScanFinished(); void ScanFinished();
public slots: public slots:
void ShowConfig();
void SetFilterAge(int age); void SetFilterAge(int age);
void SetFilterText(const QString& text); void SetFilterText(const QString& text);
@ -89,6 +89,7 @@ class Library : public SimpleTreeModel<LibraryItem> {
EngineBase* engine_; EngineBase* engine_;
BackgroundThread<LibraryBackend>* backend_; BackgroundThread<LibraryBackend>* backend_;
BackgroundThread<LibraryWatcher>* watcher_; BackgroundThread<LibraryWatcher>* watcher_;
LibraryDirectoryModel* dir_model_;
int waiting_for_threads_; int waiting_for_threads_;
@ -101,8 +102,6 @@ class Library : public SimpleTreeModel<LibraryItem> {
QIcon artist_icon_; QIcon artist_icon_;
QIcon album_icon_; QIcon album_icon_;
LibraryConfig* config_;
}; };
#endif // LIBRARY_H #endif // LIBRARY_H

59
src/libraryconfig.cpp
View File

@ -1,5 +1,5 @@
#include "libraryconfig.h" #include "libraryconfig.h"
#include "librarybackend.h" #include "librarydirectorymodel.h"
#include <QFileDialog> #include <QFileDialog>
#include <QSettings> #include <QSettings>
@ -8,24 +8,28 @@
const char* LibraryConfig::kSettingsGroup = "LibraryConfig"; const char* LibraryConfig::kSettingsGroup = "LibraryConfig";
LibraryConfig::LibraryConfig(QWidget* parent) LibraryConfig::LibraryConfig(QWidget* parent)
: QDialog(parent), : QWidget(parent),
dir_icon_(":folder.png") model_(NULL)
{ {
ui_.setupUi(this); ui_.setupUi(this);
connect(ui_.add, SIGNAL(clicked()), SLOT(Add())); connect(ui_.add, SIGNAL(clicked()), SLOT(Add()));
connect(ui_.remove, SIGNAL(clicked()), SLOT(Remove())); connect(ui_.remove, SIGNAL(clicked()), SLOT(Remove()));
connect(ui_.list, SIGNAL(currentRowChanged(int)), SLOT(CurrentRowChanged(int)));
} }
void LibraryConfig::SetBackend(boost::shared_ptr<LibraryBackend> backend) { void LibraryConfig::SetModel(LibraryDirectoryModel *model) {
backend_ = backend; model_ = model;
ui_.list->setModel(model_);
connect(backend_.get(), SIGNAL(DirectoriesDiscovered(DirectoryList)), SLOT(DirectoriesDiscovered(DirectoryList))); connect(ui_.list->selectionModel(),
connect(backend_.get(), SIGNAL(DirectoriesDeleted(DirectoryList)), SLOT(DirectoriesDeleted(DirectoryList))); SIGNAL(currentRowChanged(QModelIndex, QModelIndex)),
SLOT(CurrentRowChanged(QModelIndex)));
ui_.list->setEnabled(true);
ui_.add->setEnabled(true); if (model_->IsBackendReady())
BackendReady();
else
connect(model_, SIGNAL(BackendReady()), SLOT(BackendReady()));
} }
void LibraryConfig::Add() { void LibraryConfig::Add() {
@ -36,41 +40,22 @@ void LibraryConfig::Add() {
path = QFileDialog::getExistingDirectory(this, "Add directory...", path); path = QFileDialog::getExistingDirectory(this, "Add directory...", path);
if (!path.isNull()) { if (!path.isNull()) {
backend_->AddDirectory(path); model_->AddDirectory(path);
} }
settings.setValue("last_path", path); settings.setValue("last_path", path);
} }
void LibraryConfig::Remove() { void LibraryConfig::Remove() {
QListWidgetItem* item = ui_.list->currentItem(); model_->RemoveDirectory(ui_.list->currentIndex());
if (item == NULL)
return;
Directory dir;
dir.path = item->text();
dir.id = item->type();
backend_->RemoveDirectory(dir);
} }
void LibraryConfig::DirectoriesDiscovered(const DirectoryList& list) { void LibraryConfig::CurrentRowChanged(const QModelIndex& index) {
foreach (const Directory& dir, list) { ui_.remove->setEnabled(index.isValid());
new QListWidgetItem(dir_icon_, dir.path, ui_.list, dir.id);
}
} }
void LibraryConfig::DirectoriesDeleted(const DirectoryList& list) { void LibraryConfig::BackendReady() {
foreach (const Directory& dir, list) { ui_.list->setEnabled(true);
for (int i=0 ; i<ui_.list->count() ; ++i) { ui_.add->setEnabled(true);
if (ui_.list->item(i)->type() == dir.id) { ui_.remove->setEnabled(true);
delete ui_.list->takeItem(i);
break;
}
}
}
}
void LibraryConfig::CurrentRowChanged(int row) {
ui_.remove->setEnabled(row != -1);
} }

21
src/libraryconfig.h
View File

@ -1,39 +1,32 @@
#ifndef LIBRARYCONFIG_H #ifndef LIBRARYCONFIG_H
#define LIBRARYCONFIG_H #define LIBRARYCONFIG_H
#include <QDialog> #include <QWidget>
#include <boost/shared_ptr.hpp>
#include "ui_libraryconfig.h" #include "ui_libraryconfig.h"
#include "directory.h"
class LibraryBackend; class LibraryDirectoryModel;
class LibraryConfig : public QDialog { class LibraryConfig : public QWidget {
Q_OBJECT Q_OBJECT
public: public:
LibraryConfig(QWidget* parent = 0); LibraryConfig(QWidget* parent = 0);
void SetBackend(boost::shared_ptr<LibraryBackend> backend); void SetModel(LibraryDirectoryModel* model);
private slots: private slots:
void Add(); void Add();
void Remove(); void Remove();
void BackendReady();
void DirectoriesDiscovered(const DirectoryList&); void CurrentRowChanged(const QModelIndex& index);
void DirectoriesDeleted(const DirectoryList&);
void CurrentRowChanged(int);
private: private:
static const char* kSettingsGroup; static const char* kSettingsGroup;
Ui::LibraryConfig ui_; Ui::LibraryConfig ui_;
QIcon dir_icon_; LibraryDirectoryModel* model_;
boost::shared_ptr<LibraryBackend> backend_;
}; };
#endif // LIBRARYCONFIG_H #endif // LIBRARYCONFIG_H

58
src/libraryconfig.ui
View File

@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>LibraryConfig</class> <class>LibraryConfig</class>
<widget class="QDialog" name="LibraryConfig"> <widget class="QWidget" name="LibraryConfig">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>489</width> <width>489</width>
<height>273</height> <height>232</height>
</rect> </rect>
</property> </property>
<property name="windowTitle">
<string>Music Library</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="margin">
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
@ -24,7 +24,7 @@
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QListWidget" name="list"> <widget class="QListView" name="list">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -88,59 +88,15 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>list</tabstop> <tabstop>list</tabstop>
<tabstop>add</tabstop> <tabstop>add</tabstop>
<tabstop>remove</tabstop> <tabstop>remove</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../data/data.qrc"/> <include location="../data/data.qrc"/>
</resources> </resources>
<connections> <connections/>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>LibraryConfig</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>272</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>LibraryConfig</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>272</y>
</hint>
</hints>
</connection>
</connections>
</ui> </ui>

11
src/libraryconfigdialog.cpp Normal file
View File

@ -0,0 +1,11 @@
#include "libraryconfigdialog.h"
LibraryConfigDialog::LibraryConfigDialog(QWidget *parent)
: QDialog(parent)
{
ui_.setupUi(this);
}
void LibraryConfigDialog::SetModel(LibraryDirectoryModel* model) {
ui_.config->SetModel(model);
}

21
src/libraryconfigdialog.h Normal file
View File

@ -0,0 +1,21 @@
#ifndef LIBRARYCONFIGDIALOG_H
#define LIBRARYCONFIGDIALOG_H
#include <QDialog>
#include "ui_libraryconfigdialog.h"
class LibraryDirectoryModel;
class LibraryConfigDialog : public QDialog {
Q_OBJECT
public:
LibraryConfigDialog(QWidget* parent = 0);
void SetModel(LibraryDirectoryModel* model);
private:
Ui::LibraryConfigDialog ui_;
};
#endif // LIBRARYCONFIGDIALOG_H

88
src/libraryconfigdialog.ui Normal file
View File

@ -0,0 +1,88 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>LibraryConfigDialog</class>
<widget class="QDialog" name="LibraryConfigDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string>Music Library</string>
</property>
<property name="windowIcon">
<iconset resource="../data/data.qrc">
<normaloff>:/library.png</normaloff>:/library.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="LibraryConfig" name="config" native="true"/>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>LibraryConfig</class>
<extends>QWidget</extends>
<header>libraryconfig.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../data/data.qrc"/>
</resources>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>LibraryConfigDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>LibraryConfigDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

55
src/librarydirectorymodel.cpp Normal file
View File

@ -0,0 +1,55 @@
#include "librarydirectorymodel.h"
#include "librarybackend.h"
LibraryDirectoryModel::LibraryDirectoryModel(QObject* parent)
: QStandardItemModel(parent),
dir_icon_(":folder.png")
{
}
void LibraryDirectoryModel::SetBackend(boost::shared_ptr<LibraryBackend> backend) {
backend_ = backend;
connect(backend_.get(), SIGNAL(DirectoriesDiscovered(DirectoryList)), SLOT(DirectoriesDiscovered(DirectoryList)));
connect(backend_.get(), SIGNAL(DirectoriesDeleted(DirectoryList)), SLOT(DirectoriesDeleted(DirectoryList)));
emit BackendReady();
}
void LibraryDirectoryModel::DirectoriesDiscovered(const DirectoryList &directories) {
foreach (const Directory& dir, directories) {
QStandardItem* item = new QStandardItem(dir.path);
item->setData(dir.id, kIdRole);
item->setIcon(dir_icon_);
appendRow(item);
}
}
void LibraryDirectoryModel::DirectoriesDeleted(const DirectoryList &directories) {
foreach (const Directory& dir, directories) {
for (int i=0 ; i<rowCount() ; ++i) {
if (item(i, 0)->data(kIdRole).toInt() == dir.id) {
removeRow(i);
break;
}
}
}
}
void LibraryDirectoryModel::AddDirectory(const QString& path) {
if (!backend_)
return;
backend_->AddDirectory(path);
}
void LibraryDirectoryModel::RemoveDirectory(const QModelIndex& index) {
if (!backend_ || !index.isValid())
return;
Directory dir;
dir.path = index.data().toString();
dir.id = index.data(kIdRole).toInt();
backend_->RemoveDirectory(dir);
}

41
src/librarydirectorymodel.h Normal file
View File

@ -0,0 +1,41 @@
#ifndef LIBRARYDIRECTORYMODEL_H
#define LIBRARYDIRECTORYMODEL_H
#include <QStandardItemModel>
#include <QIcon>
#include <boost/shared_ptr.hpp>
#include "directory.h"
class LibraryBackend;
class LibraryDirectoryModel : public QStandardItemModel {
Q_OBJECT
public:
LibraryDirectoryModel(QObject* parent = 0);
void SetBackend(boost::shared_ptr<LibraryBackend> backend);
bool IsBackendReady() const { return backend_; }
// To be called by GUIs
void AddDirectory(const QString& path);
void RemoveDirectory(const QModelIndex& index);
signals:
void BackendReady();
private slots:
// To be called by the backend
void DirectoriesDiscovered(const DirectoryList& directories);
void DirectoriesDeleted(const DirectoryList& directories);
private:
static const int kIdRole = Qt::UserRole + 1;
QIcon dir_icon_;
boost::shared_ptr<LibraryBackend> backend_;
};
#endif // LIBRARYDIRECTORYMODEL_H

11
src/mainwindow.cpp
View File

@ -12,6 +12,8 @@
#include "trackslider.h" #include "trackslider.h"
#include "edittagdialog.h" #include "edittagdialog.h"
#include "multiloadingindicator.h" #include "multiloadingindicator.h"
#include "settingsdialog.h"
#include "libraryconfigdialog.h"
#include "qxtglobalshortcut.h" #include "qxtglobalshortcut.h"
@ -38,6 +40,8 @@ MainWindow::MainWindow(QWidget *parent)
track_slider_(new TrackSlider(this)), track_slider_(new TrackSlider(this)),
edit_tag_dialog_(new EditTagDialog(this)), edit_tag_dialog_(new EditTagDialog(this)),
multi_loading_indicator_(new MultiLoadingIndicator(this)), multi_loading_indicator_(new MultiLoadingIndicator(this)),
settings_dialog_(new SettingsDialog(this)),
library_config_dialog_(new LibraryConfigDialog(this)),
radio_model_(new RadioModel(this)), radio_model_(new RadioModel(this)),
playlist_(new Playlist(this)), playlist_(new Playlist(this)),
player_(new Player(playlist_, radio_model_->GetLastFMService(), this)), player_(new Player(playlist_, radio_model_->GetLastFMService(), this)),
@ -70,6 +74,8 @@ MainWindow::MainWindow(QWidget *parent)
ui_.library_view->setModel(library_sort_model_); ui_.library_view->setModel(library_sort_model_);
ui_.library_view->SetLibrary(library_); ui_.library_view->SetLibrary(library_);
library_config_dialog_->SetModel(library_->GetDirectoryModel());
settings_dialog_->SetLibraryDirectoryModel(library_->GetDirectoryModel());
ui_.radio_view->setModel(radio_model_); ui_.radio_view->setModel(radio_model_);
@ -89,6 +95,7 @@ MainWindow::MainWindow(QWidget *parent)
connect(ui_.action_love, SIGNAL(triggered()), SLOT(Love())); connect(ui_.action_love, SIGNAL(triggered()), SLOT(Love()));
connect(ui_.action_clear_playlist, SIGNAL(triggered()), playlist_, SLOT(Clear())); connect(ui_.action_clear_playlist, SIGNAL(triggered()), playlist_, SLOT(Clear()));
connect(ui_.action_edit_track, SIGNAL(triggered()), SLOT(EditTracks())); connect(ui_.action_edit_track, SIGNAL(triggered()), SLOT(EditTracks()));
connect(ui_.action_configure, SIGNAL(triggered()), settings_dialog_, SLOT(show()));
// Give actions to buttons // Give actions to buttons
ui_.forward_button->setDefaultAction(ui_.action_next_track); ui_.forward_button->setDefaultAction(ui_.action_next_track);
@ -135,7 +142,7 @@ MainWindow::MainWindow(QWidget *parent)
// Library connections // Library connections
connect(library_, SIGNAL(Error(QString)), SLOT(ReportError(QString))); connect(library_, SIGNAL(Error(QString)), SLOT(ReportError(QString)));
connect(ui_.library_view, SIGNAL(doubleClicked(QModelIndex)), SLOT(LibraryDoubleClick(QModelIndex))); connect(ui_.library_view, SIGNAL(doubleClicked(QModelIndex)), SLOT(LibraryDoubleClick(QModelIndex)));
connect(ui_.library_view, SIGNAL(ShowConfigDialog()), library_, SLOT(ShowConfig())); connect(ui_.library_view, SIGNAL(ShowConfigDialog()), library_config_dialog_, SLOT(show()));
connect(library_, SIGNAL(TotalSongCountUpdated(int)), ui_.library_view, SLOT(TotalSongCountUpdated(int))); connect(library_, SIGNAL(TotalSongCountUpdated(int)), ui_.library_view, SLOT(TotalSongCountUpdated(int)));
connect(library_, SIGNAL(ScanStarted()), SLOT(LibraryScanStarted())); connect(library_, SIGNAL(ScanStarted()), SLOT(LibraryScanStarted()));
connect(library_, SIGNAL(ScanFinished()), SLOT(LibraryScanFinished())); connect(library_, SIGNAL(ScanFinished()), SLOT(LibraryScanFinished()));
@ -171,7 +178,7 @@ MainWindow::MainWindow(QWidget *parent)
QMenu* library_menu = new QMenu(this); QMenu* library_menu = new QMenu(this);
library_menu->addActions(filter_age_group->actions()); library_menu->addActions(filter_age_group->actions());
library_menu->addSeparator(); library_menu->addSeparator();
library_menu->addAction("Configure library...", library_, SLOT(ShowConfig())); library_menu->addAction("Configure library...", library_config_dialog_, SLOT(show()));
ui_.library_options->setMenu(library_menu); ui_.library_options->setMenu(library_menu);
// Playlist menu // Playlist menu

5
src/mainwindow.h
View File

@ -9,7 +9,7 @@
class Playlist; class Playlist;
class Player; class Player;
class Library; class Library;
class LibraryConfig; class LibraryConfigDialog;
class RadioModel; class RadioModel;
class Song; class Song;
class RadioItem; class RadioItem;
@ -17,6 +17,7 @@ class OSD;
class TrackSlider; class TrackSlider;
class EditTagDialog; class EditTagDialog;
class MultiLoadingIndicator; class MultiLoadingIndicator;
class SettingsDialog;
class QSortFilterProxyModel; class QSortFilterProxyModel;
class SystemTrayIcon; class SystemTrayIcon;
@ -80,6 +81,8 @@ class MainWindow : public QMainWindow {
TrackSlider* track_slider_; TrackSlider* track_slider_;
EditTagDialog* edit_tag_dialog_; EditTagDialog* edit_tag_dialog_;
MultiLoadingIndicator* multi_loading_indicator_; MultiLoadingIndicator* multi_loading_indicator_;
SettingsDialog* settings_dialog_;
LibraryConfigDialog* library_config_dialog_;
RadioModel* radio_model_; RadioModel* radio_model_;
Playlist* playlist_; Playlist* playlist_;

90
src/mainwindow.ui
View File

@ -14,7 +14,7 @@
<string>Clementine</string> <string>Clementine</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset> <iconset resource="../data/data.qrc">
<normaloff>:/icon.png</normaloff>:/icon.png</iconset> <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
</property> </property>
<widget class="QWidget" name="centralWidget"> <widget class="QWidget" name="centralWidget">
@ -294,7 +294,7 @@
<item> <item>
<widget class="QToolButton" name="library_filter_clear"> <widget class="QToolButton" name="library_filter_clear">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../data/data.qrc">
<normaloff>:/clear.png</normaloff>:/clear.png</iconset> <normaloff>:/clear.png</normaloff>:/clear.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -314,7 +314,7 @@
<item> <item>
<widget class="QToolButton" name="library_options"> <widget class="QToolButton" name="library_options">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../data/data.qrc">
<normaloff>:/configure.png</normaloff>:/configure.png</iconset> <normaloff>:/configure.png</normaloff>:/configure.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -428,9 +428,55 @@
</layout> </layout>
</widget> </widget>
</widget> </widget>
<widget class="QMenuBar" name="menuBar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>804</width>
<height>23</height>
</rect>
</property>
<widget class="QMenu" name="menuMusic">
<property name="title">
<string>Music</string>
</property>
<addaction name="action_previous_track"/>
<addaction name="action_play_pause"/>
<addaction name="action_stop"/>
<addaction name="action_next_track"/>
<addaction name="separator"/>
<addaction name="action_love"/>
<addaction name="action_ban"/>
<addaction name="separator"/>
<addaction name="action_quit"/>
</widget>
<widget class="QMenu" name="menuPlaylist">
<property name="title">
<string>Playlist</string>
</property>
<addaction name="action_clear_playlist"/>
</widget>
<widget class="QMenu" name="menuSettings">
<property name="title">
<string>Settings</string>
</property>
<addaction name="action_configure"/>
</widget>
<widget class="QMenu" name="menuHelp">
<property name="title">
<string>Help</string>
</property>
<addaction name="action_about"/>
</widget>
<addaction name="menuMusic"/>
<addaction name="menuPlaylist"/>
<addaction name="menuSettings"/>
<addaction name="menuHelp"/>
</widget>
<action name="action_previous_track"> <action name="action_previous_track">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../data/data.qrc">
<normaloff>:/media-skip-backward.png</normaloff>:/media-skip-backward.png</iconset> <normaloff>:/media-skip-backward.png</normaloff>:/media-skip-backward.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -439,7 +485,7 @@
</action> </action>
<action name="action_play_pause"> <action name="action_play_pause">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../data/data.qrc">
<normaloff>:/media-playback-start.png</normaloff>:/media-playback-start.png</iconset> <normaloff>:/media-playback-start.png</normaloff>:/media-playback-start.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -451,7 +497,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../data/data.qrc">
<normaloff>:/media-playback-stop.png</normaloff>:/media-playback-stop.png</iconset> <normaloff>:/media-playback-stop.png</normaloff>:/media-playback-stop.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -460,7 +506,7 @@
</action> </action>
<action name="action_next_track"> <action name="action_next_track">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../data/data.qrc">
<normaloff>:/media-skip-forward.png</normaloff>:/media-skip-forward.png</iconset> <normaloff>:/media-skip-forward.png</normaloff>:/media-skip-forward.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -469,7 +515,7 @@
</action> </action>
<action name="action_quit"> <action name="action_quit">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../data/data.qrc">
<normaloff>:/exit.png</normaloff>:/exit.png</iconset> <normaloff>:/exit.png</normaloff>:/exit.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -481,7 +527,7 @@
</action> </action>
<action name="action_stop_after_this_track"> <action name="action_stop_after_this_track">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../data/data.qrc">
<normaloff>:/media-playback-stop.png</normaloff>:/media-playback-stop.png</iconset> <normaloff>:/media-playback-stop.png</normaloff>:/media-playback-stop.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -547,7 +593,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../data/data.qrc">
<normaloff>:/last.fm/love.png</normaloff>:/last.fm/love.png</iconset> <normaloff>:/last.fm/love.png</normaloff>:/last.fm/love.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -559,7 +605,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../data/data.qrc">
<normaloff>:/last.fm/ban.png</normaloff>:/last.fm/ban.png</iconset> <normaloff>:/last.fm/ban.png</normaloff>:/last.fm/ban.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -568,7 +614,7 @@
</action> </action>
<action name="action_clear_playlist"> <action name="action_clear_playlist">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../data/data.qrc">
<normaloff>:/clear-list.png</normaloff>:/clear-list.png</iconset> <normaloff>:/clear-list.png</normaloff>:/clear-list.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -580,13 +626,27 @@
</action> </action>
<action name="action_edit_track"> <action name="action_edit_track">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../data/data.qrc">
<normaloff>:/edit-track.png</normaloff>:/edit-track.png</iconset> <normaloff>:/edit-track.png</normaloff>:/edit-track.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Edit track information...</string> <string>Edit track information...</string>
</property> </property>
</action> </action>
<action name="action_configure">
<property name="icon">
<iconset resource="../data/data.qrc">
<normaloff>:/configure.png</normaloff>:/configure.png</iconset>
</property>
<property name="text">
<string>Configure Clementine...</string>
</property>
</action>
<action name="action_about">
<property name="text">
<string>About Clementine...</string>
</property>
</action>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<customwidgets> <customwidgets>
@ -623,6 +683,8 @@
<header>radioview.h</header> <header>radioview.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources>
<include location="../data/data.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

20
src/settingsdialog.cpp Normal file
View File

@ -0,0 +1,20 @@
#include "settingsdialog.h"
#include "ui_settingsdialog.h"
SettingsDialog::SettingsDialog(QWidget* parent)
: QDialog(parent)
{
ui_.setupUi(this);
connect(ui_.list, SIGNAL(currentTextChanged(QString)), SLOT(CurrentTextChanged(QString)));
ui_.list->setCurrentRow(0);
}
void SettingsDialog::CurrentTextChanged(const QString &text) {
ui_.title->setText("<b>" + text + "</b>");
}
void SettingsDialog::SetLibraryDirectoryModel(LibraryDirectoryModel* model) {
ui_.library_config->SetModel(model);
}

25
src/settingsdialog.h Normal file
View File

@ -0,0 +1,25 @@
#ifndef SETTINGSDIALOG_H
#define SETTINGSDIALOG_H
#include <QDialog>
#include "ui_settingsdialog.h"
class LibraryDirectoryModel;
class SettingsDialog : public QDialog {
Q_OBJECT
public:
SettingsDialog(QWidget* parent = 0);
void SetLibraryDirectoryModel(LibraryDirectoryModel* model);
private slots:
void CurrentTextChanged(const QString& text);
private:
Ui::SettingsDialog ui_;
};
#endif // SETTINGSDIALOG_H

311
src/settingsdialog.ui Normal file
View File

@ -0,0 +1,311 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SettingsDialog</class>
<widget class="QDialog" name="SettingsDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>708</width>
<height>549</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QListWidget" name="list">
<property name="maximumSize">
<size>
<width>180</width>
<height>16777215</height>
</size>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="movement">
<enum>QListView::Static</enum>
</property>
<property name="spacing">
<number>2</number>
</property>
<property name="viewMode">
<enum>QListView::ListMode</enum>
</property>
<property name="uniformItemSizes">
<bool>true</bool>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="selectionRectVisible">
<bool>true</bool>
</property>
<item>
<property name="text">
<string>Playback</string>
</property>
<property name="icon">
<iconset resource="../data/data.qrc">
<normaloff>:/media-playback-start-32.png</normaloff>:/media-playback-start-32.png</iconset>
</property>
</item>
<item>
<property name="text">
<string>Music Library</string>
</property>
<property name="icon">
<iconset resource="../data/data.qrc">
<normaloff>:/library.png</normaloff>:/library.png</iconset>
</property>
</item>
<item>
<property name="text">
<string>Last.fm</string>
</property>
<property name="icon">
<iconset resource="../data/data.qrc">
<normaloff>:/last.fm/as.png</normaloff>:/last.fm/as.png</iconset>
</property>
</item>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="title"/>
</item>
<item>
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="page">
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Fadeout</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QRadioButton" name="radioButton">
<property name="text">
<string>No fadeout</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_2">
<property name="text">
<string>Fadeout</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Fadeout duration</string>
</property>
<property name="indent">
<number>22</number>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox">
<property name="suffix">
<string>ms</string>
</property>
<property name="maximum">
<number>10000</number>
</property>
<property name="value">
<number>2000</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
<zorder>groupBox</zorder>
<zorder>verticalSpacer</zorder>
</widget>
<widget class="QWidget" name="page_2">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="LibraryConfig" name="library_config" native="true"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_3"/>
</widget>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>LibraryConfig</class>
<extends>QWidget</extends>
<header>libraryconfig.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>list</tabstop>
<tabstop>radioButton</tabstop>
<tabstop>radioButton_2</tabstop>
<tabstop>spinBox</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources>
<include location="../data/data.qrc"/>
</resources>
<connections>
<connection>
<sender>list</sender>
<signal>currentRowChanged(int)</signal>
<receiver>stackedWidget</receiver>
<slot>setCurrentIndex(int)</slot>
<hints>
<hint type="sourcelabel">
<x>82</x>
<y>72</y>
</hint>
<hint type="destinationlabel">
<x>307</x>
<y>96</y>
</hint>
</hints>
</connection>
<connection>
<sender>radioButton_2</sender>
<signal>toggled(bool)</signal>
<receiver>spinBox</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>272</x>
<y>108</y>
</hint>
<hint type="destinationlabel">
<x>369</x>
<y>132</y>
</hint>
</hints>
</connection>
<connection>
<sender>radioButton_2</sender>
<signal>toggled(bool)</signal>
<receiver>label</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>108</y>
</hint>
<hint type="destinationlabel">
<x>264</x>
<y>131</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>SettingsDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>518</x>
<y>524</y>
</hint>
<hint type="destinationlabel">
<x>521</x>
<y>545</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>SettingsDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>324</x>
<y>521</y>
</hint>
<hint type="destinationlabel">
<x>322</x>
<y>549</y>
</hint>
</hints>
</connection>
</connections>
</ui>

14
src/src.pro
View File

@ -48,7 +48,10 @@ SOURCES += main.cpp \
edittagdialog.cpp \ edittagdialog.cpp \
lineedit.cpp \ lineedit.cpp \
multiloadingindicator.cpp \ multiloadingindicator.cpp \
somafmservice.cpp somafmservice.cpp \
settingsdialog.cpp \
librarydirectorymodel.cpp \
libraryconfigdialog.cpp
HEADERS += mainwindow.h \ HEADERS += mainwindow.h \
player.h \ player.h \
library.h \ library.h \
@ -97,7 +100,10 @@ HEADERS += mainwindow.h \
edittagdialog.h \ edittagdialog.h \
lineedit.h \ lineedit.h \
multiloadingindicator.h \ multiloadingindicator.h \
somafmservice.h somafmservice.h \
settingsdialog.h \
librarydirectorymodel.h \
libraryconfigdialog.h
FORMS += mainwindow.ui \ FORMS += mainwindow.ui \
libraryconfig.ui \ libraryconfig.ui \
fileview.ui \ fileview.ui \
@ -105,7 +111,9 @@ FORMS += mainwindow.ui \
lastfmstationdialog.ui \ lastfmstationdialog.ui \
trackslider.ui \ trackslider.ui \
edittagdialog.ui \ edittagdialog.ui \
multiloadingindicator.ui multiloadingindicator.ui \
settingsdialog.ui \
libraryconfigdialog.ui
RESOURCES += ../data/data.qrc RESOURCES += ../data/data.qrc
OTHER_FILES += ../data/schema.sql \ OTHER_FILES += ../data/schema.sql \
../data/mainwindow.css ../data/mainwindow.css