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
2059bea4
Commit
2059bea4
authored
Apr 06, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: fix semantics and behaviour for chapters buttons
No sense to display chapter buttons with 1title&1chapter
parent
de932664
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
modules/gui/qt4/components/controller.cpp
modules/gui/qt4/components/controller.cpp
+3
-3
modules/gui/qt4/input_manager.cpp
modules/gui/qt4/input_manager.cpp
+4
-3
No files found.
modules/gui/qt4/components/controller.cpp
View file @
2059bea4
...
...
@@ -348,7 +348,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
case
INPUT_SLIDER
:
{
SeekSlider
*
slider
=
new
SeekSlider
(
Qt
::
Horizontal
,
NULL
,
!
b_shiny
);
SeekPoints
*
chapters
=
new
SeekPoints
(
this
,
p_intf
);
CONNECT
(
THEMIM
->
getIM
(),
title
Changed
(
bool
),
chapters
,
update
()
);
CONNECT
(
THEMIM
->
getIM
(),
chapter
Changed
(
bool
),
chapters
,
update
()
);
slider
->
setChapters
(
chapters
);
/* Update the position when the IM has changed */
...
...
@@ -545,9 +545,9 @@ QFrame *AbstractController::discFrame()
/* Change the navigation button display when the IM
navigation changes */
CONNECT
(
THEMIM
->
getIM
(),
titleChanged
(
bool
),
discFrame
,
setVisible
(
bool
)
);
CONNECT
(
THEMIM
->
getIM
(),
chapterChanged
(
bool
),
discFrame
,
setVisible
(
bool
)
);
CONNECT
(
THEMIM
->
getIM
(),
titleChanged
(
bool
),
menuButton
,
setVisible
(
bool
)
);
/* Changes the IM navigation when triggered on the nav buttons */
CONNECT
(
prevSectionButton
,
clicked
(),
THEMIM
->
getIM
(),
...
...
modules/gui/qt4/input_manager.cpp
View file @
2059bea4
...
...
@@ -423,13 +423,14 @@ void InputManager::UpdateNavigation()
if
(
val
.
i_int
>
0
)
{
emit
titleChanged
(
true
);
/* p_input != NULL since val.i_int != 0 */
var_Change
(
p_input
,
"chapter"
,
VLC_VAR_CHOICESCOUNT
,
&
val2
,
NULL
);
emit
chapterChanged
(
(
val2
.
i_int
>
1
)
||
(
val2
.
i_int
>
0
&&
val
.
i_int
>
1
)
);
emit
titleChanged
(
val
.
i_int
>
1
);
emit
chapterChanged
(
val2
.
i_int
>
1
);
}
else
emit
title
Changed
(
false
);
emit
chapter
Changed
(
false
);
}
void
InputManager
::
UpdateStatus
()
...
...
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