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
201cb76f
Commit
201cb76f
authored
Aug 20, 2007
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4 : fullscreen Button activation/deactivation
parent
3902f627
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
7 deletions
+17
-7
modules/gui/qt4/components/interface_widgets.cpp
modules/gui/qt4/components/interface_widgets.cpp
+14
-6
modules/gui/qt4/components/interface_widgets.hpp
modules/gui/qt4/components/interface_widgets.hpp
+2
-1
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+1
-0
No files found.
modules/gui/qt4/components/interface_widgets.cpp
View file @
201cb76f
...
@@ -377,18 +377,19 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i ) :
...
@@ -377,18 +377,19 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i ) :
* Might need to be inside a frame to avoid a few resizing pb
* Might need to be inside a frame to avoid a few resizing pb
* FIXME
* FIXME
*/
*/
/** Fullscreen/Visualisation **/
fullscreenButton
=
new
QPushButton
(
"F"
);
BUTTON_SET_ACT
(
fullscreenButton
,
"F"
,
qtr
(
"Fullscreen"
),
fullscreen
()
);
fullscreenButton
->
setMaximumSize
(
QSize
(
26
,
26
)
);
controlLayout
->
addWidget
(
fullscreenButton
,
3
,
11
);
/** Playlist Button **/
/** Playlist Button **/
playlistButton
=
new
QPushButton
;
playlistButton
=
new
QPushButton
;
playlistButton
->
setMaximumSize
(
QSize
(
26
,
26
)
);
playlistButton
->
setMaximumSize
(
QSize
(
26
,
26
)
);
playlistButton
->
setIconSize
(
QSize
(
20
,
20
)
);
controlLayout
->
addWidget
(
playlistButton
,
3
,
10
);
controlLayout
->
addWidget
(
playlistButton
,
3
,
10
);
/** Fullscreen/Visualisation **/
QPushButton
*
fullscreenButton
=
new
QPushButton
(
"F"
);
BUTTON_SET_ACT
(
fullscreenButton
,
"F"
,
qtr
(
"Fullscreen"
),
fullscreen
()
);
fullscreenButton
->
setMaximumSize
(
QSize
(
26
,
26
)
);
controlLayout
->
addWidget
(
fullscreenButton
,
3
,
11
);
/** extended Settings **/
/** extended Settings **/
QPushButton
*
extSettingsButton
=
new
QPushButton
(
"F"
);
QPushButton
*
extSettingsButton
=
new
QPushButton
(
"F"
);
BUTTON_SET_ACT
(
extSettingsButton
,
"Ex"
,
qtr
(
"Extended Settings"
),
BUTTON_SET_ACT
(
extSettingsButton
,
"Ex"
,
qtr
(
"Extended Settings"
),
...
@@ -559,6 +560,13 @@ void ControlsWidget::enableInput( bool enable )
...
@@ -559,6 +560,13 @@ void ControlsWidget::enableInput( bool enable )
fasterButton
->
setEnabled
(
enable
);
fasterButton
->
setEnabled
(
enable
);
}
}
void
ControlsWidget
::
enableVideo
(
bool
enable
)
{
// TODO Later make the fullscreenButton toggle Visualisation and so on.
fullscreenButton
->
setEnabled
(
enable
);
}
/**********************************************************************
/**********************************************************************
* Playlist Widget. The embedded playlist
* Playlist Widget. The embedded playlist
**********************************************************************/
**********************************************************************/
...
...
modules/gui/qt4/components/interface_widgets.hpp
View file @
201cb76f
...
@@ -133,6 +133,7 @@ public:
...
@@ -133,6 +133,7 @@ public:
QSlider
*
volumeSlider
;
QSlider
*
volumeSlider
;
void
setStatus
(
int
);
void
setStatus
(
int
);
void
enableInput
(
bool
);
void
enableInput
(
bool
);
void
enableVideo
(
bool
);
public
slots
:
public
slots
:
void
setNavigation
(
int
);
void
setNavigation
(
int
);
void
updateOnTimer
();
void
updateOnTimer
();
...
@@ -145,7 +146,7 @@ private:
...
@@ -145,7 +146,7 @@ private:
QGridLayout
*
controlLayout
;
QGridLayout
*
controlLayout
;
InputSlider
*
slider
;
InputSlider
*
slider
;
QPushButton
*
prevSectionButton
,
*
nextSectionButton
,
*
menuButton
;
QPushButton
*
prevSectionButton
,
*
nextSectionButton
,
*
menuButton
;
QPushButton
*
playButton
;
QPushButton
*
playButton
,
*
fullscreenButton
;
QPushButton
*
slowerButton
,
*
fasterButton
;
QPushButton
*
slowerButton
,
*
fasterButton
;
private
slots
:
private
slots
:
void
play
();
void
play
();
...
...
modules/gui/qt4/main_interface.cpp
View file @
201cb76f
...
@@ -889,6 +889,7 @@ void MainInterface::updateOnTimer()
...
@@ -889,6 +889,7 @@ void MainInterface::updateOnTimer()
advControls
->
enableInput
(
THEMIM
->
getIM
()
->
hasInput
()
);
advControls
->
enableInput
(
THEMIM
->
getIM
()
->
hasInput
()
);
controls
->
enableInput
(
THEMIM
->
getIM
()
->
hasInput
()
);
controls
->
enableInput
(
THEMIM
->
getIM
()
->
hasInput
()
);
advControls
->
enableVideo
(
THEMIM
->
getIM
()
->
hasVideo
()
);
advControls
->
enableVideo
(
THEMIM
->
getIM
()
->
hasVideo
()
);
controls
->
enableVideo
(
THEMIM
->
getIM
()
->
hasVideo
()
);
if
(
intf_ShouldDie
(
p_intf
)
)
if
(
intf_ShouldDie
(
p_intf
)
)
{
{
...
...
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