Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
dd22c221
Commit
dd22c221
authored
Feb 25, 2008
by
Jean-Baptiste Kempf
Browse files
Qt4 - Fix art display in the bgWidget, fix one volume bug, fix fullscreen button
parent
e5d0cd4f
Changes
2
Hide whitespace changes
Inline
Side-by-side
modules/gui/qt4/components/interface_widgets.cpp
View file @
dd22c221
...
...
@@ -178,7 +178,7 @@ BackgroundWidget::BackgroundWidget( intf_thread_t *_p_i )
backgroundLayout
->
setColumnStretch
(
0
,
1
);
backgroundLayout
->
setColumnStretch
(
2
,
1
);
CONNECT
(
THEMIM
->
getIM
(),
artChanged
(
QString
),
this
,
update
(
QString
)
);
CONNECT
(
THEMIM
->
getIM
(),
artChanged
(
QString
),
this
,
update
Art
(
QString
)
);
}
BackgroundWidget
::~
BackgroundWidget
()
...
...
@@ -193,9 +193,9 @@ void BackgroundWidget::resizeEvent( QResizeEvent * event )
label
->
show
();
}
void
BackgroundWidget
::
update
(
QString
url
)
void
BackgroundWidget
::
update
Art
(
QString
url
)
{
if
(
url
.
is
Null
()
)
if
(
url
.
is
Empty
()
)
{
if
(
QDate
::
currentDate
().
dayOfYear
()
>=
354
)
label
->
setPixmap
(
QPixmap
(
":/vlc128-christmas.png"
)
);
...
...
@@ -616,11 +616,13 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
volumeSlider
->
setValue
(
(
config_GetInt
(
p_intf
,
"volume"
)
)
*
VOLUME_MAX
/
(
AOUT_VOLUME_MAX
/
2
)
);
/* Force the update at build time in order to have a muted icon if needed */
updateVolume
(
volumeSlider
->
value
()
);
/* Volume control connection */
CONNECT
(
volumeSlider
,
valueChanged
(
int
),
this
,
updateVolume
(
int
)
);
CONNECT
(
THEMIM
,
volumeChanged
(
void
),
this
,
updateVolume
(
void
)
);
updateInput
();
}
...
...
@@ -716,7 +718,7 @@ void ControlsWidget::updateInput()
{
/* Activate the interface buttons according to the presence of the input */
enableInput
(
THEMIM
->
getIM
()
->
hasInput
()
);
enableVideo
(
THEMIM
->
getIM
()
->
hasVideo
()
);
enableVideo
(
THEMIM
->
getIM
()
->
hasVideo
()
&&
THEMIM
->
getIM
()
->
hasInput
()
);
}
void
ControlsWidget
::
setStatus
(
int
status
)
...
...
modules/gui/qt4/components/interface_widgets.hpp
View file @
dd22c221
...
...
@@ -95,7 +95,7 @@ private:
virtual
void
resizeEvent
(
QResizeEvent
*
event
);
public
slots
:
void
toggle
(){
TOGGLEV
(
this
);
}
void
update
(
QString
);
void
update
Art
(
QString
);
};
class
VisualSelector
:
public
QFrame
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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