flaviotordini · thewolfwillcome · Jan 11, 2021
diff --git a/minitube.pro b/minitube.pro
@@ -48,10 +48,12 @@ include(src/yt/yt.pri)
 INCLUDEPATH += $$PWD/src
 
 HEADERS += src/video.h \
+    src/helper.h \
     src/messagebar.h \
     src/spacer.h \
     src/constants.h \
     src/playlistitemdelegate.h \
+    src/timeslider.h \
     src/updateutils.h \
     src/videoapi.h \
     src/videomimedata.h \
@@ -126,8 +128,10 @@ HEADERS += src/video.h \
     src/videoarea.h \
     src/searchlineedit.h
 SOURCES += src/main.cpp \
+    src/helper.cpp \
     src/messagebar.cpp \
     src/spacer.cpp \
+    src/timeslider.cpp \
     src/updateutils.cpp \
     src/video.cpp \
     src/videomimedata.cpp \

diff --git a/src/helper.cpp b/src/helper.cpp
@@ -0,0 +1,13 @@
+#include "helper.h"
+
+QString Helper::formatTime(qint64 duration) {
+    duration /= 1000;
+    QString res;
+    int seconds = (int)(duration % 60);
+    duration /= 60;
+    int minutes = (int)(duration % 60);
+    duration /= 60;
+    int hours = (int)(duration % 24);
+    if (hours == 0) return res.sprintf("%02d:%02d", minutes, seconds);
+    return res.sprintf("%02d:%02d:%02d", hours, minutes, seconds);
+}
diff --git a/src/helper.h b/src/helper.h
@@ -0,0 +1,12 @@
+#ifndef HELPER_H
+#define HELPER_H
+
+#include <QString>
+
+class Helper
+{
+public:
+    static QString formatTime(qint64 duration);
+};
+
+#endif // HELPER_H
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -72,6 +72,8 @@ along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
 #include "httputils.h"
 #include "jsfunctions.h"
 #include "seekslider.h"
+#include "timeslider.h"
+#include "helper.h"
 #include "sidebarwidget.h"
 #include "toolbarmenu.h"
 #include "videoarea.h"
