}
}
+inline void __fill_model_album(QStandardItemModel *model, QMap<QString, int> data, QString icons_theme) {
+ model->clear();
+ int count = data.count();
+ model->setRowCount(count);
+ int i = 0;
+ Config config;
+ if (config.getValue("ui/albumsorting").toString() == "date") {
+ QMap<int, QList<QString> > years;
+ foreach (QString name, data.keys()) {
+ years[data[name]].append(name);
+ }
+ QList<int> keys = years.keys();
+ qSort(keys);
+
+ foreach (int year, keys) {
+ foreach (QString name, years[year]) {
+ model->setItem(i, 0, new QStandardItem(QIcon(":/icons/"+icons_theme+"/deselect_all.png"), ""));
+ model->setItem(i, 1, new QStandardItem(QString("[%1] %2").arg(year).arg(name)));
+ i++;
+ }
+ }
+ } else {
+ QList<QString> names = data.keys();
+ foreach (QString name, names) {
+ model->setItem(i, 0, new QStandardItem(QIcon(":/icons/"+icons_theme+"/deselect_all.png"), ""));
+ model->setItem(i, 1, new QStandardItem(QString("[%1] %2").arg(data[name]).arg(name)));
+ i++;
+ }
+ }
+}
+
inline void __fill_model_tracks (QStandardItemModel *model, QList<Track> tracks, QString icons_theme) {
int count = tracks.count();
model->setRowCount(count);
_model->setColumnCount(2);
_state = STATE_NONE;
_tools_widget = new ToolsWidget(this);
+ QPushButton *search_in_library = new QPushButton(QIcon(":/icons/"+_icons_theme+"/search.png"), "", _tools_widget);
+ search_in_library->setFlat(true);
+ search_in_library->setCheckable(true);
+ _tools_widget->layout()->addItem(new QSpacerItem(20, 20));
+ _tools_widget->layout()->addWidget(search_in_library);
ui->setupUi(this);
ui->listView->setModel(_model);
ui->listView->setColumnWidth(0, 70);
connect(_tools_widget, SIGNAL(prevSearch()), this, SLOT(prevItem()));
connect(_tools_widget, SIGNAL(toggleFullscreen(bool)), this, SIGNAL(fullscreen(bool)));
connect(ui->moreButton, SIGNAL(clicked()), this, SLOT(_more_button()));
+ connect(search_in_library, SIGNAL(toggled(bool)), this, SLOT(_search_button(bool)));
_view_button();
_current_playlist_changed = true;
_top_gradient = ui->topWidget->styleSheet();
_bottom_gradient = ui->bottomWidget->styleSheet();
+ _is_dynamic = false;
}
LibraryForm::~LibraryForm()
}
if (_state == STATE_NONE) return;
QString data = index.data().toString();
+ QRegExp regexp("\\[\\d+\\]\\ (.*)");
switch (_state) {
case STATE_ARTIST:
- __fill_model(_model, _lib->getAlbumsForArtist(data), _icons_theme);
+ __fill_model_album(_model, _lib->getAlbumsForArtist(data), _icons_theme);
ui->listView->setColumnWidth(0, 70);
ui->listView->scrollToTop();
_current_artist = data;
ui->listLabel->setText(QString("Albums by \"%1\"").arg(_current_artist));
break;
case STATE_ALBUM:
- _current_album = data;
- _current_tracks = _lib->getTracksForAlbum(data, _current_artist);
- __fill_model_tracks(_model, _current_tracks, _icons_theme);
- ui->listView->setColumnWidth(0, 70);
- ui->listView->scrollToTop();
- _state = STATE_TRACK;
- ui->backButton->setEnabled(true);
- ui->listLabel->setText(QString("Tracks from \"%1\" by \"%2\"").arg(_current_album).arg(_current_artist));
+ if (regexp.indexIn(data) != -1) {
+ _current_album = regexp.cap(1).trimmed();
+ _current_tracks = _lib->getTracksForAlbum(_current_album, _current_artist);
+ __fill_model_tracks(_model, _current_tracks, _icons_theme);
+ ui->listView->setColumnWidth(0, 70);
+ ui->listView->scrollToTop();
+ _state = STATE_TRACK;
+ ui->backButton->setEnabled(true);
+ ui->listLabel->setText(QString("Tracks from \"%1\" by \"%2\"").arg(_current_album).arg(_current_artist));
+ }
break;
case STATE_PLAYLIST:
{
ui->listView->selectionModel()->clearSelection();
emit busy(QString("<H1>Adding... Please wait</H1>"));
Playlist cur = _lib->getCurrentPlaylist();
+ QRegExp regexp("\\[\\d+\\]\\ (.*)");
switch (_state) {
case STATE_ARTIST:
foreach (QModelIndex id, selected) {
break;
case STATE_ALBUM:
foreach (QModelIndex id, selected) {
- _add_album(&cur, _current_artist, id.data().toString());
+ if (regexp.indexIn(id.data().toString()) != -1) {
+ _add_album(&cur, _current_artist, regexp.cap(1).trimmed());
+ }
}
_lib->saveCurrentPlaylist(cur);
_current_playlist_changed = true;
_lib->saveCurrentPlaylist(cur);
_current_playlist_changed = true;
break;
+ case STATE_SEARCH:
+ foreach (QModelIndex id, selected) {
+ _add_track(&cur, _current_tracks.at(id.row()));
+ }
+ _lib->saveCurrentPlaylist(cur);
+ _current_playlist_changed = true;
+ break;
default:
emit done();
return;
void LibraryForm::_add_artist(Playlist *cur, QString artist) {
- QList<QString> albums = _lib->getAlbumsForArtist(artist);
- foreach(QString album, albums) {
+ QMap<QString, int> albums = _lib->getAlbumsForArtist(artist);
+ foreach(QString album, albums.keys()) {
_add_album(cur, artist, album);
}
}
ui->listView->scrollToTop();
break;
case STATE_TRACK:
- __fill_model(_model, _lib->getAlbumsForArtist(_current_artist), _icons_theme);
+ __fill_model_album(_model, _lib->getAlbumsForArtist(_current_artist), _icons_theme);
ui->listView->setColumnWidth(0, 70);
ui->listView->scrollToTop();
_state = STATE_ALBUM;
ui->listView->selectionModel()->clearSelection();
QQueue<int> to_delete;
foreach (QModelIndex id, selected) {
- to_delete.append(id.row());
+ if (!to_delete.contains(id.row()))
+ to_delete.append(id.row());
}
qSort(to_delete);
int count = to_delete.count();
QModelIndexList selected = ui->listView->selectionModel()->selectedIndexes();
QQueue<int> to_delete;
foreach (QModelIndex id, selected) {
- to_delete.append(id.row());
+ if (!to_delete.contains(id.row()))
+ to_delete.append(id.row());
}
qSort(to_delete);
int count = to_delete.count();
for (int i = count-1; i >= 0; i--) {
- QString name = _model->item(to_delete.at(i))->text();
+ QString name = _model->item(to_delete.at(i), 1)->text();
if (name != _CURRENT_PLAYLIST_SUBST_) {
_lib->removePlaylist(name);
_model->removeRow(to_delete.at(i));
}
void LibraryForm::nextItem() {
- qWarning() << "searching" << _search_pattern;
QString data = _model->index(_search_current_id, 0).data().toString();
for (int i = _search_current_id+1; i < _model->rowCount(); i++) {
data = _model->index(i, 1).data().toString();
_view_button();
break;
case STATE_ALBUM:
- __fill_model(_model, _lib->getAlbumsForArtist(_current_artist), _icons_theme);
+ __fill_model_album(_model, _lib->getAlbumsForArtist(_current_artist), _icons_theme);
ui->listView->setColumnWidth(0, 70);
break;
case STATE_PLAYLIST:
void LibraryForm::_process_dblclick(QModelIndex id) {
if (id.column() == 0)
return;
- if (_state == STATE_TRACK || _state == STATE_PLAYLIST_TRACK) {
- qWarning() << "double clicked";
+ if (_state == STATE_TRACK || _state == STATE_PLAYLIST_TRACK || _state == STATE_SEARCH) {
Playlist cur = _lib->getCurrentPlaylist();
Track track = _current_tracks.at(id.row());
cur.addTrack(track);
}
}
+void LibraryForm::_search_button(bool state) {
+ ui->moreButton->setEnabled(!state);
+ _tools_widget->toggleArrows(!state);
+ ui->backButton->setEnabled(!state);
+ _tools_widget->setFocus();
+ _tools_widget->reset();
+ if (state) {
+ ui->listLabel->setText("Search in library");
+ ui->deleteButton->setIcon(QIcon());
+ ui->deleteButton->setEnabled(false);
+ ui->useButton->setIcon(QIcon());
+ ui->useButton->setEnabled(false);
+ ui->addButton->setIcon(QIcon(":/icons/"+_icons_theme+"/add.png"));
+ ui->addButton->setEnabled(true);
+ disconnect(_tools_widget, SIGNAL(search(QString)), this, SLOT(search(QString)));
+ connect(_tools_widget, SIGNAL(search(QString)), this, SLOT(_search_in_library(QString)));
+ _model->clear();
+ _state = STATE_SEARCH;
+ } else {
+ _view_button();
+ connect(_tools_widget, SIGNAL(search(QString)), this, SLOT(search(QString)));
+ disconnect(_tools_widget, SIGNAL(search(QString)), this, SLOT(_search_in_library(QString)));
+ }
+}
+
+void LibraryForm::_search_in_library(QString pattern) {
+ pattern = pattern.trimmed();
+ if (pattern.isEmpty()) {
+ _model->clear();
+ return;
+ }
+ _current_tracks = _lib->search(pattern);
+ __fill_model_tracks(_model, _current_tracks, _icons_theme);
+ ui->listView->setColumnWidth(0, 70);
+ ui->listView->scrollToTop();
+}
projects / someplayer / blobdiff