projects / someplayer / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Version 1.3.5
[someplayer] / src / playerform.cpp
diff --git a/src/playerform.cpp b/src/playerform.cpp
index 31352d0..3c5f3dd 100644 (file)
--- a/src/playerform.cpp
+++ b/src/playerform.cpp
@@ -27,18 +27,23 @@
 #include <QResource>
 #include "playlistdialog.h"
 #include "edittagsdialog.h"
+#include <QSpacerItem>
+#include "config.h"
 
 using namespace SomePlayer::DataObjects;
 using namespace SomePlayer::Playback;
+using namespace SomePlayer::Storage;
 
 inline void __fill_list(QStandardItemModel *_model, Playlist playlist) {
        _model->clear();
        QList<Track> tracks = playlist.tracks();
        int count = tracks.count();
        _model->setRowCount(count);
+       QTime time;
        for (int i = 0; i < count; i++) {
                TrackMetadata meta = tracks.at(i).metadata();
-               QString t = meta.title()+"#_#"+meta.artist()+"#_#"+meta.album();
+               time.setHMS(0, meta.length()/60, meta.length() % 60);
+               QString t = meta.title()+"#_#"+meta.artist()+"#_#"+meta.album()+"#_#"+time.toString("mm:ss");
                _model->setItem(i, 0, new QStandardItem(t));
        }
 }
@@ -52,22 +57,23 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) :
        _time = new QTime();
        ui->setupUi(this);
        if (_player->random()) {
-               ui->randomButton->setIcon(QIcon(":/icons/random_active.png"));
+               ui->randomButton->setIcon(QIcon(":/icons/white/random_active.png"));
        } else {
-               ui->randomButton->setIcon(QIcon(":/icons/random_inactive.png"));
+               ui->randomButton->setIcon(QIcon(":/icons/white/random_inactive.png"));
        }
        if (_player->repeat()) {
-               ui->repeatButton->setIcon(QIcon(":/icons/repeat_active.png"));
+               ui->repeatButton->setIcon(QIcon(":/icons/white/repeat_active.png"));
        } else {
-               ui->repeatButton->setIcon(QIcon(":/icons/repeat_inactive.png"));
+               ui->repeatButton->setIcon(QIcon(":/icons/white/repeat_inactive.png"));
        }
        ui->volumeSlider->setMinimum(0);
        ui->volumeSlider->setMaximum(100);
        ui->volumeSlider->hide();
-       _seek_slider = new QSlider(Qt::Horizontal);
-       _seek_slider->setEnabled(false);
-       ui->progressLayout->insertWidget(1, _seek_slider);
-       _seek_slider->setTracking(false);
+       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);
@@ -78,6 +84,8 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) :
        QAction *edit_tags = _context_menu->addAction("Edit tags");
 
        _track_renderer = new TrackRenderer(this);
+       _track_renderer->setActiveRow(-1);
+       _track_renderer->setSearchRow(-1);
        ui->playlistView->setItemDelegateForColumn(0, _track_renderer);
 
        _tag_resolver = new TagResolver(this);
@@ -86,16 +94,16 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) :
        connect(ui->viewButton, SIGNAL(clicked()), this, SLOT(_toggle_view()));
        connect(ui->playlistView, SIGNAL(clicked(QModelIndex)), this, SLOT(_process_click(QModelIndex)));
        connect(ui->playpauseButton, SIGNAL(clicked()), _player, SLOT(toggle()));
-       connect(ui->stopButton, SIGNAL(clicked()), _player, SLOT(stop()));
        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(_seek_slider, SIGNAL(sliderReleased()), this, SLOT(_slider_released()));
+       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_venu_requested(QPoint)));
+       connect(ui->playlistView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(_custom_context_menu_requested(QPoint)));
        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()));
@@ -105,6 +113,17 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) :
        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(_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()));
+       connect(_tools_widget, SIGNAL(toggleFullscreen(bool)), this, SIGNAL(fullscreen(bool)));
+
+       // dbus
+       _dbusadaptor = new DBusAdaptop(_player);
+       QDBusConnection connection = QDBusConnection::sessionBus();
+       bool ret = connection.registerService(_SERVICE_NAME_);
+       ret = connection.registerObject("/", _player);
 }
 
 PlayerForm::~PlayerForm()
@@ -116,24 +135,23 @@ void PlayerForm::_library() {
        emit library();
 }
 
