Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
1ced7291
Commit
1ced7291
authored
Oct 24, 2007
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4 - switch to minimal view should hide and show the menu, now. Close Trax#26
parent
651671b0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
5 deletions
+14
-5
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+10
-2
modules/gui/qt4/main_interface.hpp
modules/gui/qt4/main_interface.hpp
+1
-1
modules/gui/qt4/menus.cpp
modules/gui/qt4/menus.cpp
+3
-2
No files found.
modules/gui/qt4/main_interface.cpp
View file @
1ced7291
...
@@ -194,7 +194,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
...
@@ -194,7 +194,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
createSystray
();
createSystray
();
if
(
config_GetInt
(
p_intf
,
"qt-minimal-view"
)
)
if
(
config_GetInt
(
p_intf
,
"qt-minimal-view"
)
)
toggleM
enus
();
toggleM
inimalView
();
/* Init input manager */
/* Init input manager */
MainInputManager
::
getInstance
(
p_intf
);
MainInputManager
::
getInstance
(
p_intf
);
...
@@ -621,8 +621,9 @@ void MainInterface::visual()
...
@@ -621,8 +621,9 @@ void MainInterface::visual()
}
}
#endif
#endif
void
MainInterface
::
toggleM
enus
()
void
MainInterface
::
toggleM
inimalView
()
{
{
TOGGLEV
(
menuBar
()
);
TOGGLEV
(
controls
);
TOGGLEV
(
controls
);
TOGGLEV
(
statusBar
()
);
TOGGLEV
(
statusBar
()
);
updateGeometry
();
updateGeometry
();
...
@@ -916,6 +917,13 @@ void MainInterface::customEvent( QEvent *event )
...
@@ -916,6 +917,13 @@ void MainInterface::customEvent( QEvent *event )
void
MainInterface
::
keyPressEvent
(
QKeyEvent
*
e
)
void
MainInterface
::
keyPressEvent
(
QKeyEvent
*
e
)
{
{
if
(
(
e
->
modifiers
()
&
Qt
::
ControlModifier
)
&&
(
e
->
key
()
&
Qt
::
Key_H
)
&&
menuBar
()
->
isHidden
()
)
{
toggleMinimalView
();
e
->
accept
();
}
int
i_vlck
=
qtEventToVLCKey
(
e
);
int
i_vlck
=
qtEventToVLCKey
(
e
);
if
(
i_vlck
>=
0
)
if
(
i_vlck
>=
0
)
{
{
...
...
modules/gui/qt4/main_interface.hpp
View file @
1ced7291
...
@@ -131,7 +131,7 @@ private:
...
@@ -131,7 +131,7 @@ private:
void
customEvent
(
QEvent
*
);
void
customEvent
(
QEvent
*
);
public
slots
:
public
slots
:
void
undockPlaylist
();
void
undockPlaylist
();
void
toggleM
enus
();
void
toggleM
inimalView
();
void
togglePlaylist
();
void
togglePlaylist
();
void
toggleUpdateSystrayMenu
();
void
toggleUpdateSystrayMenu
();
void
toggleAdvanced
();
void
toggleAdvanced
();
...
...
modules/gui/qt4/menus.cpp
View file @
1ced7291
...
@@ -257,9 +257,10 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
...
@@ -257,9 +257,10 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
{
{
/* Minimal View */
/* Minimal View */
QAction
*
action
=
menu
->
addAction
(
qtr
(
"Minimal View..."
),
mi
,
QAction
*
action
=
menu
->
addAction
(
qtr
(
"Minimal View..."
),
mi
,
SLOT
(
toggleMenus
()
),
qtr
(
"Ctrl+H"
)
);
SLOT
(
toggleMinimalView
()
),
qtr
(
"Ctrl+H"
)
);
//FIXME: remove useless thing. But keep it until the release, pls.
action
->
setCheckable
(
true
);
action
->
setCheckable
(
true
);
if
(
mi
->
getControlsVisibilityStatus
()
&
CONTROLS_VISIBLE
)
if
(
mi
->
getControlsVisibilityStatus
()
&
CONTROLS_VISIBLE
)
action
->
setChecked
(
true
);
action
->
setChecked
(
true
);
/* Advanced Controls */
/* Advanced Controls */
...
...
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