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
f8d66f23
Commit
f8d66f23
authored
Feb 27, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: remove the static QAction* for the menus consistency in the Fullscreen Mode.
parent
916aa463
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
12 deletions
+7
-12
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+2
-2
modules/gui/qt4/main_interface.hpp
modules/gui/qt4/main_interface.hpp
+1
-0
modules/gui/qt4/menus.cpp
modules/gui/qt4/menus.cpp
+4
-6
modules/gui/qt4/menus.hpp
modules/gui/qt4/menus.hpp
+0
-4
No files found.
modules/gui/qt4/main_interface.cpp
View file @
f8d66f23
...
@@ -1183,12 +1183,12 @@ void MainInterface::toggleFullScreen( void )
...
@@ -1183,12 +1183,12 @@ void MainInterface::toggleFullScreen( void )
{
{
showNormal
();
showNormal
();
emit
askUpdate
();
// Needed if video was launched after the F11
emit
askUpdate
();
// Needed if video was launched after the F11
QVLCMenu
::
fullscreenViewAction
->
setCheck
ed
(
false
);
emit
fullscreenInterfaceToggl
ed
(
false
);
}
}
else
else
{
{
showFullScreen
();
showFullScreen
();
QVLCMenu
::
fullscreenViewAction
->
setCheck
ed
(
true
);
emit
fullscreenInterfaceToggl
ed
(
true
);
}
}
}
}
...
...
modules/gui/qt4/main_interface.hpp
View file @
f8d66f23
...
@@ -186,6 +186,7 @@ signals:
...
@@ -186,6 +186,7 @@ signals:
void
askBgWidgetToToggle
();
void
askBgWidgetToToggle
();
void
askUpdate
();
void
askUpdate
();
void
minimalViewToggled
(
bool
);
void
minimalViewToggled
(
bool
);
void
fullscreenInterfaceToggled
(
bool
);
};
};
#endif
#endif
modules/gui/qt4/menus.cpp
View file @
f8d66f23
...
@@ -73,10 +73,6 @@ enum
...
@@ -73,10 +73,6 @@ enum
static
QActionGroup
*
currentGroup
;
static
QActionGroup
*
currentGroup
;
/* HACK for minimalView to go around a Qt bug/feature
* that doesn't update the QAction checked state when QMenu is hidden */
QAction
*
QVLCMenu
::
fullscreenViewAction
=
NULL
;
QMenu
*
QVLCMenu
::
recentsMenu
=
NULL
;
QMenu
*
QVLCMenu
::
recentsMenu
=
NULL
;
/****************************************************************************
/****************************************************************************
...
@@ -416,7 +412,7 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf,
...
@@ -416,7 +412,7 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf,
action
->
setShortcut
(
qtr
(
"Ctrl+H"
)
);
action
->
setShortcut
(
qtr
(
"Ctrl+H"
)
);
action
->
setCheckable
(
true
);
action
->
setCheckable
(
true
);
action
->
setChecked
(
!
with_intf
&&
action
->
setChecked
(
!
with_intf
&&
(
mi
->
getControlsVisibilityStatus
()
&
&
CONTROLS_HIDDEN
)
);
(
mi
->
getControlsVisibilityStatus
()
&
CONTROLS_HIDDEN
)
);
CONNECT
(
action
,
triggered
(
bool
),
mi
,
toggleMinimalView
(
bool
)
);
CONNECT
(
action
,
triggered
(
bool
),
mi
,
toggleMinimalView
(
bool
)
);
CONNECT
(
mi
,
minimalViewToggled
(
bool
),
action
,
setChecked
(
bool
)
);
CONNECT
(
mi
,
minimalViewToggled
(
bool
),
action
,
setChecked
(
bool
)
);
...
@@ -424,8 +420,10 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf,
...
@@ -424,8 +420,10 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf,
/* FullScreen View */
/* FullScreen View */
action
=
menu
->
addAction
(
qtr
(
"&Fullscreen Interface"
),
mi
,
action
=
menu
->
addAction
(
qtr
(
"&Fullscreen Interface"
),
mi
,
SLOT
(
toggleFullScreen
()
),
QString
(
"F11"
)
);
SLOT
(
toggleFullScreen
()
),
QString
(
"F11"
)
);
fullscreenViewAction
=
action
;
action
->
setCheckable
(
true
);
action
->
setCheckable
(
true
);
action
->
setChecked
(
mi
->
isFullScreen
()
);
CONNECT
(
mi
,
fullscreenInterfaceToggled
(
bool
),
action
,
setChecked
(
bool
)
);
/* Advanced Controls */
/* Advanced Controls */
action
=
menu
->
addAction
(
qtr
(
"&Advanced Controls"
),
mi
,
action
=
menu
->
addAction
(
qtr
(
"&Advanced Controls"
),
mi
,
...
...
modules/gui/qt4/menus.hpp
View file @
f8d66f23
...
@@ -94,10 +94,6 @@ public:
...
@@ -94,10 +94,6 @@ public:
/* Actions */
/* Actions */
static
void
DoAction
(
QObject
*
);
static
void
DoAction
(
QObject
*
);
/* HACK for minimalView */
static
QAction
*
minimalViewAction
;
static
QAction
*
fullscreenViewAction
;
private:
private:
/* All main Menus */
/* All main Menus */
static
QMenu
*
FileMenu
(
intf_thread_t
*
,
QWidget
*
);
static
QMenu
*
FileMenu
(
intf_thread_t
*
,
QWidget
*
);
...
...
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