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
02651e28
Commit
02651e28
authored
Mar 30, 2011
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: epg: don't hide EPG when there's still data.
parent
002da356
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletion
+9
-1
modules/gui/qt4/components/epg/EPGView.cpp
modules/gui/qt4/components/epg/EPGView.cpp
+5
-0
modules/gui/qt4/components/epg/EPGView.hpp
modules/gui/qt4/components/epg/EPGView.hpp
+1
-0
modules/gui/qt4/components/epg/EPGWidget.cpp
modules/gui/qt4/components/epg/EPGWidget.cpp
+3
-1
No files found.
modules/gui/qt4/components/epg/EPGView.cpp
View file @
02651e28
...
@@ -104,6 +104,11 @@ const QDateTime& EPGView::baseTime()
...
@@ -104,6 +104,11 @@ const QDateTime& EPGView::baseTime()
return
m_baseTime
;
return
m_baseTime
;
}
}
bool
EPGView
::
hasValidData
()
{
return
!
epgitemsByChannel
.
empty
();
}
static
void
cleanOverlapped
(
EPGEventByTimeQMap
*
epgItemByTime
,
EPGItem
*
epgItem
,
QGraphicsScene
*
scene
)
static
void
cleanOverlapped
(
EPGEventByTimeQMap
*
epgItemByTime
,
EPGItem
*
epgItem
,
QGraphicsScene
*
scene
)
{
{
/* Clean overlapped programs */
/* Clean overlapped programs */
...
...
modules/gui/qt4/components/epg/EPGView.hpp
View file @
02651e28
...
@@ -66,6 +66,7 @@ public:
...
@@ -66,6 +66,7 @@ public:
void
updateDuration
();
void
updateDuration
();
void
reset
();
void
reset
();
void
cleanup
();
void
cleanup
();
bool
hasValidData
();
signals:
signals:
void
startTimeChanged
(
const
QDateTime
&
startTime
);
void
startTimeChanged
(
const
QDateTime
&
startTime
);
...
...
modules/gui/qt4/components/epg/EPGWidget.cpp
View file @
02651e28
...
@@ -102,7 +102,6 @@ void EPGWidget::updateEPG( vlc_epg_t **pp_epg, int i_epg, uint8_t i_input_type )
...
@@ -102,7 +102,6 @@ void EPGWidget::updateEPG( vlc_epg_t **pp_epg, int i_epg, uint8_t i_input_type )
b_input_type_known
=
true
;
b_input_type_known
=
true
;
m_epgView
->
cleanup
();
/* expire items and flags */
m_epgView
->
cleanup
();
/* expire items and flags */
rootWidget
->
setCurrentIndex
(
(
i_epg
>
0
)
?
0
:
1
);
for
(
int
i
=
0
;
i
<
i_epg
;
++
i
)
for
(
int
i
=
0
;
i
<
i_epg
;
++
i
)
{
{
...
@@ -117,6 +116,9 @@ void EPGWidget::updateEPG( vlc_epg_t **pp_epg, int i_epg, uint8_t i_input_type )
...
@@ -117,6 +116,9 @@ void EPGWidget::updateEPG( vlc_epg_t **pp_epg, int i_epg, uint8_t i_input_type )
}
}
}
}
/* toggle our widget view */
rootWidget
->
setCurrentIndex
(
m_epgView
->
hasValidData
()
?
0
:
1
);
// Update the global duration and start time.
// Update the global duration and start time.
m_epgView
->
updateDuration
();
m_epgView
->
updateDuration
();
m_epgView
->
updateStartTime
();
m_epgView
->
updateStartTime
();
...
...
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