-void PlayerForm::reload() {
-       if (ui->stackedWidget->currentIndex() == 1) {
-               emit hideSearchPanel();
+void PlayerForm::reload(bool reread) {
+       if (reread) {
+               _current_playlist = _lib->getCurrentPlaylist();
+               _player->setPlaylist(_current_playlist);
+               __fill_list(_model, _current_playlist);
        }
-       _current_playlist = _lib->getCurrentPlaylist();
-       _player->setPlaylist(_current_playlist);
-       __fill_list(_model, _current_playlist);
 }
 
 void PlayerForm::_toggle_view() {
        int index = ui->stackedWidget->currentIndex();
        index = (!index % 2);
        if (index) {
-               ui->viewButton->setIcon(QIcon(":/icons/playlist.png"));
-               emit hideSearchPanel();
+               ui->viewButton->setIcon(QIcon(":/icons/white/playlist.png"));
+               ui->moreButton->setEnabled(false);
        } else {
-               ui->viewButton->setIcon(QIcon(":/icons/playback.png"));
-               emit showSearchPanel();
+               ui->viewButton->setIcon(QIcon(":/icons/white/playback.png"));
+               ui->moreButton->setEnabled(true);
        }
        ui->stackedWidget->setCurrentIndex(index);
 }
@@ -167,8 +185,8 @@ void PlayerForm::_display_track(Track track) {
        ui->artistAlbumLabel->setText(QString("<b>%1</b><br/>%2").
                                                                  arg(track.metadata().artist()).
                                                                  arg(track.metadata().album()));
-       _seek_slider->setMinimum(0);
-       _seek_slider->setMaximum(track.metadata().length());
+       ui->seekSlider->setMinimum(0);
+       ui->seekSlider->setMaximum(track.metadata().length());
        _tick(0, track.metadata().length());
 }
 
@@ -177,23 +195,29 @@ void PlayerForm::_tick(int done, int all) {
        ui->allTimeLabel->setText(_time->toString("mm:ss"));
        _time->setHMS(0, done/60, done%60);
        ui->doneTimeLabel->setText(_time->toString("mm:ss"));
-       _seek_slider->setValue(done);
+       ui->seekSlider->setValue(done);
 }
 
 void PlayerForm::_slider_released() {
-       _player->seek(_seek_slider->value());
+       _player->seek(ui->seekSlider->value());
 }
 
-void PlayerForm::_custom_context_venu_requested(const QPoint &pos) {
+void PlayerForm::_custom_context_menu_requested(const QPoint &pos) {
        _context_menu->exec(pos);
 }
 
 void PlayerForm::_delete_track() {
        QList<QModelIndex> idx = ui->playlistView->selectionModel()->selectedIndexes();
        int id = idx.first().row();
+       int aid = _track_renderer->activeRow();
+       if (aid > id) {
+               _track_renderer->setActiveRow(aid-1);
+       } else if (aid == id) {
+               _track_renderer->setActiveRow(-1);
+       }
        _current_playlist.removeTrackAt(id);
        _lib->saveCurrentPlaylist(_current_playlist);
-       reload();
+       reload(true);
 }
 
 void PlayerForm::_enqueue_track() {
@@ -210,37 +234,37 @@ void PlayerForm::_add_to_favorites() {
 
 void PlayerForm::_state_changed(PlayerState state) {
        if (state == PLAYER_PLAYING) {
-               ui->playpauseButton->setIcon(QIcon(":/icons/pause.png"));
-               _seek_slider->setEnabled(true);
+               ui->playpauseButton->setIcon(QIcon(":/icons/white/pause.png"));
+               ui->seekSlider->setEnabled(true);
        } else {
                if (state == PLAYER_STOPPED) {
-                       _seek_slider->setValue(0);
+                       ui->seekSlider->setValue(0);
                        ui->doneTimeLabel->setText("00:00");
-                       _seek_slider->setEnabled(false);
+                       ui->seekSlider->setEnabled(false);
                }
-               ui->playpauseButton->setIcon(QIcon(":/icons/play.png"));
+               ui->playpauseButton->setIcon(QIcon(":/icons/white/play.png"));
        }
 }
 
 void PlayerForm::_toggle_random() {
        _player->toggleRandom();
        if (_player->random()) {
-               ui->randomButton->setIcon(QIcon(":/icons/random_active.png"));
+               ui->randomButton->setIcon(QIcon(":/icons/white/random_active.png"));
        } else {
-               ui->randomButton->setIcon(QIcon(":/icons/random_inactive.png"));
+               ui->randomButton->setIcon(QIcon(":/icons/white/random_inactive.png"));
        }
 }
 
 void PlayerForm::_toggle_repeat() {
        _player->toggleRepeat();
        if (_player->repeat()) {
-               ui->repeatButton->setIcon(QIcon(":/icons/repeat_active.png"));
+               ui->repeatButton->setIcon(QIcon(":/icons/white/repeat_active.png"));
        } else {
-               ui->repeatButton->setIcon(QIcon(":/icons/repeat_inactive.png"));
+               ui->repeatButton->setIcon(QIcon(":/icons/white/repeat_inactive.png"));
        }
 }
 
-void PlayerForm::search(QString &pattern) {
+void PlayerForm::search(QString pattern) {
        _search_pattern = pattern;
        _search_current_id = -1;
        nextItem();
@@ -323,7 +347,7 @@ void PlayerForm::_edit_tags() {
        if (dialog.exec() == QDialog::Accepted) {
                track.setMetadata(dialog.meta());
                _lib->updateTrackMetadata(track);
-               reload();
+               reload(true);
        }
 }
 
@@ -344,3 +368,26 @@ void PlayerForm::_volume_changed() {
        int value = ui->volumeSlider->value();
        _player->setVolume(value);
 }
+
+void PlayerForm::landscapeMode() {
+       ui->progressLayout->removeItem(ui->seekSpacer);
+       ui->progressLayout->insertWidget(1, ui->seekSlider);
+       ui->progressWidget->setVisible(false);
+}
+
+void PlayerForm::portraitMode() {
+       ui->progressLayout->insertSpacerItem(1, ui->seekSpacer);
+       ui->progressWidget->layout()->addWidget(ui->seekSlider);
+       ui->progressWidget->setVisible(true);
+}
+
+void PlayerForm::_tools_widget_toggle() {
+       if (_tools_widget->isVisible()) {
+               ui->moreButton->setIcon(QIcon(":/icons/white/more.png"));
+               _tools_widget->hide();
+               cancelSearch();
+       } else {
+               ui->moreButton->setIcon(QIcon(":/icons/white/unmore.png"));
+               _tools_widget->show();
+       }
+}
Unnamed repository; edit this file to name it for gitweb.