From c8c75f989ce2bcaf16fcfa7a1bb7451d7f5f3e6b Mon Sep 17 00:00:00 2001 From: Nikolay Tischenko Date: Mon, 4 Oct 2010 20:05:30 +0700 Subject: [PATCH] Moved contol buttons to top in portrait mode --- src/playerform.cpp | 39 ++- src/ui/playerform.ui | 913 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 585 insertions(+), 367 deletions(-) diff --git a/src/playerform.cpp b/src/playerform.cpp index b55e461..e0fab75 100644 --- a/src/playerform.cpp +++ b/src/playerform.cpp @@ -88,11 +88,16 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) : connect(ui->libraryButton, SIGNAL(clicked()), this, SLOT(_library())); connect(ui->viewButton, SIGNAL(clicked()), this, SLOT(_toggle_view())); + connect(ui->aViewButton, 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->aPlayPauseButton, SIGNAL(clicked()), _player, SLOT(toggle())); connect(ui->stopButton, SIGNAL(clicked()), _player, SLOT(stop())); + connect(ui->aStopButton, SIGNAL(clicked()), _player, SLOT(stop())); connect(ui->nextButton, SIGNAL(clicked()), _player, SLOT(next())); + connect(ui->aNextButton, SIGNAL(clicked()), _player, SLOT(next())); connect(ui->prevButton, SIGNAL(clicked()), _player, SLOT(prev())); + connect(ui->aPrevButton, 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())); @@ -110,6 +115,7 @@ 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())); + ui->topWidget->setVisible(false); } PlayerForm::~PlayerForm() @@ -137,9 +143,11 @@ void PlayerForm::_toggle_view() { index = (!index % 2); if (index) { ui->viewButton->setIcon(QIcon(":/icons/"+_icons_theme+"/playlist.png")); + ui->aViewButton->setIcon(QIcon(":/icons/"+_icons_theme+"/playlist.png")); emit hideSearchPanel(); } else { ui->viewButton->setIcon(QIcon(":/icons/"+_icons_theme+"/playback.png")); + ui->aViewButton->setIcon(QIcon(":/icons/"+_icons_theme+"/playback.png")); emit showSearchPanel(); } ui->stackedWidget->setCurrentIndex(index); @@ -218,6 +226,7 @@ void PlayerForm::_add_to_favorites() { void PlayerForm::_state_changed(PlayerState state) { if (state == PLAYER_PLAYING) { ui->playpauseButton->setIcon(QIcon(":/icons/"+_icons_theme+"/pause.png")); + ui->aPlayPauseButton->setIcon(QIcon(":/icons/"+_icons_theme+"/pause.png")); _seek_slider->setEnabled(true); } else { if (state == PLAYER_STOPPED) { @@ -226,6 +235,7 @@ void PlayerForm::_state_changed(PlayerState state) { _seek_slider->setEnabled(false); } ui->playpauseButton->setIcon(QIcon(":/icons/"+_icons_theme+"/play.png")); + ui->aPlayPauseButton->setIcon(QIcon(":/icons/"+_icons_theme+"/play.png")); } } @@ -356,10 +366,12 @@ void PlayerForm::updateIcons() { Config config; _icons_theme = config.getValue("ui/iconstheme").toString(); ui->libraryButton->setIcon(QIcon(":/icons/"+_icons_theme+"/library.png")); - if (ui->stackedWidget->currentIndex()) + if (ui->stackedWidget->currentIndex()) { ui->viewButton->setIcon(QIcon(":/icons/"+_icons_theme+"/playlist.png")); - else + ui->aViewButton->setIcon(QIcon(":/icons/"+_icons_theme+"/playlist.png")); + } else { ui->viewButton->setIcon(QIcon(":/icons/"+_icons_theme+"/playback.png")); + } if (_player->random()) ui->randomButton->setIcon(QIcon(":/icons/"+_icons_theme+"/random_active.png")); else @@ -369,25 +381,28 @@ void PlayerForm::updateIcons() { else ui->repeatButton->setIcon(QIcon(":/icons/"+_icons_theme+"/repeat_inactive.png")); ui->prevButton->setIcon(QIcon(":/icons/"+_icons_theme+"/prev.png")); - if (_player->state() == PLAYER_PLAYING) + ui->aPrevButton->setIcon(QIcon(":/icons/"+_icons_theme+"/prev.png")); + if (_player->state() == PLAYER_PLAYING) { ui->playpauseButton->setIcon(QIcon(":/icons/"+_icons_theme+"/pause.png")); - else + ui->aPlayPauseButton->setIcon(QIcon(":/icons/"+_icons_theme+"/pause.png")); + } else { ui->playpauseButton->setIcon(QIcon(":/icons/"+_icons_theme+"/play.png")); + ui->aPlayPauseButton->setIcon(QIcon(":/icons/"+_icons_theme+"/play.png")); + } ui->stopButton->setIcon(QIcon(":/icons/"+_icons_theme+"/stop.png")); + ui->aStopButton->setIcon(QIcon(":/icons/"+_icons_theme+"/stop.png")); ui->nextButton->setIcon(QIcon(":/icons/"+_icons_theme+"/next.png")); + ui->aNextButton->setIcon(QIcon(":/icons/"+_icons_theme+"/next.png")); ui->volumeButton->setIcon(QIcon(":/icons/"+_icons_theme+"/volume.png")); } void PlayerForm::landscapeMode() { - ui->libraryButton->setVisible(true); - ui->repeatButton->setVisible(true); - ui->randomButton->setVisible(true); - ui->volumeButton->setVisible(true); + ui->bottomWidget->setVisible(true); + ui->topWidget->setVisible(false); } void PlayerForm::portraitMode() { - ui->libraryButton->setVisible(false); - ui->repeatButton->setVisible(false); - ui->randomButton->setVisible(false); - ui->volumeButton->setVisible(false); + ui->bottomWidget->setVisible(false); + ui->volumeSlider->setVisible(false); + ui->topWidget->setVisible(true); } diff --git a/src/ui/playerform.ui b/src/ui/playerform.ui index de3abf4..cd1d9a2 100644 --- a/src/ui/playerform.ui +++ b/src/ui/playerform.ui @@ -6,21 +6,206 @@ 0 0 - 800 - 480 + 798 + 478 Form - - + + 0 - + 0 - + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 70 + 70 + + + + + 70 + 70 + + + + + + + + :/icons/white/playlist.png:/icons/white/playlist.png + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 70 + 70 + + + + + 70 + 70 + + + + + + + + :/icons/white/prev.png:/icons/white/prev.png + + + true + + + + + + + + 0 + 0 + + + + + 70 + 70 + + + + + 70 + 70 + + + + + + + + :/icons/white/play.png:/icons/white/play.png + + + true + + + + + + + + 0 + 0 + + + + + 70 + 70 + + + + + 70 + 70 + + + + + + + + :/icons/white/stop.png:/icons/white/stop.png + + + true + + + + + + + + 0 + 0 + + + + + 70 + 70 + + + + + 70 + 70 + + + + + + + + :/icons/white/next.png:/icons/white/next.png + + + true + + + + + + + 0 @@ -155,364 +340,382 @@ - + 0 - - - - 0 - 0 - - - - - 70 - 70 - - - - - 70 - 70 - - - - - - - - :/icons/white/library.png:/icons/white/library.png - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 70 - 70 - - - - - 70 - 70 - - - - - - - - :/icons/white/playlist.png:/icons/white/playlist.png - - - false - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 70 - 70 - - - - - 70 - 70 - - - - - - - - :/icons/white/random_inactive.png:/icons/white/random_inactive.png - - - - 48 - 48 - - - - false - - - true - - - - - - - - 0 - 0 - - + - 70 - 70 + 78 + 0 - - - 70 - 70 - - - - - - - - :/icons/white/repeat_inactive.png:/icons/white/repeat_inactive.png - - - - 48 - 58 - - - - false - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 70 - 70 - - - - - 70 - 70 - - - - - - - - :/icons/white/prev.png:/icons/white/prev.png - - - true - - - - - - - - 0 - 0 - - - - - 70 - 70 - - - - - 70 - 70 - - - - - - - - :/icons/white/play.png:/icons/white/play.png - - - true - - - - - - - - 0 - 0 - - - - - 70 - 70 - - - - - 70 - 70 - - - - - - - - :/icons/white/stop.png:/icons/white/stop.png - - - true - - - - - - - - 0 - 0 - - - - - 70 - 70 - - - - - 70 - 70 - - - - - - - - :/icons/white/next.png:/icons/white/next.png - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 70 - 70 - - - - - - - - :/icons/white/volume.png:/icons/white/volume.png - - - true - + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 70 + 70 + + + + + 70 + 70 + + + + + + + + :/icons/white/library.png:/icons/white/library.png + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 70 + 70 + + + + + 70 + 70 + + + + + + + + :/icons/white/playlist.png:/icons/white/playlist.png + + + false + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 70 + 70 + + + + + 70 + 70 + + + + + + + + :/icons/white/random_inactive.png:/icons/white/random_inactive.png + + + + 48 + 48 + + + + false + + + true + + + + + + + + 0 + 0 + + + + + 70 + 70 + + + + + 70 + 70 + + + + + + + + :/icons/white/repeat_inactive.png:/icons/white/repeat_inactive.png + + + + 48 + 58 + + + + false + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 70 + 70 + + + + + 70 + 70 + + + + + + + + :/icons/white/prev.png:/icons/white/prev.png + + + true + + + + + + + + 0 + 0 + + + + + 70 + 70 + + + + + 70 + 70 + + + + + + + + :/icons/white/play.png:/icons/white/play.png + + + true + + + + + + + + 0 + 0 + + + + + 70 + 70 + + + + + 70 + 70 + + + + + + + + :/icons/white/stop.png:/icons/white/stop.png + + + true + + + + + + + + 0 + 0 + + + + + 70 + 70 + + + + + 70 + 70 + + + + + + + + :/icons/white/next.png:/icons/white/next.png + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 70 + 70 + + + + + + + + :/icons/white/volume.png:/icons/white/volume.png + + + true + + + + -- 1.7.9.5