Switch to unified view

a/GUI/volumewidget/volumewidget.cpp b/GUI/volumewidget/volumewidget.cpp
...
...
18
#include "volumewidget.h"
18
#include "volumewidget.h"
19
#include "HelperStructs/Helper.h"
19
#include "HelperStructs/Helper.h"
20
20
21
#include <QDebug>
21
#include <QDebug>
22
22
23
VolumeWidget::VolumeWidget(QWidget *parent)
23
VolumeWidget::VolumeWidget(QWidget *parent, bool horiz)
24
    : VolumeWidgetIF(parent)
24
    : VolumeWidgetIF(parent), ui(new Ui::VolumeWidget)
25
{
25
{
26
    setupUi(this);
26
    ui->setupUi(this, horiz);
27
    init();
28
}
29
30
void VolumeWidget::init()
31
{
27
    volumeSlider->setMinimum(0);
32
    ui->volumeSlider->setMinimum(0);
28
    volumeSlider->setMaximum(100);
33
    ui->volumeSlider->setMaximum(100);
29
    connect(volumeSlider, SIGNAL(valueChanged(int)),
34
    connect(ui->volumeSlider, SIGNAL(valueChanged(int)),
30
            this, SLOT(onVolumeSliderChanged(int)));
35
            this, SLOT(onVolumeSliderChanged(int)));
31
    connect(btn_mute, SIGNAL(clicked()),
36
    connect(ui->btn_mute, SIGNAL(clicked()),
32
            this, SLOT(onMuteClicked()));
37
            this, SLOT(onMuteClicked()));
33
    setUi(20);
38
    setUi(20);
34
    setMuteUi(m_mute = false);
39
    setMuteUi(m_mute = false);
35
}
40
}
36
41
...
...
52
}
57
}
53
58
54
void VolumeWidget::set(int value)
59
void VolumeWidget::set(int value)
55
{
60
{
56
    setupButton(value);
61
    setupButton(value);
57
    volumeSlider->setValueNoSigs(value);
62
    ui->volumeSlider->setValueNoSigs(value);
58
    emit volumeChanged(value);
63
    emit volumeChanged(value);
59
}
64
}
60
65
61
void VolumeWidget::step(int steps)
66
void VolumeWidget::step(int steps)
62
{
67
{
63
    int current = volumeSlider->value();
68
    int current = ui->volumeSlider->value();
64
    current += steps;
69
    current += steps;
65
    if (current < 0)
70
    if (current < 0)
66
        current = 0;
71
        current = 0;
67
    if (current > 100)
72
    if (current > 100)
68
        current = 100;
73
        current = 100;
...
...
71
76
72
void VolumeWidget::setUi(int value)
77
void VolumeWidget::setUi(int value)
73
{
78
{
74
    if (!m_mute) {
79
    if (!m_mute) {
75
        setupButton(value);
80
        setupButton(value);
76
        volumeSlider->setValueNoSigs(value);
81
        ui->volumeSlider->setValueNoSigs(value);
77
    }
82
    }
78
}
83
}
79
84
80
void VolumeWidget::setMuteUi(bool ismute)
85
void VolumeWidget::setMuteUi(bool ismute)
81
{
86
{
82
    m_mute = ismute;
87
    m_mute = ismute;
83
    //qDebug() << "VolumeWidget::setMuteUi(" << m_mute << ")";
88
    //qDebug() << "VolumeWidget::setMuteUi(" << m_mute << ")";
84
    volumeSlider->setDisabled(m_mute);
89
    ui->volumeSlider->setDisabled(m_mute);
85
    if (m_mute) {
90
    if (m_mute) {
86
        btn_mute->setIcon(QIcon(Helper::getIconPath() + "vol_mute.png"));
91
        ui->btn_mute->setIcon(QIcon(Helper::getIconPath() + "vol_mute.png"));
87
    } else {
92
    } else {
88
        setupButton(volumeSlider->value());
93
        setupButton(ui->volumeSlider->value());
89
    }
94
    }
90
}
95
}
91
96
92
void VolumeWidget::setSkinName(const QString& s)
97
void VolumeWidget::setSkinName(const QString& s)
93
{
98
{
94
    m_skinSuffix = s.isEmpty() ? "" : "_" + s;
99
    m_skinSuffix = s.isEmpty() ? "" : "_" + s;
95
    setupButton(volumeSlider->value());
100
    setupButton(ui->volumeSlider->value());
96
}
101
}
97
102
98
void VolumeWidget::setupButton(int value)
103
void VolumeWidget::setupButton(int value)
99
{
104
{
100
    //qDebug() << "VolumeWidget::setupButton(" << value << ")";
105
    //qDebug() << "VolumeWidget::setupButton(" << value << ")";
...
...
109
    } else {
114
    } else {
110
        butFilename += QString("3") + m_skinSuffix + ".png";
115
        butFilename += QString("3") + m_skinSuffix + ".png";
111
    }
116
    }
112
117
113
    //qDebug() << "VolumeWidget::setupButton: fn: " << butFilename;
118
    //qDebug() << "VolumeWidget::setupButton: fn: " << butFilename;
114
    btn_mute->setIcon(QIcon(butFilename));
119
    ui->btn_mute->setIcon(QIcon(butFilename));
115
}
120
}