Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5112 from narunlifescience/master

Browse Source 
add volume icon label to background stream settings page
This commit is contained in:
John Maguire 2015-11-12 13:45:11 +01:00
commit 6de85589ba
5 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/data.qrc
View File

@ -19,6 +19,8 @@
<file>icons/22x22/audio-card.png</file>
<file>icons/22x22/audio-headphones.png</file>
<file>icons/22x22/audio-headset.png</file>
<file>icons/22x22/audio-volume-medium.png</file>
<file>icons/22x22/audio-volume-muted.png</file>
<file>icons/22x22/configure.png</file>
<file>icons/22x22/dialog-ok-apply.png</file>
<file>icons/22x22/dialog-warning.png</file>
@ -102,6 +104,8 @@
<file>icons/22x22/zoom-in.png</file>
<file>icons/32x32/application-exit.png</file>
<file>icons/32x32/applications-internet.png</file>
<file>icons/32x32/audio-volume-medium.png</file>
<file>icons/32x32/audio-volume-muted.png</file>
<file>icons/32x32/configure.png</file>
<file>icons/32x32/document-new.png</file>
<file>icons/32x32/document-open-folder.png</file>
@ -184,6 +188,8 @@
<file>icons/32x32/zoom-in.png</file>
<file>icons/48x48/application-exit.png</file>
<file>icons/48x48/applications-internet.png</file>
<file>icons/48x48/audio-volume-medium.png</file>
<file>icons/48x48/audio-volume-muted.png</file>
<file>icons/48x48/configure.png</file>
<file>icons/48x48/document-new.png</file>
<file>icons/48x48/document-open-folder.png</file>

BIN
data/icons/22x22/audio-volume-medium.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
data/icons/32x32/audio-volume-medium.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
data/icons/48x48/audio-volume-medium.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

4
src/ui/backgroundstreamssettingspage.cpp
View File

@ -47,15 +47,19 @@ void BackgroundStreamsSettingsPage::AddStream(const QString& name) {
BackgroundStreams* streams = dialog()->background_streams();
QGroupBox* box = new QGroupBox(tr(name.toUtf8()));
QLabel *label = new QLabel(box);
QSlider* slider = new QSlider(Qt::Horizontal, box);
QCheckBox* check = new QCheckBox(box);
QHBoxLayout* hbox_layout = new QHBoxLayout(box);
hbox_layout->addWidget(label);
hbox_layout->addWidget(slider);
hbox_layout->addWidget(check);
QVBoxLayout* streams_layout = qobject_cast<QVBoxLayout*>(layout());
streams_layout->insertWidget(streams_layout->count() - 1, box);
label->setPixmap(QPixmap(IconLoader::Load("audio-volume-medium",
IconLoader::Base).pixmap(32)));
slider->setProperty("stream_name", name);
check->setProperty("stream_name", name);