Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
f3d3e076
Commit
f3d3e076
authored
Mar 20, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt, menus: split the subtitles menu in a new function
Exactly 0 functionnal change here
parent
469eb24a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
9 deletions
+17
-9
modules/gui/qt4/menus.cpp
modules/gui/qt4/menus.cpp
+15
-8
modules/gui/qt4/menus.hpp
modules/gui/qt4/menus.hpp
+2
-1
No files found.
modules/gui/qt4/menus.cpp
View file @
f3d3e076
...
@@ -580,11 +580,23 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current )
...
@@ -580,11 +580,23 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current )
return
Populate
(
p_intf
,
current
,
varnames
,
objects
);
return
Populate
(
p_intf
,
current
,
varnames
,
objects
);
}
}
/* Subtitles */
void
QVLCMenu
::
SubMenu
(
intf_thread_t
*
p_intf
,
QMenu
*
current
)
{
QAction
*
action
;
QMenu
*
submenu
=
new
QMenu
(
qtr
(
"&Subtitles Track"
),
current
);
action
=
current
->
addMenu
(
submenu
);
action
->
setData
(
"spu-es"
);
addDPStaticEntry
(
submenu
,
qtr
(
"Open File..."
),
""
,
SLOT
(
loadSubtitlesFile
()
)
);
submenu
->
addSeparator
();
}
/**
/**
* Main Video Menu
* Main Video Menu
* Subtitles are part of Video.
* Subtitles are part of Video.
**/
**/
QMenu
*
QVLCMenu
::
VideoMenu
(
intf_thread_t
*
p_intf
,
QMenu
*
current
)
QMenu
*
QVLCMenu
::
VideoMenu
(
intf_thread_t
*
p_intf
,
QMenu
*
current
,
bool
b_subtitle
)
{
{
vout_thread_t
*
p_vout
;
vout_thread_t
*
p_vout
;
input_thread_t
*
p_input
;
input_thread_t
*
p_input
;
...
@@ -594,14 +606,9 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current )
...
@@ -594,14 +606,9 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current )
if
(
current
->
isEmpty
()
)
if
(
current
->
isEmpty
()
)
{
{
addActionWithSubmenu
(
current
,
"video-es"
,
qtr
(
"Video &Track"
)
);
addActionWithSubmenu
(
current
,
"video-es"
,
qtr
(
"Video &Track"
)
);
if
(
b_subtitle
)
SubMenu
(
p_intf
,
current
);
QAction
*
action
;
QMenu
*
submenu
=
new
QMenu
(
qtr
(
"&Subtitles Track"
),
current
);
action
=
current
->
addMenu
(
submenu
);
action
->
setData
(
"spu-es"
);
addDPStaticEntry
(
submenu
,
qtr
(
"Open File..."
),
""
,
SLOT
(
loadSubtitlesFile
()
)
);
submenu
->
addSeparator
();
current
->
addSeparator
();
current
->
addSeparator
();
addActionWithCheckbox
(
current
,
"fullscreen"
,
qtr
(
"&Fullscreen"
)
);
addActionWithCheckbox
(
current
,
"fullscreen"
,
qtr
(
"&Fullscreen"
)
);
...
...
modules/gui/qt4/menus.hpp
View file @
f3d3e076
...
@@ -109,10 +109,11 @@ private:
...
@@ -109,10 +109,11 @@ private:
}
}
static
QMenu
*
RebuildNavigMenu
(
intf_thread_t
*
,
QMenu
*
);
static
QMenu
*
RebuildNavigMenu
(
intf_thread_t
*
,
QMenu
*
);
static
QMenu
*
VideoMenu
(
intf_thread_t
*
,
QMenu
*
);
static
QMenu
*
VideoMenu
(
intf_thread_t
*
,
QMenu
*
,
bool
b_subtitle
=
true
);
static
QMenu
*
VideoMenu
(
intf_thread_t
*
p_intf
,
QWidget
*
parent
)
{
static
QMenu
*
VideoMenu
(
intf_thread_t
*
p_intf
,
QWidget
*
parent
)
{
return
VideoMenu
(
p_intf
,
new
QMenu
(
parent
)
);
return
VideoMenu
(
p_intf
,
new
QMenu
(
parent
)
);
}
}
static
void
SubMenu
(
intf_thread_t
*
p_intf
,
QMenu
*
current
);
static
QMenu
*
AudioMenu
(
intf_thread_t
*
,
QMenu
*
);
static
QMenu
*
AudioMenu
(
intf_thread_t
*
,
QMenu
*
);
static
QMenu
*
AudioMenu
(
intf_thread_t
*
p_intf
,
QWidget
*
parent
)
{
static
QMenu
*
AudioMenu
(
intf_thread_t
*
p_intf
,
QWidget
*
parent
)
{
...
...
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