_fscreen_button->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
_fscreen_button->hide();
- ui->volumeSlider->setMinimum(0);
- ui->volumeSlider->setMaximum(100);
- ui->volumeSlider->setValue(config.getValue("playback/volume").toInt());
- _player->setVolume(ui->volumeSlider->value());
- ui->volumeSlider->hide();
- ui->seekSlider->setEnabled(false);
- ui->progressLayout->removeItem(ui->seekSpacer);
_tools_widget = new ToolsWidget(this);
ui->toolsLayout->insertWidget(0, _tools_widget);
_tools_widget->hide();
_model = new QStandardItemModel(0, 2, this);
ui->playlistView->setModel(_model);
_context_menu = new QMenu(ui->playlistView);
- QAction *clear_playlist = _context_menu->addAction("Clear playlist");
- QAction *delete_action = _context_menu->addAction("Delete");
- QAction *add_to_favorites = _context_menu->addAction("Add to favorites");
- QAction *enqueue_action = _context_menu->addAction("Enqueue");
- QAction *add_to_playlists = _context_menu->addAction("Add to playlists");
- QAction *edit_tags = _context_menu->addAction("Edit tags");
+ __clear_playlist = _context_menu->addAction(tr("Clear playlist"));
+ __delete_action = _context_menu->addAction(tr("Delete"));
+ __add_to_favorites = _context_menu->addAction(tr("Add to favorites"));
+ __enqueue_action = _context_menu->addAction(tr("Enqueue"));
+ __add_to_playlists = _context_menu->addAction(tr("Add to playlists"));
+ __edit_tags = _context_menu->addAction(tr("Edit tags"));
_track_renderer = new TrackRenderer(this);
_track_renderer->setActiveRow(-1);
_track_renderer->setSearchRow(-1);
+ _track_renderer->setActiveTrackColor(config.getValue("ui/trackcolor").toString());
ui->playlistView->setItemDelegateForColumn(1, _track_renderer);
ui->playlistView->setItemDelegateForColumn(0, _track_renderer);
_tag_resolver = new TagResolver(this);
+ _coverfinder = new CoverFinder(this);
+
+ _cover = new ClickableLabel(this);
+ _cover->setMinimumSize(300, 300);
+ _cover->setMaximumSize(300, 300);
+ _cover->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ _cover->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+ _cover->setPixmap(QPixmap::fromImage(_coverfinder->defaultCover()));
connect(ui->libraryButton, SIGNAL(clicked()), this, SLOT(_library()));
connect(ui->viewButton, SIGNAL(clicked()), this, SLOT(_toggle_view()));
connect(ui->randomButton, SIGNAL(clicked()), this, SLOT(_toggle_random()));
connect(ui->repeatButton, SIGNAL(clicked()), this, SLOT(_toggle_repeat()));
connect(ui->seekSlider, SIGNAL(sliderMoved(int)), _player, SLOT(seek(int)));
- connect(ui->volumeSlider, SIGNAL(sliderMoved(int)), _player, SLOT(setVolume(int)));
connect(ui->playlistView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(_custom_context_menu_requested(QPoint)));
- connect(clear_playlist, SIGNAL(triggered()), this, SIGNAL(clearPlaylist()));
- connect(delete_action, SIGNAL(triggered()), this, SLOT(_delete_track()));
- connect(enqueue_action, SIGNAL(triggered()), this, SLOT(_enqueue_track()));
- connect(add_to_favorites, SIGNAL(triggered()), this, SLOT(_add_to_favorites()));
- connect(add_to_playlists, SIGNAL(triggered()), this, SLOT(_add_to_playlists()));
- connect(edit_tags, SIGNAL(triggered()), this, SLOT(_edit_tags()));
+ connect(__clear_playlist, SIGNAL(triggered()), this, SIGNAL(clearPlaylist()));
+ connect(__delete_action, SIGNAL(triggered()), this, SLOT(_delete_track()));
+ connect(__enqueue_action, SIGNAL(triggered()), this, SLOT(_enqueue_track()));
+ connect(__add_to_favorites, SIGNAL(triggered()), this, SLOT(_add_to_favorites()));
+ connect(__add_to_playlists, SIGNAL(triggered()), this, SLOT(_add_to_playlists()));
+ connect(__edit_tags, SIGNAL(triggered()), this, SLOT(_edit_tags()));
connect(_player, SIGNAL(stateChanged(PlayerState)), this, SLOT(_state_changed(PlayerState)));
connect(_player, SIGNAL(trackDone(Track)), _lib, SLOT(updateTrackCount(Track)));
connect(_tag_resolver, SIGNAL(decoded(Track)), this, SLOT(_track_decoded(Track)));
- connect(ui->volumeButton, SIGNAL(clicked()), this, SLOT(_toggle_volume()));
+ connect(ui->dirButton, SIGNAL(clicked()), this, SLOT(_dirview()));
connect(ui->moreButton, SIGNAL(clicked()), this, SLOT(_tools_widget_toggle()));
connect(_tools_widget, SIGNAL(search(QString)), this, SLOT(search(QString)));
connect(_tools_widget, SIGNAL(nextSearch()), this, SLOT(nextItem()));
connect(_tools_widget, SIGNAL(toggleFullscreen(bool)), _fscreen_button, SLOT(setChecked(bool)));
connect(_fscreen_button, SIGNAL(clicked(bool)), this, SIGNAL(fullscreen(bool)));
connect(_fscreen_button, SIGNAL(clicked(bool)), _tools_widget, SLOT(setFullscreenState(bool)));
+ connect(_coverfinder, SIGNAL(found(QImage)), this, SLOT(_display_cover(QImage)));
+ connect(ui->caddButton, SIGNAL(clicked()), this, SLOT(_c_add_to_playlists()));
+ connect(ui->cdeleteButton, SIGNAL(clicked()), this, SLOT(_c_delete_track()));
+ connect(ui->cfavButton, SIGNAL(clicked()), this, SLOT(_c_add_to_favorites()));
+ connect(ui->ctagButton, SIGNAL(clicked()), this, SLOT(_c_edit_tags()));
+ connect(_cover, SIGNAL(clicked()), this, SLOT(_toggle_extra_buttons()));
ui->viewButton->setIcon(QIcon(":/icons/"+_icons_theme+"/playback.png"));
_top_gradient = ui->topWidget->styleSheet();
_bottom_gradient = ui->bottomWidget->styleSheet();
+ ui->countdownWidget->hide();
+
+ // constructing cover layout
+ ui->coverLayout->removeItem(ui->clverticalLayout_0);
+ ui->coverLayout->removeItem(ui->clverticalLayout_1);
+ ui->coverLayout->removeItem(ui->cbverticalSpacer);
+ ui->coverLayout->removeItem(ui->ctverticalSpacer);
+ ((QGridLayout *)ui->coverLayout)->addItem(ui->ctverticalSpacer, 0, 1);
+ ((QGridLayout *)ui->coverLayout)->addItem(ui->cbverticalSpacer, 2, 1);
+ ((QGridLayout *)ui->coverLayout)->addItem(ui->clverticalLayout_0, 1, 0);
+ ((QGridLayout *)ui->coverLayout)->addItem(ui->clverticalLayout_1, 1, 2);
+ ((QGridLayout *)ui->coverLayout)->addWidget(_cover, 1, 1);
+ //
// dbus
_dbusadaptor = new DBusAdaptop(_player);
QDBusConnection connection = QDBusConnection::sessionBus();
bool ret = connection.registerService(_SERVICE_NAME_);
ret = connection.registerObject("/", _player);
+ _show_extra_buttons = false;
}
PlayerForm::~PlayerForm()
ui->seekSlider->setMinimum(0);
ui->seekSlider->setMaximum(track.metadata().length());
_tick(0, track.metadata().length());
+ _coverfinder->find(track);
}
void PlayerForm::_tick(int done, int all) {
_player->stop();
}
-void PlayerForm::_toggle_volume() {
- if (ui->volumeSlider->isVisible()) {
- ui->volumeSlider->hide();
- } else {
- ui->volumeSlider->show();
- ui->volumeSlider->setValue(_player->volume());
- }
-}
-
-void PlayerForm::_volume_changed() {
- int value = ui->volumeSlider->value();
- _player->setVolume(value);
+void PlayerForm::_dirview() {
+ emit dirView();
}
void PlayerForm::landscapeMode() {
- ui->progressLayout->removeItem(ui->seekSpacer);
- ui->progressLayout->insertWidget(1, ui->seekSlider);
- ui->progressWidget->setVisible(false);
-
landscape = true;
+ ui->widget->layout()->removeItem(ui->coverLayout);
+ ui->widget->layout()->removeItem(ui->controlLayout);
+ ui->controlLayout->removeItem(ui->countHLayout);
+ ui->controlLayout->removeItem(ui->cverticalSpacer_0);
+ ui->controlLayout->removeItem(ui->titleLayout);
+ ui->controlLayout->removeItem(ui->coverLayout);
+ ui->controlLayout->removeItem(ui->cverticalSpacer_1);
+ ui->controlLayout->removeItem(ui->seekLayout);
+ ui->controlLayout->removeItem(ui->progressLayout);
+ ui->controlLayout->removeItem(ui->cverticalSpacer_2);
+ ui->controlLayout->removeItem(ui->artistAlbumLayout);
+ ui->controlLayout->removeItem(ui->cverticalSpacer_3);
+ ui->controlLayout->addItem(ui->countHLayout);
+ ui->controlLayout->addItem(ui->cverticalSpacer_0);
+ ui->controlLayout->addItem(ui->titleLayout);
+ ui->controlLayout->addItem(ui->cverticalSpacer_1);
+ ui->controlLayout->addItem(ui->progressLayout);
+ ui->controlLayout->addItem(ui->seekLayout);
+ ui->controlLayout->addItem(ui->cverticalSpacer_2);
+ ui->controlLayout->addItem(ui->artistAlbumLayout);
+ ui->controlLayout->addItem(ui->cverticalSpacer_3);
+
+ ((QGridLayout *)ui->widget->layout())->addItem(ui->coverLayout, 0, 0);
+ ((QGridLayout *)ui->widget->layout())->addItem(ui->controlLayout, 0, 1);
+
ui->topWidget->hide();
ui->bottomWidget->hide();
ui->bhorizontalLayout->addWidget(ui->moreButton);
ui->bhorizontalLayout->addWidget(_fscreen_button);
ui->bhorizontalLayout->addItem(ui->chorizontalSpacer_4);
- ui->bhorizontalLayout->addWidget(ui->volumeButton);
+ ui->bhorizontalLayout->addWidget(ui->dirButton);
if (_tools_widget->isVisible()) {
- ui->moreButton->setIcon(QIcon(":/icons/"+_icons_theme+"/more.png"));
- } else {
ui->moreButton->setIcon(QIcon(":/icons/"+_icons_theme+"/unmore.png"));
+ } else {
+ ui->moreButton->setIcon(QIcon(":/icons/"+_icons_theme+"/more.png"));
}
}
void PlayerForm::portraitMode() {
- ui->progressLayout->insertSpacerItem(1, ui->seekSpacer);
- ui->progressWidget->layout()->addWidget(ui->seekSlider);
- ui->progressWidget->setVisible(true);
-
ui->topWidget->show();
ui->bottomWidget->show();
landscape = false;
+ ui->widget->layout()->removeItem(ui->coverLayout);
+ ui->widget->layout()->removeItem(ui->controlLayout);
+
+ ui->controlLayout->removeItem(ui->countHLayout);
+ ui->controlLayout->removeItem(ui->cverticalSpacer_0);
+ ui->controlLayout->removeItem(ui->titleLayout);
+ ui->controlLayout->removeItem(ui->coverLayout);
+ ui->controlLayout->removeItem(ui->cverticalSpacer_1);
+ ui->controlLayout->removeItem(ui->seekLayout);
+ ui->controlLayout->removeItem(ui->progressLayout);
+ ui->controlLayout->removeItem(ui->cverticalSpacer_2);
+ ui->controlLayout->removeItem(ui->artistAlbumLayout);
+ ui->controlLayout->removeItem(ui->cverticalSpacer_3);
+
+ ui->controlLayout->addItem(ui->countHLayout);
+ ui->controlLayout->addItem(ui->progressLayout);
+ ui->controlLayout->addItem(ui->seekLayout);
+ ui->controlLayout->addItem(ui->cverticalSpacer_0);
+ ui->controlLayout->addItem(ui->titleLayout);
+ ui->controlLayout->addItem(ui->coverLayout);
+ ui->controlLayout->addItem(ui->artistAlbumLayout);
+ ui->controlLayout->addItem(ui->cverticalSpacer_1);
+ ui->controlLayout->invalidate();
+
+ ui->widget->layout()->addItem(ui->controlLayout);
+
ui->topWidget->layout()->removeItem(ui->thorizontalSpacer_0);
ui->topWidget->layout()->removeItem(ui->thorizontalSpacer_1);
ui->topWidget->layout()->removeItem(ui->thorizontalSpacer_2);
ui->bottomWidget->layout()->addItem(ui->bhorizontalSpacer_2);
ui->bottomWidget->layout()->addWidget(ui->repeatButton);
ui->bottomWidget->layout()->addItem(ui->bhorizontalSpacer_3);
- ui->bottomWidget->layout()->addWidget(ui->volumeButton);
+ ui->bottomWidget->layout()->addWidget(ui->dirButton);
if (_tools_widget->isVisible()) {
ui->moreButton->setIcon(QIcon(":/icons/"+_icons_theme+"/unmore.png"));
void PlayerForm::_tools_widget_toggle() {
if (_tools_widget->isVisible()) {
- ui->moreButton->setIcon(QIcon(landscape ? ":/icons/"+_icons_theme+"/unmore.png" : ":/icons/"+_icons_theme+"/more.png"));
+ ui->moreButton->setIcon(QIcon(":/icons/"+_icons_theme+"/more.png"));
_tools_widget->hide();
_tools_widget->reset();
cancelSearch();
} else {
- ui->moreButton->setIcon(QIcon(landscape ? ":/icons/"+_icons_theme+"/more.png" : ":/icons/"+_icons_theme+"/unmore.png"));
+ ui->moreButton->setIcon(QIcon(":/icons/"+_icons_theme+"/unmore.png"));
_tools_widget->show();
_tools_widget->setFocus();
}
_icons_theme = config.getValue("ui/iconstheme").toString();
_tools_widget->updateIcons();
_track_renderer->updateIcons();
+ if (_show_extra_buttons) {
+ ui->caddButton->setIcon(QIcon(":/icons/"+_icons_theme+"/add.png"));
+ ui->cdeleteButton->setIcon(QIcon(":/icons/"+_icons_theme+"/delete.png"));
+ ui->cfavButton->setIcon(QIcon(":/icons/"+_icons_theme+"/fav.png"));
+ ui->ctagButton->setIcon(QIcon(":/icons/"+_icons_theme+"/tags.png"));
+ } else {
+ ui->caddButton->setIcon(QIcon());
+ ui->cdeleteButton->setIcon(QIcon());
+ ui->cfavButton->setIcon(QIcon());
+ ui->ctagButton->setIcon(QIcon());
+ ui->caddButton->setEnabled(false);
+ ui->cdeleteButton->setEnabled(false);
+ ui->cfavButton->setEnabled(false);
+ ui->ctagButton->setEnabled(false);
+ }
ui->libraryButton->setIcon(QIcon(":/icons/"+_icons_theme+"/library.png"));
if (_tools_widget->isVisible()) {
- ui->moreButton->setIcon(QIcon(landscape ? ":/icons/" + _icons_theme + "/unmore.png" : ":/icons/" + _icons_theme + "/more.png"));
+ ui->moreButton->setIcon(QIcon(":/icons/" + _icons_theme + "/unmore.png"));
} else {
- ui->moreButton->setIcon(QIcon(landscape ? ":/icons/" + _icons_theme + "/more.png" : ":/icons/" + _icons_theme + "/unmore.png"));
+ ui->moreButton->setIcon(QIcon(":/icons/" + _icons_theme + "/more.png"));
}
ui->nextButton->setIcon(QIcon(":/icons/"+_icons_theme+"/next.png"));
ui->stopButton->setIcon(QIcon(":/icons/"+_icons_theme+"/stop.png"));
ui->prevButton->setIcon(QIcon(":/icons/"+_icons_theme+"/prev.png"));
- ui->volumeButton->setIcon(QIcon(":/icons/"+_icons_theme+"/volume.png"));
+ ui->dirButton->setIcon(QIcon(":/icons/"+_icons_theme+"/directory.png"));
+
if (_player->state() == PLAYER_PLAYING) {
ui->playpauseButton->setIcon(QIcon(":/icons/"+_icons_theme+"/pause.png"));
} else {
if (id >= 0) {
_player->setTrackId(id);
_player->play();
+ } else {
+ _current_playlist.addTrack(track);
+ _lib->saveCurrentPlaylist(_current_playlist);
+ reload(true);
+ _player->setTrackId(_current_playlist.tracks().count()-1);
+ _player->play();
+ }
+}
+
+void PlayerForm::showCountdown(QString text) {
+ ui->countdownWidget->show();
+ ui->timeLabel->setText(text);
+}
+
+void PlayerForm::hideCountdown() {
+ ui->countdownWidget->hide();
+}
+
+void PlayerForm::_display_cover(QImage image) {
+ QPixmap p = QPixmap::fromImage(image).scaled(_cover->width(), _cover->height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
+ _cover->setPixmap(p);
+}
+
+void PlayerForm::_c_add_to_favorites() {
+ int id = _track_renderer->activeRow();
+ if (id >= 0 && id < _current_playlist.tracks().count()) {
+ ui->playlistView->selectRow(id);
+ _add_to_favorites();
}
}
+
+void PlayerForm::_c_delete_track() {
+ int id = _track_renderer->activeRow();
+ if (id >= 0 && id < _current_playlist.tracks().count()) {
+ ui->playlistView->selectRow(id);
+ _delete_track();
+ }
+}
+
+void PlayerForm::_c_add_to_playlists() {
+ int id = _track_renderer->activeRow();
+ if (id >= 0 && id < _current_playlist.tracks().count()) {
+ ui->playlistView->selectRow(id);
+ _add_to_playlists();
+ }
+}
+
+void PlayerForm::_c_edit_tags() {
+ int id = _track_renderer->activeRow();
+ if (id >= 0 && id < _current_playlist.tracks().count()) {
+ ui->playlistView->selectRow(id);
+ _edit_tags();
+ }
+}
+
+void PlayerForm::_toggle_extra_buttons() {
+ _show_extra_buttons = !_show_extra_buttons;
+ if (_show_extra_buttons) {
+ ui->caddButton->setEnabled(true);
+ ui->cdeleteButton->setEnabled(true);
+ ui->cfavButton->setEnabled(true);
+ ui->ctagButton->setEnabled(true);
+ ui->caddButton->setIcon(QIcon(":/icons/"+_icons_theme+"/add.png"));
+ ui->cdeleteButton->setIcon(QIcon(":/icons/"+_icons_theme+"/delete.png"));
+ ui->cfavButton->setIcon(QIcon(":/icons/"+_icons_theme+"/fav.png"));
+ ui->ctagButton->setIcon(QIcon(":/icons/"+_icons_theme+"/tags.png"));
+ } else {
+ ui->caddButton->setEnabled(false);
+ ui->cdeleteButton->setEnabled(false);
+ ui->cfavButton->setEnabled(false);
+ ui->ctagButton->setEnabled(false);
+ ui->caddButton->setIcon(QIcon());
+ ui->cdeleteButton->setIcon(QIcon());
+ ui->cfavButton->setIcon(QIcon());
+ ui->ctagButton->setIcon(QIcon());
+ }
+}
+
+void PlayerForm::updateTranslations() {
+ ui->retranslateUi(this);
+ __clear_playlist->setText(tr("Clear playlist"));
+ __delete_action->setText(tr("Delete"));
+ __add_to_favorites->setText(tr("Add to favorites"));
+ __enqueue_action->setText(tr("Enqueue"));
+ __add_to_playlists->setText(tr("Add to playlists"));
+ __edit_tags->setText(tr("Edit tags"));
+}
+
+void PlayerForm::updateTrackColor() {
+ Config config;
+ QString color = config.getValue("ui/trackcolor").toString();
+ _track_renderer->setActiveTrackColor(color);
+ ui->playlistView->hide();
+ ui->playlistView->show();
+}
projects / someplayer / blobdiff