X-Git-Url: http://git.maemo.org/git/?p=someplayer;a=blobdiff_plain;f=src%2Fplayerform.cpp;h=6bb2379a2cd9cf30ef55836fdc456b7610723634;hp=d0bb5dcccc7999f921ffb9bcc7651cb6658fde65;hb=b0e8612b3fe8ff513f9c63637c4a546a4a0cea58;hpb=e0bce0a80c207c746ef2e5de527d7919e63252f7;ds=sidebyside

diff --git a/src/playerform.cpp b/src/playerform.cpp
index d0bb5dc..6bb2379 100644
--- a/src/playerform.cpp
+++ b/src/playerform.cpp
@@ -1,10 +1,12 @@
 #include "playerform.h"
 #include "ui_playerform.h"
 #include "library.h"
+#include "player/player.h"
 #include <QDebug>
 #include <QTime>
 #include <QSlider>
 #include "trackrenderer.h"
+#include <QResource>
 
 using namespace SomePlayer::DataObjects;
 using namespace SomePlayer::Playback;
@@ -27,6 +29,7 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) :
 {
 	_lib = lib;
 	_player = new Player(this);
+	_time = new QTime();
     ui->setupUi(this);
 	connect(ui->libraryButton, SIGNAL(clicked()), this, SLOT(_library()));
 	connect(ui->viewButton, SIGNAL(clicked()), this, SLOT(_toggle_view()));
@@ -37,11 +40,20 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) :
 	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()), _player, SLOT(toggleRandom()));
-	connect(ui->repeatButton, SIGNAL(clicked()), _player, SLOT(toggleRepeat()));
-	ui->randomButton->setChecked(_player->random());
-	ui->repeatButton->setChecked(_player->repeat());
+	connect(ui->randomButton, SIGNAL(clicked()), this, SLOT(_toggle_random()));
+	connect(ui->repeatButton, SIGNAL(clicked()), this, SLOT(_toggle_repeat()));
+	if (_player->random()) {
+		ui->randomButton->setIcon(QIcon(":/icons/random_active.png"));
+	} else {
+		ui->randomButton->setIcon(QIcon(":/icons/random_inactive.png"));
+	}
+	if (_player->repeat()) {
+		ui->repeatButton->setIcon(QIcon(":/icons/repeat_active.png"));
+	} else {
+		ui->repeatButton->setIcon(QIcon(":/icons/repeat_inactive.png"));
+	}
 	_seek_slider = new QSlider(Qt::Horizontal);
+	_seek_slider->setEnabled(false);
 	ui->progressLayout->insertWidget(1, _seek_slider);
 	_seek_slider->setTracking(false);
 	connect(_seek_slider, SIGNAL(sliderReleased()), this, SLOT(_slider_released()));
@@ -49,12 +61,13 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) :
 	_model = new QStandardItemModel(0, 2, this);
 	ui->playlistView->setModel(_model);
 	_context_menu = new QMenu(ui->playlistView);
-	QAction *delete_action = _context_menu->addAction("Delete");
+	QAction *delete_action = _context_menu->addAction(QIcon(":/icons/delete.png"), "Delete");
 	connect(delete_action, SIGNAL(triggered()), this, SLOT(_delete_track()));
-	QAction *enqueue_action = _context_menu->addAction("Enqueue");
+	QAction *enqueue_action = _context_menu->addAction(QIcon(":/icons/add.png"), "Enqueue");
 	connect(enqueue_action, SIGNAL(triggered()), this, SLOT(_enqueue_track()));
-	QAction *add_to_favorites = _context_menu->addAction("Add to favorites");
+	QAction *add_to_favorites = _context_menu->addAction(QIcon(":/icons/fav.png"), "Add to favorites");
 	connect(add_to_favorites, SIGNAL(triggered()), this, SLOT(_add_to_favorites()));
