From: Flavio Tordini <flavio.tordini@gmail.com>
Date: Mon, 2 Nov 2009 20:22:36 +0000 (+0100)
Subject: Better statustips for the sort bar
X-Git-Tag: 0.8~32
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9f42c514badadae51a9d1c2d3de5e2090699a1fa;p=minitube

Better statustips for the sort bar
try to improve the Mac playback workaround
---

diff --git a/src/MediaView.cpp b/src/MediaView.cpp
index fb74443..8427aa6 100644
--- a/src/MediaView.cpp
+++ b/src/MediaView.cpp
@@ -24,21 +24,21 @@ MediaView::MediaView(QWidget *parent) : QWidget(parent) {
     mostRelevantAction = new QAction(tr("Most relevant"), this);
     QKeySequence keySequence(Qt::CTRL + Qt::Key_1);
     mostRelevantAction->setShortcut(keySequence);
-    mostRelevantAction->setStatusTip(keySequence.toString(QKeySequence::NativeText));
+    mostRelevantAction->setStatusTip(mostRelevantAction->text() + " (" + keySequence.toString(QKeySequence::NativeText) + ")");
     addAction(mostRelevantAction);
     connect(mostRelevantAction, SIGNAL(triggered()), this, SLOT(searchMostRelevant()), Qt::QueuedConnection);
     sortBar->addAction(mostRelevantAction);
     mostRecentAction = new QAction(tr("Most recent"), this);
     keySequence = QKeySequence(Qt::CTRL + Qt::Key_2);
     mostRecentAction->setShortcut(keySequence);
-    mostRecentAction->setStatusTip(keySequence.toString(QKeySequence::NativeText));
+    mostRecentAction->setStatusTip(mostRecentAction->text() + " (" + keySequence.toString(QKeySequence::NativeText) + ")");
     addAction(mostRecentAction);
     connect(mostRecentAction, SIGNAL(triggered()), this, SLOT(searchMostRecent()), Qt::QueuedConnection);
     sortBar->addAction(mostRecentAction);
     mostViewedAction = new QAction(tr("Most viewed"), this);
     keySequence = QKeySequence(Qt::CTRL + Qt::Key_3);
     mostViewedAction->setShortcut(keySequence);
-    mostViewedAction->setStatusTip(keySequence.toString(QKeySequence::NativeText));
+    mostViewedAction->setStatusTip(mostViewedAction->text() + " (" + keySequence.toString(QKeySequence::NativeText) + ")");
     addAction(mostViewedAction);
     connect(mostViewedAction, SIGNAL(triggered()), this, SLOT(searchMostViewed()), Qt::QueuedConnection);
     sortBar->addAction(mostViewedAction);
@@ -109,7 +109,7 @@ MediaView::MediaView(QWidget *parent) : QWidget(parent) {
 
     workaroundTimer = new QTimer(this);
     workaroundTimer->setSingleShot(true);
-    workaroundTimer->setInterval(1000);
+    workaroundTimer->setInterval(3000);
     connect(workaroundTimer, SIGNAL(timeout()), SLOT(timerPlay()));
 
 }
@@ -399,11 +399,13 @@ void MediaView::setPlaylistVisible(bool visible) {
 }
 
 void MediaView::timerPlay() {
-    // qDebug() << mediaObject->currentTime();
     // Workaround Phonon bug on Mac OSX
+    qDebug() << mediaObject->currentTime();
     if (mediaObject->currentTime() <= 0 && mediaObject->state() == Phonon::PlayingState) {
+        // qDebug() << "Mac playback workaround";
         mediaObject->pause();
-        mediaObject->play();
+        QTimer::singleShot(1000, mediaObject, SLOT(play()));
+        // mediaObject->play();
     }
 }