Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
f45f6bf7
Commit
f45f6bf7
authored
Dec 22, 2007
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4 - Add a "medium" volume icon as requested on IRC, ( by Quovodis?)
parent
ca64fcfe
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
3 deletions
+7
-3
modules/gui/qt4/Modules.am
modules/gui/qt4/Modules.am
+1
-0
modules/gui/qt4/components/interface_widgets.cpp
modules/gui/qt4/components/interface_widgets.cpp
+5
-3
modules/gui/qt4/pixmaps/volume-medium.png
modules/gui/qt4/pixmaps/volume-medium.png
+0
-0
modules/gui/qt4/res.qrc
modules/gui/qt4/res.qrc
+1
-0
No files found.
modules/gui/qt4/Modules.am
View file @
f45f6bf7
...
@@ -224,6 +224,7 @@ EXTRA_DIST += \
...
@@ -224,6 +224,7 @@ EXTRA_DIST += \
pixmaps/type_playlist.png \
pixmaps/type_playlist.png \
pixmaps/type_unknown.xpm \
pixmaps/type_unknown.xpm \
pixmaps/volume-high.png \
pixmaps/volume-high.png \
pixmaps/volume-medium.png \
pixmaps/volume-low.png \
pixmaps/volume-low.png \
pixmaps/volume-muted.png \
pixmaps/volume-muted.png \
pixmaps/volume-slider.svg \
pixmaps/volume-slider.svg \
...
...
modules/gui/qt4/components/interface_widgets.cpp
View file @
f45f6bf7
...
@@ -596,7 +596,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
...
@@ -596,7 +596,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
VolumeClickHandler
*
hVolLabel
=
new
VolumeClickHandler
(
p_intf
,
this
);
VolumeClickHandler
*
hVolLabel
=
new
VolumeClickHandler
(
p_intf
,
this
);
volMuteLabel
=
new
QLabel
;
volMuteLabel
=
new
QLabel
;
volMuteLabel
->
setPixmap
(
QPixmap
(
":/pixmaps/volume-
high
.png"
)
);
volMuteLabel
->
setPixmap
(
QPixmap
(
":/pixmaps/volume-
medium
.png"
)
);
volMuteLabel
->
setToolTip
(
qtr
(
"Mute"
)
);
volMuteLabel
->
setToolTip
(
qtr
(
"Mute"
)
);
volMuteLabel
->
installEventFilter
(
hVolLabel
);
volMuteLabel
->
installEventFilter
(
hVolLabel
);
controlLayout
->
addWidget
(
volMuteLabel
,
3
,
15
,
Qt
::
AlignBottom
);
controlLayout
->
addWidget
(
volMuteLabel
,
3
,
15
,
Qt
::
AlignBottom
);
...
@@ -690,9 +690,11 @@ void ControlsWidget::updateVolume( int i_sliderVolume )
...
@@ -690,9 +690,11 @@ void ControlsWidget::updateVolume( int i_sliderVolume )
}
}
if
(
i_sliderVolume
==
0
)
if
(
i_sliderVolume
==
0
)
volMuteLabel
->
setPixmap
(
QPixmap
(
":/pixmaps/volume-muted.png"
)
);
volMuteLabel
->
setPixmap
(
QPixmap
(
":/pixmaps/volume-muted.png"
)
);
else
if
(
i_sliderVolume
<
VOLUME_MAX
/
2
)
else
if
(
i_sliderVolume
<
VOLUME_MAX
/
3
)
volMuteLabel
->
setPixmap
(
QPixmap
(
":/pixmaps/volume-low.png"
)
);
volMuteLabel
->
setPixmap
(
QPixmap
(
":/pixmaps/volume-low.png"
)
);
else
volMuteLabel
->
setPixmap
(
QPixmap
(
":/pixmaps/volume-high.png"
)
);
else
if
(
i_sliderVolume
>
(
VOLUME_MAX
*
2
/
3
)
)
volMuteLabel
->
setPixmap
(
QPixmap
(
":/pixmaps/volume-high.png"
)
);
else
volMuteLabel
->
setPixmap
(
QPixmap
(
":/pixmaps/volume-medium.png"
)
);
}
}
void
ControlsWidget
::
updateOnTimer
()
void
ControlsWidget
::
updateOnTimer
()
...
...
modules/gui/qt4/pixmaps/volume-medium.png
0 → 100644
View file @
f45f6bf7
576 Bytes
modules/gui/qt4/res.qrc
View file @
f45f6bf7
...
@@ -60,6 +60,7 @@
...
@@ -60,6 +60,7 @@
<file>
pixmaps/type_node.png
</file>
<file>
pixmaps/type_node.png
</file>
<file>
pixmaps/type_playlist.png
</file>
<file>
pixmaps/type_playlist.png
</file>
<file>
pixmaps/volume-high.png
</file>
<file>
pixmaps/volume-high.png
</file>
<file>
pixmaps/volume-medium.png
</file>
<file>
pixmaps/volume-low.png
</file>
<file>
pixmaps/volume-low.png
</file>
<file>
pixmaps/volume-muted.png
</file>
<file>
pixmaps/volume-muted.png
</file>
<file>
pixmaps/volume-slider-inside.png
</file>
<file>
pixmaps/volume-slider-inside.png
</file>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment