Switch to unified view

a/GUI/volumewidget/soundslider.cpp b/GUI/volumewidget/soundslider.cpp
...
...
35
#include <QPainter>
35
#include <QPainter>
36
#include <QColor>
36
#include <QColor>
37
#include <QPaintEvent>
37
#include <QPaintEvent>
38
#include <QBitmap>
38
#include <QBitmap>
39
39
40
#include "../../HelperStructs/Helper.h"
41
40
#ifndef __MIN
42
#ifndef __MIN
41
#define __MIN(A,B) ((A)<(B)?(A):(B))
43
#define __MIN(A,B) ((A)<(B)?(A):(B))
42
#define __MAX(A,B) ((A)>(B)?(A):(B))
44
#define __MAX(A,B) ((A)>(B)?(A):(B))
43
#define qfu( i ) QString::fromUtf8( i )
45
#define qfu( i ) QString::fromUtf8( i )
44
#endif
46
#endif
...
...
63
    setMouseTracking( true );
65
    setMouseTracking( true );
64
    isSliding = false;
66
    isSliding = false;
65
    b_mouseOutside = true;
67
    b_mouseOutside = true;
66
    b_isMuted = false;
68
    b_isMuted = false;
67
69
68
    const QPixmap pixOutsideRaw( ":/volslide-outside" );
70
    const QPixmap pixOutsideRaw(Helper::getIconPath("volume-slider-outside.png"));
69
    const QSize pixOutsideSize(
71
    const QSize pixOutsideSize(
70
                static_cast<qreal>(pixOutsideRaw.width()) * scalingFactorX,
72
                static_cast<qreal>(pixOutsideRaw.width()) * scalingFactorX,
71
                static_cast<qreal>(pixOutsideRaw.height()) * scalingFactorY
73
                static_cast<qreal>(pixOutsideRaw.height()) * scalingFactorY
72
            );
74
            );
73
    pixOutside = pixOutsideRaw.scaled(pixOutsideSize);
75
    pixOutside = pixOutsideRaw.scaled(pixOutsideSize);
74
76
75
    const QPixmap tempRaw( ":/volslide-inside" );
77
    const QPixmap tempRaw(Helper::getIconPath("volume-slider-inside.png"));
76
    const QSize tempSize(
78
    const QSize tempSize(
77
                    static_cast<qreal>(tempRaw.width()) * scalingFactorX,
79
                    static_cast<qreal>(tempRaw.width()) * scalingFactorX,
78
                    static_cast<qreal>(tempRaw.height()) * scalingFactorY
80
                    static_cast<qreal>(tempRaw.height()) * scalingFactorY
79
            );
81
            );
80
    const QPixmap temp = tempRaw.scaled(tempSize);
82
    const QPixmap temp = tempRaw.scaled(tempSize);