Switch to unified view

a/GUI/volumewidget/volumewidget.cpp b/GUI/volumewidget/volumewidget.cpp
...
...
104
        qDebug() << "VolumeWidget::setMuteUi: slider neither Direct nor Sound";
104
        qDebug() << "VolumeWidget::setMuteUi: slider neither Direct nor Sound";
105
    }
105
    }
106
    
106
    
107
    ui->volumeSlider->setDisabled(m_mute);
107
    ui->volumeSlider->setDisabled(m_mute);
108
    if (m_mute) {
108
    if (m_mute) {
109
        ui->btn_mute->setIcon(QIcon(Helper::getIconPath() + "vol_mute.png"));
109
        ui->btn_mute->setIcon(QIcon(Helper::getIconPath("vol_mute.png")));
110
    } else {
110
    } else {
111
        setupButton(ui->volumeSlider->value());
111
        setupButton(ui->volumeSlider->value());
112
    }
112
    }
113
}
113
}
114
114
115
void VolumeWidget::setSkinName(const QString& s)
115
void VolumeWidget::updateSkin()
116
{
116
{
117
    m_skinSuffix = s.isEmpty() ? "" : "_" + s;
118
    setupButton(ui->volumeSlider->value());
117
    setupButton(ui->volumeSlider->value());
119
}
118
}
120
119
121
void VolumeWidget::setupButton(int value)
120
void VolumeWidget::setupButton(int value)
122
{
121
{
123
    //qDebug() << "VolumeWidget::setupButton(" << value << ")";
122
    //qDebug() << "VolumeWidget::setupButton(" << value << ")";
124
    QString butFilename = Helper::getIconPath() + "vol_";
123
    QString butFilename;
125
126
    if (value <= 1) {
124
    if (value <= 1) {
127
        butFilename += QString("mute") + m_skinSuffix + ".png";
125
        butFilename = Helper::getIconPath("vol_mute.png");
128
    } else if (value < 40) {
126
    } else if (value < 40) {
129
        butFilename += QString("1") + m_skinSuffix + ".png";
127
        butFilename += Helper::getIconPath("vol_1.png");
130
    } else if (value < 80) {
128
    } else if (value < 80) {
131
        butFilename += QString("2") + m_skinSuffix + ".png";
129
        butFilename += Helper::getIconPath("vol_2.png");
132
    } else {
130
    } else {
133
        butFilename += QString("3") + m_skinSuffix + ".png";
131
        butFilename += Helper::getIconPath("vol_3.png");
134
    }
132
    }
135
133
136
    //qDebug() << "VolumeWidget::setupButton: fn: " << butFilename;
134
    //qDebug() << "VolumeWidget::setupButton: fn: " << butFilename;
137
    ui->btn_mute->setIcon(QIcon(butFilename));
135
    ui->btn_mute->setIcon(QIcon(butFilename));
138
}
136
}