git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add enq cancel
[enigma2.git]
/
lib
/
components
/
listboxepg.cpp
diff --git
a/lib/components/listboxepg.cpp
b/lib/components/listboxepg.cpp
index b72a6a8263625b4efdc4db65b18a79f323b76317..0d5c541265b4908ff1d54e167780d7745132f131 100644
(file)
--- a/
lib/components/listboxepg.cpp
+++ b/
lib/components/listboxepg.cpp
@@
-4,8
+4,8
@@
void eListboxEPGContent::setRoot(const eServiceReference &root)
{
void eListboxEPGContent::setRoot(const eServiceReference &root)
{
- eEPGCache *epg=
NULL
;
- if (
!eEPGCache::getInstance(epg)
)
+ eEPGCache *epg=
eEPGCache::getInstance()
;
+ if (
epg
)
{
m_list.clear();
m_root = root;
{
m_list.clear();
m_root = root;
@@
-29,12
+29,16
@@
void eListboxEPGContent::setRoot(const eServiceReference &root)
}
}
}
}
-
void eListboxEPGContent::getCurrent(ePtr<eServiceEvent>&
evt)
+
RESULT eListboxEPGContent::getCurrent(ePtr<eServiceEvent> &
evt)
{
if (cursorValid())
{
if (cursorValid())
+ {
evt = *m_cursor;
evt = *m_cursor;
+ return 0;
+ }
else
evt = 0;
else
evt = 0;
+ return -1;
}
void eListboxEPGContent::setElementPosition(int element, eRect where)
}
void eListboxEPGContent::setElementPosition(int element, eRect where)
@@
-151,10
+155,10
@@
void eListboxEPGContent::setSize(const eSize &size)
eSize s = m_itemsize;
s.setWidth(size.width()/20*5);
m_element_position[celBeginTime] = eRect(ePoint(0, 0), s);
eSize s = m_itemsize;
s.setWidth(size.width()/20*5);
m_element_position[celBeginTime] = eRect(ePoint(0, 0), s);
- m_element_font[celBeginTime] = new gFont("Arial", 2
0
);
+ m_element_font[celBeginTime] = new gFont("Arial", 2
2
);
s.setWidth(size.width()/20*15);
m_element_position[celTitle] = eRect(ePoint(size.width()/20*5, 0), s);
s.setWidth(size.width()/20*15);
m_element_position[celTitle] = eRect(ePoint(size.width()/20*5, 0), s);
- m_element_font[celTitle] = new gFont("Arial", 2
0
);
+ m_element_font[celTitle] = new gFont("Arial", 2
2
);
}
void eListboxEPGContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
}
void eListboxEPGContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
@@
-178,13
+182,7
@@
void eListboxEPGContent::paint(gPainter &painter, eWindowStyle &style, const ePo
{
case celBeginTime:
{
{
case celBeginTime:
{
- tm t;
- localtime_r(&(*m_cursor)->m_begin, &t);
- char tmp[13];
- snprintf(tmp, 13, "%02d.%02d, %02d:%02d",
- t.tm_mday, t.tm_mon+1,
- t.tm_hour, t.tm_min);
- text=tmp;
+ text=(*m_cursor)->getBeginTimeString();
break;
}
case celTitle:
break;
}
case celTitle: