Version bump
[someplayer] / src / playerform.cpp
index a7b67f9..3234910 100644 (file)
@@ -20,7 +20,7 @@
 #include "playerform.h"
 #include "ui_playerform.h"
 #include "library.h"
-#include "player/player.h"
+#include "player/abstractplayer.h"
 #include <QTime>
 #include <QSlider>
 #include "trackrenderer.h"
@@ -46,6 +46,7 @@ inline void __fill_list(QStandardItemModel *_model, Playlist playlist) {
                time.setHMS(0, meta.length()/60, meta.length() % 60);
                QString t = meta.title()+"#_#"+meta.artist()+"#_#"+meta.album()+"#_#"+time.toString("mm:ss");
                _model->setItem(i, 1, new QStandardItem(t));
+               _model->setItem(i, 0, new QStandardItem("##arrow_r.png"));
        }
 }
 
@@ -56,7 +57,7 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) :
        _lib = lib;
        Config config;
        _icons_theme = config.getValue("ui/iconstheme").toString();
-       _player = new Player(this);
+       _player = SomePlayer::Playback::Factory::constructPlayer(this);
        _time = new QTime();
        ui->setupUi(this);
        if (_player->random()) {
@@ -81,59 +82,63 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) :
        _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()));
+
+       _pls_sort_form = new PlaylistSortForm(parent);
+       _pls_sort_form->hide();
 
        connect(ui->libraryButton, SIGNAL(clicked()), this, SLOT(_library()));
-       connect(ui->viewButton, SIGNAL(clicked()), this, SLOT(_toggle_view()));
-       connect(ui->playlistView, SIGNAL(activated(QModelIndex)), this, SLOT(_process_click(QModelIndex)));
+       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->stopButton, SIGNAL(clicked()), _player, SLOT(stop()));
        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->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(ui->playlistView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(_sort_playlist()));
+       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->moreButton, SIGNAL(clicked()), this, SLOT(_tools_widget_toggle()));
+       connect(ui->dirButton, SIGNAL(clicked()), this, SLOT(_dirview()));
+       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()));
@@ -141,15 +146,41 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) :
        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()));
+       connect(_player, SIGNAL(startPlaylist()), this, SLOT(_start_playlist()));
+       connect(_player, SIGNAL(saveLastPlayed(LastPlayed)), _lib, SLOT(saveLastPlayedForCurPlaylist(LastPlayed)));
+       connect(_pls_sort_form, SIGNAL(playlistChanged()), this, SLOT(_playlist_sorted()));
        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);
+       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);
+       _show_extra_buttons = false;
 }
 
 PlayerForm::~PlayerForm()
@@ -170,7 +201,7 @@ void PlayerForm::reload(bool reread) {
        }
 }
 
-void PlayerForm::_toggle_view() {
+void PlayerForm::toggleView() {
        int index = ui->stackedWidget->currentIndex();
        index = (!index % 2);
        if (index) {
@@ -186,9 +217,11 @@ void PlayerForm::_toggle_view() {
 }
 
 void PlayerForm::_process_click(QModelIndex index) {
+       if (_pls_sort_form->isVisible()) {
+               return;
+       }
        if (index.column() == 1) {
                int id = index.row();
-               _player->stop();
                _player->setTrackId(id);
                _player->play();
                _track_renderer->setActiveRow(id);
@@ -201,11 +234,13 @@ void PlayerForm::_track_changed(Track track) {
        int id = _current_playlist.tracks().indexOf(track);
        QModelIndex index = _model->index(id, 0);
        ui->playlistView->setCurrentIndex(index);
-       ui->playlistView->scrollTo(index);
+       ui->playlistView->scrollTo(index, QAbstractItemView::PositionAtCenter);
        _track_renderer->setActiveRow(id);
        ui->playlistView->hide();
        ui->playlistView->show();
        _display_track(track);
+       _context_menu->actions().at(2)->setText(_lib->isFavorite(track) ? tr("Remove from favorites") : tr("Add to favorites"));
+       emit trackChanged();
 }
 
 void PlayerForm::_display_track(Track track) {
@@ -219,6 +254,8 @@ void PlayerForm::_display_track(Track track) {
        ui->seekSlider->setMinimum(0);
        ui->seekSlider->setMaximum(track.metadata().length());
        _tick(0, track.metadata().length());
+       _coverfinder->find(track);
+       ui->cfavButton->setChecked(_lib->isFavorite(track) && !ui->cfavButton->icon().isNull());
 }
 
 void PlayerForm::_tick(int done, int all) {
@@ -234,6 +271,17 @@ void PlayerForm::_slider_released() {
 }
 
 void PlayerForm::_custom_context_menu_requested(const QPoint &pos) {
+       // fix for 'favorite' state of selected track:
+       QList<QModelIndex> idx = ui->playlistView->selectionModel()->selectedIndexes();
+       if (idx.isEmpty())
+               return;
+       int id = idx.first().row();
+       Track cur = _current_playlist.tracks().at(id);
+       if (!cur.source().isEmpty()) {
+               bool isf = _lib->isFavorite(cur);
+               _context_menu->actions().at(2)->setText(isf ? tr("Remove from favorites") : tr("Add to favorites"));
+       }
+       // end
        _context_menu->exec(pos);
 }
 
@@ -251,6 +299,11 @@ void PlayerForm::_delete_track() {
        _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() {
@@ -266,7 +319,18 @@ void PlayerForm::_add_to_favorites() {
        if (idx.isEmpty())
                return;
        int id = idx.first().row();
-       _lib->addToFavorites(_current_playlist.tracks().at(id));
+       Track cur = _current_playlist.tracks().at(id);
+       if (!cur.source().isEmpty()) {
+               bool isf = _lib->isFavorite(cur);
+               if (!isf) {
+                       _lib->addToFavorites(cur);
+               } else {
+                       _lib->removeFromFavorites(cur);
+               }
+               isf = _lib->isFavorite(cur);
+               ui->cfavButton->setChecked(isf && !ui->cfavButton->icon().isNull() && id == _track_renderer->activeRow());
+       }
+
 }
 
 void PlayerForm::_state_changed(PlayerState state) {
@@ -283,7 +347,7 @@ void PlayerForm::_state_changed(PlayerState state) {
        }
 }
 
-void PlayerForm::_toggle_random() {
+void PlayerForm::toggleRandom() {
        _player->toggleRandom();
        if (_player->random()) {
                ui->randomButton->setIcon(QIcon(":/icons/"+_icons_theme+"/random_on.png"));
@@ -292,7 +356,7 @@ void PlayerForm::_toggle_random() {
        }
 }
 
-void PlayerForm::_toggle_repeat() {
+void PlayerForm::toggleRepeat() {
        _player->toggleRepeat();
        if (_player->repeat() == REPEAT_ALL) {
                ui->repeatButton->setIcon(QIcon(":/icons/"+_icons_theme+"/repeat_all.png"));
@@ -320,7 +384,7 @@ void PlayerForm::nextItem() {
        }
        QModelIndex id = _model->index(_search_current_id, 1);
        _track_renderer->setSearchRow(_search_current_id);
-       ui->playlistView->scrollTo(id);
+       ui->playlistView->scrollTo(id, QAbstractItemView::PositionAtCenter);
        ui->playlistView->hide();
        ui->playlistView->show();
 }
@@ -336,7 +400,7 @@ void PlayerForm::prevItem() {
        }
        QModelIndex id = _model->index(_search_current_id, 1);
        _track_renderer->setSearchRow(_search_current_id);
-       ui->playlistView->scrollTo(id);
+       ui->playlistView->scrollTo(id, QAbstractItemView::PositionAtCenter);
        ui->playlistView->hide();
        ui->playlistView->show();
 }
@@ -344,7 +408,7 @@ void PlayerForm::prevItem() {
 void PlayerForm::cancelSearch() {
        _search_pattern = "";
        _track_renderer->setSearchRow(-1);
-       ui->playlistView->scrollTo(_model->index(_track_renderer->activeRow(), 1));
+       ui->playlistView->scrollTo(_model->index(_track_renderer->activeRow(), 1), QAbstractItemView::PositionAtCenter);
        ui->playlistView->hide();
        ui->playlistView->show();
 }
@@ -394,36 +458,48 @@ void PlayerForm::_edit_tags() {
                reload(true);
                emit refreshLibrary();
        }
+       _display_track(track);
 }
 
 void PlayerForm::stop() {
        _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->topWidget->hide();
        ui->bottomWidget->hide();
 
+       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->bhorizontalLayout->removeItem(ui->chorizontalSpacer_0);
        ui->bhorizontalLayout->removeItem(ui->chorizontalSpacer_1);
        ui->bhorizontalLayout->removeItem(ui->chorizontalSpacer_2);
@@ -444,25 +520,49 @@ void PlayerForm::landscapeMode() {
        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);
+
+       ui->bhorWidget->show();
 
        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"));
        }
+       _pls_sort_form->landscapeMode();
 }
 
 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->bhorWidget->hide();
+
+       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);
@@ -495,23 +595,30 @@ void PlayerForm::portraitMode() {
        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);
+
+       ui->topWidget->show();
+       ui->bottomWidget->show();
 
        if (_tools_widget->isVisible()) {
                ui->moreButton->setIcon(QIcon(":/icons/"+_icons_theme+"/unmore.png"));
        } else {
                ui->moreButton->setIcon(QIcon(":/icons/"+_icons_theme+"/more.png"));
        }
+       _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(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();
        }
@@ -522,16 +629,32 @@ void PlayerForm::updateIcons() {
        _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 {
@@ -554,6 +677,7 @@ void PlayerForm::updateIcons() {
        } else {
                ui->randomButton->setIcon(QIcon(":/icons/"+_icons_theme+"/random_off.png"));
        }
+       _pls_sort_form->updateIcons();
 }
 
 void PlayerForm::checkGradient() {
@@ -565,6 +689,7 @@ void PlayerForm::checkGradient() {
                ui->topWidget->setStyleSheet("");
                ui->bottomWidget->setStyleSheet("");
        }
+       _pls_sort_form->updateGradiend();
 }
 
 void PlayerForm::play(Track track) {
@@ -573,5 +698,143 @@ void PlayerForm::play(Track track) {
        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->cfavButton->setChecked(_lib->isFavorite(_player->current()));
+               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->cfavButton->setChecked(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"));
+       _pls_sort_form->updateTranslations();
+}
+
+void PlayerForm::updateTrackColor() {
+       Config config;
+       QString color = config.getValue("ui/trackcolor").toString();
+       _track_renderer->setActiveTrackColor(color);
+       ui->playlistView->hide();
+       ui->playlistView->show();
+}
+
+void PlayerForm::next() {
+       _player->next();
+}
+
+void PlayerForm::prev() {
+       _player->prev();
+}
+
+QString PlayerForm::playerCaption() {
+       TrackMetadata meta = _player->current().metadata();
+       return QString("%1 - %2").arg(meta.artist()).arg(meta.title());
+}
+
+void PlayerForm::_start_playlist() {
+       Config config;
+       if (config.getValue("playback/autoresume_off").toBool()) {
+               _player->next();
+               return;
+       }
+       LastPlayed lp = _lib->getLastPlayedForCurPlaylist();
+       _player->setTrackId(lp.trackId);
+       _player->setAwaitingSeek(lp.position);
+}
+
+void PlayerForm::_sort_playlist() {
+       _pls_sort_form->setPlaylist(_current_playlist);
+       _pls_sort_form->show();
+}
+
+void PlayerForm::_playlist_sorted() {
+       _current_playlist = _pls_sort_form->getPlaylist();
+       _lib->saveCurrentPlaylist(_current_playlist);
+       _player->setPlaylist(_current_playlist);
+       __fill_list(_model, _current_playlist);
+       ui->playlistView->setColumnWidth(0, 50);
+       _track_renderer->setActiveRow(_current_playlist.tracks().indexOf(_player->current()));
+}
+
+void PlayerForm::toggle() {
+       _player->toggle();
+}