@@ -310,8 +312,10 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *e) {
     }
 
     if (t == QEvent::ToolTip) {
-        // kill tooltips
-        return true;
+        // kill tooltips but not for time slider
+        if (!obj->isWidgetType() ||  qobject_cast<QWidget *>(obj) != seekSlider) {
+            return true;
+        }
     }
 
     if (t == QEvent::Show && obj == toolbarMenu) {
@@ -804,10 +808,9 @@ void MainWindow::createToolBar() {
     // Create widgets
     currentTimeLabel = new QLabel("00:00", this);
 
-    seekSlider = new SeekSlider(this);
+    seekSlider = new TimeSlider(this);
     seekSlider->setEnabled(false);
     seekSlider->setTracking(false);
-    seekSlider->setMaximum(1000);
     volumeSlider = new SeekSlider(this);
     volumeSlider->setValue(volumeSlider->maximum());
 
@@ -1592,6 +1595,8 @@ void MainWindow::initMedia() {
     connect(media, &Media::stateChanged, this, &MainWindow::stateChanged);
     connect(media, &Media::positionChanged, this, &MainWindow::tick);
 
+    seekSlider->setMedia(media);
+
     connect(seekSlider, &QSlider::sliderMoved, this, [this](int value) {
         // value : maxValue = posit ion : duration
         qint64 ms = (value * media->duration()) / seekSlider->maximum();
@@ -1635,29 +1640,17 @@ void MainWindow::tick(qint64 time) {
         seekSlider->setValue(value);
     }
 
-    const QString s = formatTime(time);
+    const QString s = Helper::formatTime(time);
     if (s != currentTimeLabel->text()) {
         currentTimeLabel->setText(s);
         emit currentTimeChanged(s);
 
         // remaining time
         const qint64 remainingTime = media->remainingTime();
-        currentTimeLabel->setStatusTip(tr("Remaining time: %1").arg(formatTime(remainingTime)));
+        currentTimeLabel->setStatusTip(tr("Remaining time: %1").arg(Helper::formatTime(remainingTime)));
     }
 }
 
-QString MainWindow::formatTime(qint64 duration) {
-    duration /= 1000;
-    QString res;
-    int seconds = (int)(duration % 60);
-    duration /= 60;
-    int minutes = (int)(duration % 60);
-    duration /= 60;
-    int hours = (int)(duration % 24);
-    if (hours == 0) return res.sprintf("%02d:%02d", minutes, seconds);
-    return res.sprintf("%02d:%02d:%02d", hours, minutes, seconds);
-}
-
 void MainWindow::volumeUp() {
     qreal newVolume = media->volume() + .1;
     if (newVolume > 1.) newVolume = 1.;

diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -35,6 +35,7 @@ class SearchParams;
 class VideoSource;
 class Suggestion;
 class ToolbarMenu;
+class TimeSlider;
 
 class MainWindow : public QMainWindow {
     Q_OBJECT
@@ -43,7 +44,7 @@ class MainWindow : public QMainWindow {
     static MainWindow *instance();
     MainWindow();
 
-    QSlider *getSeekSlider() { return seekSlider; }
+    TimeSlider *getSeekSlider() { return seekSlider; }
     QSlider *getVolumeSlider() { return volumeSlider; }
 
     QLabel *getCurrentTimeLabel() { return currentTimeLabel; }
@@ -156,7 +157,6 @@ private slots:
     void createToolBar();
     void createStatusBar();
     void showView(View *view, bool transition = false);
-    static QString formatTime(qint64 duration);
     bool confirmQuit();
     bool needStatusBar();
     void adjustMessageLabelPosition();
@@ -216,7 +216,7 @@ private slots:
     SearchLineEdit *toolbarSearch;
     QToolBar *statusToolBar;
     QAction *regionAction;
-    QSlider *seekSlider;
+    TimeSlider *seekSlider;
     QSlider *volumeSlider;
     QLabel *currentTimeLabel;
 

diff --git a/src/timeslider.cpp b/src/timeslider.cpp
@@ -0,0 +1,41 @@
+#include "timeslider.h"
+#include "media.h"
+#include "helper.h"
+
+#include <QHelpEvent>
+
+TimeSlider::TimeSlider(QWidget *parent) : SeekSlider(parent), media(nullptr) {
+    setMouseTracking( true );
+    setMaximum(1000);
+}
+
+void TimeSlider::setMedia(Media* newMedia)
+{
+    media = newMedia;
+}
+
+bool TimeSlider::event(QEvent *event)
+{
+    if (isEnabled() && event->type() == QEvent::ToolTip && nullptr != media) {
+        QHelpEvent * help_event = static_cast<QHelpEvent *>(event);
+        const qint64 duration = media->duration();
+
+        if (duration > 0) {
+            const qreal percentage = (qreal) help_event->x() / (qreal) width();
+            const qint64 time = (percentage * duration);
+
+            if (time > 0 && time <= duration) {
+                QToolTip::showText(help_event->globalPos(), Helper::formatTime(time), this);
+            } else {
+                QToolTip::hideText();
+                event->ignore();
+            }
+        }
+        else {
+            QToolTip::hideText();
+            event->ignore();
+        }
+        return true;
+    }
+    return SeekSlider::event(event);
+}
diff --git a/src/timeslider.h b/src/timeslider.h
@@ -0,0 +1,26 @@
+#ifndef TIMESLIDER_H
+#define TIMESLIDER_H
+
+#include "seekslider.h"
+
+class Media;
+
+
+class TimeSlider : public SeekSlider
+{
+    Q_OBJECT
+
+public:
+    TimeSlider(QWidget *parent = nullptr);
+
+    void setMedia(Media* newMedia);
+
+protected:
+    bool event(QEvent *event) override;
+
+private:
+    Media* media;
+
+};
+
+#endif // TIMESLIDER_H