_pls_sort_form->hide();
connect(ui->libraryButton, SIGNAL(clicked()), this, SLOT(_library()));
- connect(ui->viewButton, SIGNAL(clicked()), this, SLOT(_toggle_view()));
+ connect(ui->viewButton, SIGNAL(clicked()), this, SLOT(toggleView()));
connect(ui->playlistView, SIGNAL(clicked(QModelIndex)), this, SLOT(_process_click(QModelIndex)));
connect(ui->playpauseButton, SIGNAL(clicked()), _player, SLOT(toggle()));
connect(ui->nextButton, SIGNAL(clicked()), _player, SLOT(next()));
connect(ui->prevButton, SIGNAL(clicked()), _player, SLOT(prev()));
connect(_player, SIGNAL(trackChanged(Track)), this, SLOT(_track_changed(Track)));
connect(_player, SIGNAL(tick(int,int)), this, SLOT(_tick(int,int)));
- connect(ui->randomButton, SIGNAL(clicked()), this, SLOT(_toggle_random()));
- connect(ui->repeatButton, SIGNAL(clicked()), this, SLOT(_toggle_repeat()));
+ connect(ui->randomButton, SIGNAL(clicked()), this, SLOT(toggleRandom()));
+ connect(ui->repeatButton, SIGNAL(clicked()), this, SLOT(toggleRepeat()));
connect(ui->seekSlider, SIGNAL(sliderMoved(int)), _player, SLOT(seek(int)));
connect(ui->playlistView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(_sort_playlist()));
connect(__clear_playlist, SIGNAL(triggered()), this, SIGNAL(clearPlaylist()));
connect(_player, SIGNAL(trackDone(Track)), _lib, SLOT(updateTrackCount(Track)));
connect(_tag_resolver, SIGNAL(decoded(Track)), this, SLOT(_track_decoded(Track)));
connect(ui->dirButton, SIGNAL(clicked()), this, SLOT(_dirview()));
- connect(ui->moreButton, SIGNAL(clicked()), this, SLOT(_tools_widget_toggle()));
+ connect(ui->moreButton, SIGNAL(clicked()), this, SLOT(toggleToolsWidget()));
connect(_tools_widget, SIGNAL(search(QString)), this, SLOT(search(QString)));
connect(_tools_widget, SIGNAL(nextSearch()), this, SLOT(nextItem()));
connect(_tools_widget, SIGNAL(prevSearch()), this, SLOT(prevItem()));
// dbus
_dbusadaptor = new DBusAdaptop(_player);
+ connect(_player, SIGNAL(stateChanged(PlayerState)), _dbusadaptor, SIGNAL(stateChanged()));
+ connect(_coverfinder, SIGNAL(foundPath(QString)), _dbusadaptor, SIGNAL(albumArt(QString)));
+ connect(_coverfinder, SIGNAL(foundPath(QString)), _player, SLOT(setAlbumart(QString)));
QDBusConnection connection = QDBusConnection::sessionBus();
bool ret = connection.registerService(_SERVICE_NAME_);
ret = connection.registerObject("/", _player);
}
}
-void PlayerForm::_toggle_view() {
+void PlayerForm::toggleView() {
int index = ui->stackedWidget->currentIndex();
index = (!index % 2);
if (index) {
_current_playlist.removeTrackAt(id);
_lib->saveCurrentPlaylist(_current_playlist);
reload(true);
+ int rc = _model->rowCount();
+ if (id >= rc) {
+ id = rc-1;
+ }
+ ui->playlistView->scrollTo(_model->index(id, 0), QAbstractItemView::PositionAtCenter);
}
void PlayerForm::_enqueue_track() {
}
}
-void PlayerForm::_toggle_random() {
+void PlayerForm::toggleRandom() {
_player->toggleRandom();
if (_player->random()) {
ui->randomButton->setIcon(QIcon(":/icons/"+_icons_theme+"/random_on.png"));
}
}
-void PlayerForm::_toggle_repeat() {
+void PlayerForm::toggleRepeat() {
_player->toggleRepeat();
if (_player->repeat() == REPEAT_ALL) {
ui->repeatButton->setIcon(QIcon(":/icons/"+_icons_theme+"/repeat_all.png"));
reload(true);
emit refreshLibrary();
}
+ _display_track(track);
}
void PlayerForm::stop() {
_pls_sort_form->portraitMode();
}
-void PlayerForm::_tools_widget_toggle() {
+void PlayerForm::toggleToolsWidget() {
+ if (0 != ui->stackedWidget->currentIndex()) {
+ return;
+ }
if (_tools_widget->isVisible()) {
ui->moreButton->setIcon(QIcon(":/icons/"+_icons_theme+"/more.png"));
_tools_widget->hide();
ui->playlistView->setColumnWidth(0, 50);
_track_renderer->setActiveRow(_current_playlist.tracks().indexOf(_player->current()));
}
+
+void PlayerForm::toggle() {
+ _player->toggle();
+}