aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/components/listboxepg.cpp206
-rw-r--r--lib/gui/elistboxcontent.cpp10
-rw-r--r--lib/gui/ewindowstyle.cpp8
-rw-r--r--lib/gui/ewindowstyleskinned.cpp6
-rw-r--r--lib/python/Components/EpgList.py4
-rw-r--r--lib/python/Components/HelpMenuList.py4
-rw-r--r--lib/python/Components/LanguageList.py2
-rw-r--r--lib/python/Components/MovieList.py4
-rw-r--r--lib/python/Components/PluginList.py4
-rw-r--r--lib/python/Components/ServiceList.py8
-rw-r--r--lib/python/Components/TimerList.py4
-rw-r--r--lib/python/Plugins/example.py2
-rw-r--r--lib/python/Plugins/update.py2
-rw-r--r--lib/python/Screens/ServiceInfo.py2
-rw-r--r--lib/python/Screens/StartWizard.py2
-rw-r--r--lib/python/Screens/TutorialWizard.py2
-rw-r--r--lib/service/listboxservice.cpp2
17 files changed, 33 insertions, 239 deletions
diff --git a/lib/components/listboxepg.cpp b/lib/components/listboxepg.cpp
index 0d5c5412..e69de29b 100644
--- a/lib/components/listboxepg.cpp
+++ b/lib/components/listboxepg.cpp
@@ -1,206 +0,0 @@
-#include <lib/components/listboxepg.h>
-#include <lib/dvb/epgcache.h>
-#include <lib/service/service.h>
-
-void eListboxEPGContent::setRoot(const eServiceReference &root)
-{
- eEPGCache *epg=eEPGCache::getInstance();
- if ( epg )
- {
- m_list.clear();
- m_root = root;
-
- epg->Lock();
- if (!epg->startTimeQuery(root))
- {
- ePtr<eServiceEvent> ptr;
- while( !epg->getNextTimeEntry(ptr) )
- m_list.push_back(ptr);
- }
- else
- eDebug("startTimeQuery failed %s", root.toString().c_str());
- epg->Unlock();
-
- m_size = m_list.size();
- cursorHome();
-
- if (m_listbox)
- m_listbox->entryReset();
- }
-}
-
-RESULT eListboxEPGContent::getCurrent(ePtr<eServiceEvent> &evt)
-{
- if (cursorValid())
- {
- evt = *m_cursor;
- return 0;
- }
- else
- evt = 0;
- return -1;
-}
-
-void eListboxEPGContent::setElementPosition(int element, eRect where)
-{
- if ((element >= 0) && (element < celElements))
- m_element_position[element] = where;
-}
-
-void eListboxEPGContent::setElementFont(int element, gFont *font)
-{
- if ((element >= 0) && (element < celElements))
- m_element_font[element] = font;
-}
-
-void eListboxEPGContent::sort()
-{
-#if 0
- ePtr<iListableService> lst;
- if (!m_service_center->list(m_root, lst))
- {
- m_list.sort(iListableServiceCompare(lst));
- /* FIXME: is this really required or can we somehow keep the current entry? */
- cursorHome();
- if (m_listbox)
- m_listbox->entryReset();
- }
-#endif
-}
-
-DEFINE_REF(eListboxEPGContent);
-
-eListboxEPGContent::eListboxEPGContent()
- :m_size(0)
-{
- cursorHome();
-}
-
-void eListboxEPGContent::cursorHome()
-{
- m_cursor = m_list.begin();
- m_cursor_number = 0;
-}
-
-void eListboxEPGContent::cursorEnd()
-{
- m_cursor = m_list.end();
- m_cursor_number = m_size;
-}
-
-int eListboxEPGContent::cursorMove(int count)
-{
- list::iterator old = m_cursor;
-
- if (count > 0)
- {
- while(count && (m_cursor != m_list.end()))
- {
- ++m_cursor;
- ++m_cursor_number;
- --count;
- }
- } else if (count < 0)
- {
- while (count && (m_cursor != m_list.begin()))
- {
- --m_cursor;
- --m_cursor_number;
- ++count;
- }
- }
-
- return 0;
-}
-
-int eListboxEPGContent::cursorValid()
-{
- return m_cursor != m_list.end();
-}
-
-int eListboxEPGContent::cursorSet(int n)
-{
- cursorHome();
- cursorMove(n);
-
- return 0;
-}
-
-int eListboxEPGContent::cursorGet()
-{
- return m_cursor_number;
-}
-
-void eListboxEPGContent::cursorSave()
-{
- m_saved_cursor = m_cursor;
- m_saved_cursor_number = m_cursor_number;
-}
-
-void eListboxEPGContent::cursorRestore()
-{
- m_cursor = m_saved_cursor;
- m_cursor_number = m_saved_cursor_number;
- m_saved_cursor = m_list.end();
-}
-
-int eListboxEPGContent::size()
-{
- return m_size;
-}
-
-void eListboxEPGContent::setSize(const eSize &size)
-{
- m_itemsize = size;
- 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", 22);
- 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", 22);
-}
-
-void eListboxEPGContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
-{
- painter.clip(eRect(offset, m_itemsize));
- style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
- painter.clear();
-
- if (cursorValid())
- {
- for (int e = 0; e < celElements; ++e)
- {
- if (!m_element_font[e])
- continue;
-
- painter.setFont(m_element_font[e]);
-
- std::string text = "<n/a>";
-
- switch (e)
- {
- case celBeginTime:
- {
- text=(*m_cursor)->getBeginTimeString();
- break;
- }
- case celTitle:
- {
- text = (*m_cursor)->m_event_name;
- break;
- }
- }
-
- eRect area = m_element_position[e];
- area.moveBy(offset.x(), offset.y());
-
- painter.renderText(area, text);
- }
-
- if (selected)
- style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);
- }
- painter.clippop();
-}
-
diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index 95d92e09..6e49dcb5 100644
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -110,7 +110,7 @@ void eListboxTestContent::setSize(const eSize &size)
void eListboxTestContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
{
- ePtr<gFont> fnt = new gFont("Arial", 20);
+ ePtr<gFont> fnt = new gFont("Regular", 20);
painter.clip(eRect(offset, m_size));
style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
painter.clear();
@@ -219,7 +219,7 @@ void eListboxStringContent::setSize(const eSize &size)
void eListboxStringContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
{
- ePtr<gFont> fnt = new gFont("Arial", 20);
+ ePtr<gFont> fnt = new gFont("Regular", 20);
painter.clip(eRect(offset, m_itemsize));
style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
painter.clear();
@@ -328,7 +328,7 @@ void eListboxPythonStringContent::setSize(const eSize &size)
void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
{
- ePtr<gFont> fnt = new gFont("Arial", 20);
+ ePtr<gFont> fnt = new gFont("Regular", 20);
painter.clip(eRect(offset, m_itemsize));
style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
painter.clear();
@@ -398,8 +398,8 @@ void eListboxPythonStringContent::invalidate()
void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
{
- ePtr<gFont> fnt = new gFont("Arial", 20);
- ePtr<gFont> fnt2 = new gFont("Arial", 16);
+ ePtr<gFont> fnt = new gFont("Regular", 20);
+ ePtr<gFont> fnt2 = new gFont("Regular", 16);
painter.clip(eRect(offset, m_itemsize));
style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
painter.clear();
diff --git a/lib/gui/ewindowstyle.cpp b/lib/gui/ewindowstyle.cpp
index 79024a35..86ff8a42 100644
--- a/lib/gui/ewindowstyle.cpp
+++ b/lib/gui/ewindowstyle.cpp
@@ -38,7 +38,7 @@ eWindowStyleSimple::eWindowStyleSimple()
m_border_left = m_border_right = m_border_bottom = 2;
m_border_top = 30;
- m_fnt = new gFont("Arial", 25);
+ m_fnt = new gFont("Regular", 25);
m_border_color_tl = gColor(0x1f);
m_border_color_br = gColor(0x14);
@@ -141,13 +141,13 @@ RESULT eWindowStyleSimple::getFont(int what, ePtr<gFont> &fnt)
switch (what)
{
case fontStatic:
- fnt = new gFont("Arial", 12);
+ fnt = new gFont("Regular", 12);
break;
case fontButton:
- fnt = new gFont("Arial", 20);
+ fnt = new gFont("Regular", 20);
break;
case fontTitlebar:
- fnt = new gFont("Arial", 25);
+ fnt = new gFont("Regular", 25);
break;
default:
return -1;
diff --git a/lib/gui/ewindowstyleskinned.cpp b/lib/gui/ewindowstyleskinned.cpp
index 20d508f6..5da4696e 100644
--- a/lib/gui/ewindowstyleskinned.cpp
+++ b/lib/gui/ewindowstyleskinned.cpp
@@ -196,13 +196,13 @@ RESULT eWindowStyleSkinned::getFont(int what, ePtr<gFont> &fnt)
switch (what)
{
case fontStatic:
- fnt = new gFont("Arial", 12);
+ fnt = new gFont("Regular", 12);
break;
case fontButton:
- fnt = new gFont("Arial", 20);
+ fnt = new gFont("Regular", 20);
break;
case fontTitlebar:
- fnt = new gFont("Arial", 25);
+ fnt = new gFont("Regular", 25);
break;
default:
return -1;
diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py
index 56282581..6ab3f748 100644
--- a/lib/python/Components/EpgList.py
+++ b/lib/python/Components/EpgList.py
@@ -35,9 +35,9 @@ class EPGList(HTMLComponent, GUIComponent):
# self.l.setVisualMode(eListboxServiceContent.visModeSimple)
# else:
# self.instance.setItemHeight(40)
-# self.l.setElementFont(self.l.celServiceName, gFont("Arial", 30))
+# self.l.setElementFont(self.l.celServiceName, gFont("Regular", 30))
# self.l.setElementPosition(self.l.celServiceName, eRect(40, 0, self.instance.size().width(), 40))
-# self.l.setElementFont(self.l.celServiceNumber, gFont("Arial", 20))
+# self.l.setElementFont(self.l.celServiceNumber, gFont("Regular", 20))
# self.l.setElementPosition(self.l.celServiceNumber, eRect(0, 10, 40, 30))
#
# self.l.setVisualMode(eListboxServiceContent.visModeComplex)
diff --git a/lib/python/Components/HelpMenuList.py b/lib/python/Components/HelpMenuList.py
index 58335c08..8905944a 100644
--- a/lib/python/Components/HelpMenuList.py
+++ b/lib/python/Components/HelpMenuList.py
@@ -44,8 +44,8 @@ class HelpMenuList(GUIComponent):
self.l.setList(l)
- self.l.setFont(0, gFont("Arial", 36))
- self.l.setFont(1, gFont("Arial", 18))
+ self.l.setFont(0, gFont("Regular", 36))
+ self.l.setFont(1, gFont("Regular", 18))
def GUIcreate(self, parent):
self.instance = eListbox(parent)
diff --git a/lib/python/Components/LanguageList.py b/lib/python/Components/LanguageList.py
index def29c93..09423741 100644
--- a/lib/python/Components/LanguageList.py
+++ b/lib/python/Components/LanguageList.py
@@ -33,7 +33,7 @@ class LanguageList(HTMLComponent, GUIComponent, MenuList):
self.l = eListboxPythonMultiContent()
self.list = list
self.l.setList(list)
- self.l.setFont(0, gFont("Arial", 20))
+ self.l.setFont(0, gFont("Regular", 20))
def GUIcreate(self, parent):
self.instance = eListbox(parent)
diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index 3c5f7e24..0c0bba9b 100644
--- a/lib/python/Components/MovieList.py
+++ b/lib/python/Components/MovieList.py
@@ -61,8 +61,8 @@ class MovieList(HTMLComponent, GUIComponent):
self.l = eListboxPythonMultiContent()
self.load(root)
self.l.setList(self.list)
- self.l.setFont(0, gFont("Arial", 30))
- self.l.setFont(1, gFont("Arial", 18))
+ self.l.setFont(0, gFont("Regular", 30))
+ self.l.setFont(1, gFont("Regular", 18))
def moveToIndex(self, index):
self.instance.moveSelectionTo(index)
diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py
index d2ae64a7..9dec041b 100644
--- a/lib/python/Components/PluginList.py
+++ b/lib/python/Components/PluginList.py
@@ -33,8 +33,8 @@ class PluginList(HTMLComponent, GUIComponent, MenuList):
self.l = eListboxPythonMultiContent()
self.list = list
self.l.setList(list)
- self.l.setFont(0, gFont("Arial", 20))
- self.l.setFont(1, gFont("Arial", 10))
+ self.l.setFont(0, gFont("Regular", 20))
+ self.l.setFont(1, gFont("Regular", 10))
def GUIcreate(self, parent):
self.instance = eListbox(parent)
diff --git a/lib/python/Components/ServiceList.py b/lib/python/Components/ServiceList.py
index 4c10c660..2cef35c1 100644
--- a/lib/python/Components/ServiceList.py
+++ b/lib/python/Components/ServiceList.py
@@ -130,13 +130,13 @@ class ServiceList(HTMLComponent, GUIComponent):
if mode == self.MODE_NORMAL:
self.instance.setItemHeight(28)
self.l.setVisualMode(eListboxServiceContent.visModeSimple)
- self.l.setElementFont(self.l.celServiceName, gFont("Arial", 22))
+ self.l.setElementFont(self.l.celServiceName, gFont("Regular", 22))
self.l.setElementPosition(self.l.celServiceName, eRect(0, 0, self.instance.size().width(), 28))
else:
self.instance.setItemHeight(28)
- self.l.setElementFont(self.l.celServiceNumber, gFont("Arial", 20))
+ self.l.setElementFont(self.l.celServiceNumber, gFont("Regular", 20))
self.l.setElementPosition(self.l.celServiceNumber, eRect(0, 0, 40, 28))
- self.l.setElementFont(self.l.celServiceName, gFont("Arial", 22))
+ self.l.setElementFont(self.l.celServiceName, gFont("Regular", 22))
self.l.setElementPosition(self.l.celServiceName, eRect(50, 0, self.instance.size().width()-50, 28))
- self.l.setElementFont(self.l.celServiceInfo, gFont("Arial", 18))
+ self.l.setElementFont(self.l.celServiceInfo, gFont("Regular", 18))
self.l.setVisualMode(eListboxServiceContent.visModeComplex)
diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py
index f4176fad..8f8dc50c 100644
--- a/lib/python/Components/TimerList.py
+++ b/lib/python/Components/TimerList.py
@@ -66,8 +66,8 @@ class TimerList(HTMLComponent, GUIComponent):
GUIComponent.__init__(self)
self.l = eListboxPythonMultiContent()
self.l.setList(list)
- self.l.setFont(0, gFont("Arial", 20))
- self.l.setFont(1, gFont("Arial", 18))
+ self.l.setFont(0, gFont("Regular", 20))
+ self.l.setFont(1, gFont("Regular", 18))
def getCurrent(self):
return self.l.getCurrentSelection()
diff --git a/lib/python/Plugins/example.py b/lib/python/Plugins/example.py
index 86e2cd14..5b96ee37 100644
--- a/lib/python/Plugins/example.py
+++ b/lib/python/Plugins/example.py
@@ -6,7 +6,7 @@ from Components.Label import Label
class Example(Screen):
skin = """
<screen position="100,100" size="200,200" title="Example plugin..." >
- <widget name="text" position="0,0" size="100,50" font="Arial;23" />
+ <widget name="text" position="0,0" size="100,50" font="Regular;23" />
</screen>"""
def __init__(self, session):
diff --git a/lib/python/Plugins/update.py b/lib/python/Plugins/update.py
index 7126875b..756ed381 100644
--- a/lib/python/Plugins/update.py
+++ b/lib/python/Plugins/update.py
@@ -8,7 +8,7 @@ import os
class Example(Screen):
skin = """
<screen position="100,100" size="550,400" title="IPKG upgrade..." >
- <widget name="text" position="0,0" size="550,400" font="Arial;15" />
+ <widget name="text" position="0,0" size="550,400" font="Regular;15" />
</screen>"""
def __init__(self, session):
diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py
index 6b0a2e00..5b0b6220 100644
--- a/lib/python/Screens/ServiceInfo.py
+++ b/lib/python/Screens/ServiceInfo.py
@@ -25,7 +25,7 @@ class ServiceInfoList(HTMLComponent, GUIComponent):
self.l = eListboxPythonMultiContent()
self.list = source
self.l.setList(self.list)
- self.l.setFont(0, gFont("Arial", 23))
+ self.l.setFont(0, gFont("Regular", 23))
def GUIcreate(self, parent):
self.instance = eListbox(parent)
diff --git a/lib/python/Screens/StartWizard.py b/lib/python/Screens/StartWizard.py
index f96d38d1..7a374543 100644
--- a/lib/python/Screens/StartWizard.py
+++ b/lib/python/Screens/StartWizard.py
@@ -10,7 +10,7 @@ config.misc.firstrun = configElementBoolean("config.misc.firstrun", 1);
class StartWizard(Wizard):
skin = """
<screen position="0,0" size="720,576" title="Welcome..." flags="wfNoBorder" >
- <widget name="text" position="153,50" size="340,270" font="Arial;23" />
+ <widget name="text" position="153,50" size="340,270" font="Regular;23" />
<widget name="list" position="50,300" zPosition="1" size="440,200" />
<widget name="config" position="50,300" zPosition="1" size="440,200" transparent="1" />
<widget name="stepslider" position="50,500" zPosition="1" borderWidth="2" size="440,20" backgroundColor="dark" />
diff --git a/lib/python/Screens/TutorialWizard.py b/lib/python/Screens/TutorialWizard.py
index 68a7d84a..3febb1af 100644
--- a/lib/python/Screens/TutorialWizard.py
+++ b/lib/python/Screens/TutorialWizard.py
@@ -11,7 +11,7 @@ config.misc.firstruntutorial = configElementBoolean("config.misc.firstruntutoria
class TutorialWizard(Wizard):
skin = """
<screen position="0,0" size="720,576" title="Welcome..." flags="wfNoBorder">
- <widget name="text" position="50,100" size="440,200" font="Arial;23" />
+ <widget name="text" position="50,100" size="440,200" font="Regular;23" />
<widget name="list" position="50,300" zPosition="1" size="440,200" />
<widget name="rc" pixmap="/usr/share/enigma2/rc.png" position="500,600" zPosition="10" size="154,475" transparent="1" alphatest="on"/>
<widget name="arrowdown" pixmap="/usr/share/enigma2/arrowdown.png" position="0,0" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp
index cd48c62e..9a8ea29f 100644
--- a/lib/service/listboxservice.cpp
+++ b/lib/service/listboxservice.cpp
@@ -142,7 +142,7 @@ void eListboxServiceContent::setVisualMode(int mode)
if (m_visual_mode == visModeSimple)
{
m_element_position[celServiceName] = eRect(ePoint(0, 0), m_itemsize);
- m_element_font[celServiceName] = new gFont("Arial", 23);
+ m_element_font[celServiceName] = new gFont("Regular", 23);
m_element_position[celServiceNumber] = eRect();
m_element_font[celServiceNumber] = 0;
m_element_position[celIcon] = eRect();
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-19 03:35:02 +0000