+	connect(_player, SIGNAL(stateChanged(PlayerState)), this, SLOT(_state_changed(PlayerState)));
 
 	_track_renderer = new TrackRenderer(this);
 	ui->playlistView->setItemDelegateForColumn(0, _track_renderer);
@@ -71,6 +84,9 @@ void PlayerForm::_library() {
 }
 
 void PlayerForm::reload() {
+	if (ui->stackedWidget->currentIndex() == 1) {
+		emit hideSearchPanel();
+	}
 	_current_playlist = _lib->getCurrentPlaylist();
 	_player->setPlaylist(_current_playlist);
 	__fill_list(_model, _current_playlist);
@@ -79,6 +95,13 @@ void PlayerForm::reload() {
 void PlayerForm::_toggle_view() {
 	int index = ui->stackedWidget->currentIndex();
 	index = (!index % 2);
+	if (index) {
+		ui->viewButton->setIcon(QIcon(":/icons/playlist.png"));
+		emit hideSearchPanel();
+	} else {
+		ui->viewButton->setIcon(QIcon(":/icons/playback.png"));
+		emit showSearchPanel();
+	}
 	ui->stackedWidget->setCurrentIndex(index);
 }
 
@@ -108,7 +131,7 @@ void PlayerForm::_display_track(Track track) {
 							arg(_current_playlist.tracks().indexOf(track)+1).
 							arg(_current_playlist.tracks().count()));
 	ui->titleLabel->setText(QString("<h3>%1</h3>").arg(track.metadata().title()));
-	ui->artistAlbumLabel->setText(QString("<h3>%1</h3><br/>%2").
+	ui->artistAlbumLabel->setText(QString("<b>%1</b><br/>%2").
 								  arg(track.metadata().artist()).
 								  arg(track.metadata().album()));
 	_seek_slider->setMinimum(0);
@@ -117,10 +140,10 @@ void PlayerForm::_display_track(Track track) {
 }
 
 void PlayerForm::_tick(int done, int all) {
-	QTime time(0, all/60, all%60);
-	ui->allTimeLabel->setText(time.toString("mm:ss"));
-	time.setHMS(0, done/60, done%60);
-	ui->doneTimeLabel->setText(time.toString("mm:ss"));
+	_time->setHMS(0, all/60, all%60);
+	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);
 }
 
@@ -151,3 +174,49 @@ void PlayerForm::_add_to_favorites() {
 	int id = idx.first().row();
 	_lib->addToFavorites(_current_playlist.tracks().at(id));
 }
+
+void PlayerForm::_state_changed(PlayerState state) {
+	if (state == PLAYER_PLAYING) {
+		ui->playpauseButton->setIcon(QIcon(":/icons/pause.png"));
+		_seek_slider->setEnabled(true);
+	} else {
+		if (state == PLAYER_STOPPED) {
+			_seek_slider->setValue(0);
+			ui->doneTimeLabel->setText("00:00");
+			_seek_slider->setEnabled(false);
+		}
+		ui->playpauseButton->setIcon(QIcon(":/icons/play.png"));
+	}
+}
+
+void PlayerForm::_toggle_random() {
+	_player->toggleRandom();
+	if (_player->random()) {
+		ui->randomButton->setIcon(QIcon(":/icons/random_active.png"));
+	} else {
+		ui->randomButton->setIcon(QIcon(":/icons/random_inactive.png"));
+	}
+}
+
+void PlayerForm::_toggle_repeat() {
+	_player->toggleRepeat();
+	if (_player->repeat()) {
+		ui->repeatButton->setIcon(QIcon(":/icons/repeat_active.png"));
+	} else {
+		ui->repeatButton->setIcon(QIcon(":/icons/repeat_inactive.png"));
+	}
+}
+
+void PlayerForm::search(QString &pattern) {
+	_search_pattern = pattern;
+}
+
+void PlayerForm::nextItem() {
+}
+
+void PlayerForm::prevItem() {
+}
+
+void PlayerForm::cancelSearch() {
+	_search_pattern = "";
+}