Switch to unified view

a/GUI/volumewidget/volumewidget.cpp b/GUI/volumewidget/volumewidget.cpp
...
...
15
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
15
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16
 */
16
 */
17
17
18
#include "volumewidget.h"
18
#include "volumewidget.h"
19
#include "HelperStructs/Helper.h"
19
#include "HelperStructs/Helper.h"
20
#include "ui_volumewidget.h"
20
21
21
#include <QDebug>
22
#include <QDebug>
22
23
23
VolumeWidget::VolumeWidget(QWidget *parent, bool horiz)
24
VolumeWidget::VolumeWidget(QWidget *parent, bool horiz)
24
    : VolumeWidgetIF(parent), ui(new Ui::VolumeWidget)
25
    : VolumeWidgetIF(parent), ui(new Ui::VolumeWidget)
...
...
57
}
58
}
58
59
59
void VolumeWidget::set(int value)
60
void VolumeWidget::set(int value)
60
{
61
{
61
    setupButton(value);
62
    setupButton(value);
63
    ui->volumeSlider->blockSignals(true);
62
    ui->volumeSlider->setValueNoSigs(value);
64
    ui->volumeSlider->setValue(value);
65
    ui->volumeSlider->blockSignals(false);
63
    emit volumeChanged(value);
66
    emit volumeChanged(value);
64
}
67
}
65
68
66
void VolumeWidget::step(int steps)
69
void VolumeWidget::step(int steps)
67
{
70
{
...
...
76
79
77
void VolumeWidget::setUi(int value)
80
void VolumeWidget::setUi(int value)
78
{
81
{
79
    if (!m_mute) {
82
    if (!m_mute) {
80
        setupButton(value);
83
        setupButton(value);
84
        ui->volumeSlider->blockSignals(true);
81
        ui->volumeSlider->setValueNoSigs(value);
85
        ui->volumeSlider->setValue(value);
86
        ui->volumeSlider->blockSignals(false);
82
    }
87
    }
83
}
88
}
84
89
85
void VolumeWidget::setMuteUi(bool ismute)
90
void VolumeWidget::setMuteUi(bool ismute)
86
{
91
{
87
    m_mute = ismute;
92
    m_mute = ismute;
88
    //qDebug() << "VolumeWidget::setMuteUi(" << m_mute << ")";
93
    //qDebug() << "VolumeWidget::setMuteUi(" << m_mute << ")";
94
    // Ok, this is not nice, but I don't feel like defining the class
95
    // hierarchy which would allow a saner approach (SounSlider
96
    // derives from QAbstractSlider, DirectSlider from QSlider...
97
    SoundSlider *ssp = dynamic_cast<SoundSlider*>(ui->volumeSlider);
98
    DirectSlider *dsp = dynamic_cast<DirectSlider*>(ui->volumeSlider);
99
    if (ssp) {
100
        ssp->setMuted(ismute);
101
    } else if (dsp) {
102
        dsp->setDisabled(ismute);
103
    } else {
104
        qDebug() << "VolumeWidget::setMuteUi: slider neither Direct nor Sound";
105
    }
106
    
89
    ui->volumeSlider->setDisabled(m_mute);
107
    ui->volumeSlider->setDisabled(m_mute);
90
    if (m_mute) {
108
    if (m_mute) {
91
        ui->btn_mute->setIcon(QIcon(Helper::getIconPath() + "vol_mute.png"));
109
        ui->btn_mute->setIcon(QIcon(Helper::getIconPath() + "vol_mute.png"));
92
    } else {
110
    } else {
93
        setupButton(ui->volumeSlider->value());
111
        setupButton(ui->volumeSlider->value());