qsui: improved volume slider

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6231 90c681e8-e032-0410-971d-27865f9a5e38

5 files changed, 148 insertions, 4 deletions

diff --git a/src/plugins/Ui/qsui/CMakeLists.txt b/src/plugins/Ui/qsui/CMakeLists.txt
index 0e2080acf..b26799490 100644
--- a/src/plugins/Ui/qsui/CMakeLists.txt
+++ b/src/plugins/Ui/qsui/CMakeLists.txt
@@ -53,6 +53,7 @@ SET(libqsui_SRCS
     listwidgetdrawer.cpp
     playlistheader.cpp
     hotkeyeditor.cpp
+    volumeslider.cpp
 )
 
 SET(libqsui_HDRS
diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index 3d40ed529..88ee306cd 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -19,7 +19,6 @@
  ***************************************************************************/
 #include <QPushButton>
 #include <QHBoxLayout>
-#include <QSlider>
 #include <QLabel>
 #include <QTreeView>
 #include <QMessageBox>
@@ -53,6 +52,7 @@
 #include "keyboardmanager.h"
 #include "coverwidget.h"
 #include "playlistbrowser.h"
+#include "volumeslider.h"
 #include "equalizer.h"
 
 #define KEY_OFFSET 10000
@@ -132,7 +132,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     m_ui.statusbar->setMinimumWidth(2);
     m_statusLabel->setMinimumWidth(2);
     //volume
-    m_volumeSlider = new QSlider(Qt::Horizontal, this);
+    m_volumeSlider = new VolumeSlider(this);
     m_volumeSlider->setFocusPolicy(Qt::NoFocus);
     m_volumeSlider->setFixedWidth(100);
     m_volumeSlider->setRange(0,100);
diff --git a/src/plugins/Ui/qsui/qsui.pro b/src/plugins/Ui/qsui/qsui.pro
index f04db48a2..fa90da976 100644
--- a/src/plugins/Ui/qsui/qsui.pro
+++ b/src/plugins/Ui/qsui/qsui.pro
@@ -36,7 +36,8 @@ SOURCES += \
     toolbareditor.cpp \
     listwidgetdrawer.cpp \
     playlistheader.cpp \
-    hotkeyeditor.cpp
+    hotkeyeditor.cpp \
+    volumeslider.cpp
 HEADERS += mainwindow.h \
     listwidget.h \
     visualmenu.h \
@@ -66,7 +67,8 @@ HEADERS += mainwindow.h \
     toolbareditor.h \
     listwidgetdrawer.h \
     playlistheader.h \
-    hotkeyeditor.h
+    hotkeyeditor.h \
+    volumeslider.h
 
 FORMS += forms/mainwindow.ui \
     forms/shortcutdialog.ui \
diff --git a/src/plugins/Ui/qsui/volumeslider.cpp b/src/plugins/Ui/qsui/volumeslider.cpp
new file mode 100644
index 000000000..1d5af625e
--- /dev/null
+++ b/src/plugins/Ui/qsui/volumeslider.cpp
@@ -0,0 +1,92 @@
+/***************************************************************************
+ *   Copyright (C) 2011-2016 by Ilya Kotov                                 *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+ ***************************************************************************/
+
+#include <QMouseEvent>
+#include <QWheelEvent>
+#include <QStyleOptionSlider>
+#include <QStyle>
+#include <QToolTip>
+#include <math.h>
+#include "volumeslider.h"
+
+VolumeSlider::VolumeSlider(QWidget *parent) : QSlider(Qt::Horizontal, parent)
+{
+    connect(this, SIGNAL(sliderMoved(int)), SLOT(onSliderMoved(int)));
+}
+
+void VolumeSlider::mousePressEvent (QMouseEvent *event)
+{
+    QStyleOptionSlider opt;
+    initStyleOption(&opt);
+    QRect sr = style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderHandle, this);
+
+    if (event->button() == Qt::LeftButton &&
+            sr.contains(event->pos()) == false)
+    {
+        int val;
+        if (orientation() == Qt::Vertical)
+            val = minimum() + ((maximum() - minimum()) * (height() - event->y())) / height();
+        else if(layoutDirection() == Qt::RightToLeft)
+            val = maximum() - ((maximum() - minimum()) * event->x()) / width();
+        else
+            val = minimum() + ((maximum() - minimum()) * event->x()) / width();
+
+        if (invertedAppearance() == true)
+        {
+            setValue(maximum() - val);
+            onSliderMoved(maximum() - val);
+        }
+        else
+        {
+            setValue(val);
+            onSliderMoved(val);
+        }
+
+        setSliderDown (true);
+        event->accept();
+    }
+    QSlider::mousePressEvent(event);
+}
+
+void VolumeSlider::mouseReleaseEvent (QMouseEvent *event)
+{
+    setSliderDown (false);
+    QSlider::mouseReleaseEvent(event);
+}
+
+void VolumeSlider::wheelEvent(QWheelEvent *event)
+{
+    setValue(value() + event->delta() / 20);
+    sliderReleased();
+}
+
+void VolumeSlider::onSliderMoved(int pos)
+{
+    if(minimum() != maximum())
+    {
+        QStyleOptionSlider opt;
+        initStyleOption(&opt);
+        QRect rect = style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderHandle, this);
+        rect.moveTo(rect.x() - 10 , rect.y() - 45);
+
+        int level = (pos - minimum()) * 100 / (maximum() - minimum());
+        QToolTip::showText(mapToGlobal(rect.topLeft()), tr("%1%").arg(level), this, QRect());
+    }
+}
diff --git a/src/plugins/Ui/qsui/volumeslider.h b/src/plugins/Ui/qsui/volumeslider.h
new file mode 100644
index 000000000..3194828fd
--- /dev/null
+++ b/src/plugins/Ui/qsui/volumeslider.h
@@ -0,0 +1,49 @@
+/***************************************************************************
+ *   Copyright (C) 2011-2016 by Ilya Kotov                                 *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+ ***************************************************************************/
+
+#ifndef VOLUMESLIDER_H
+#define VOLUMESLIDER_H
+
+#include <QSlider>
+
+class QWheelEvent;
+class QMouseEvent;
+
+/**
+    @author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+class VolumeSlider : public QSlider
+{
+    Q_OBJECT
+public:
+    explicit VolumeSlider(QWidget *parent = 0);
+    virtual ~VolumeSlider(){}
+
+protected:
+    virtual void mousePressEvent (QMouseEvent *event);
+    virtual void mouseReleaseEvent (QMouseEvent *event);
+    virtual void wheelEvent(QWheelEvent *event);
+
+private slots:
+    void onSliderMoved(int pos);
+
+};
+
+#endif // VOLUMESLIDER_H