From 549ed3c87c4d3fe093472aa199ca6742c1f3654f Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Fri, 23 Dec 2005 00:48:06 +0000 Subject: [PATCH] replace "Arial" by "Regular" --- data/skin.xml | 162 +++++++++++++------------- lib/components/listboxepg.cpp | 206 ---------------------------------- lib/gui/elistboxcontent.cpp | 10 +- lib/gui/ewindowstyle.cpp | 8 +- lib/gui/ewindowstyleskinned.cpp | 6 +- lib/python/Components/EpgList.py | 4 +- lib/python/Components/HelpMenuList.py | 4 +- lib/python/Components/LanguageList.py | 2 +- lib/python/Components/MovieList.py | 4 +- lib/python/Components/PluginList.py | 4 +- lib/python/Components/ServiceList.py | 8 +- lib/python/Components/TimerList.py | 4 +- lib/python/Plugins/example.py | 2 +- lib/python/Plugins/update.py | 2 +- lib/python/Screens/ServiceInfo.py | 2 +- lib/python/Screens/StartWizard.py | 2 +- lib/python/Screens/TutorialWizard.py | 2 +- lib/service/listboxservice.cpp | 2 +- main/enigma-gdi.cpp | 4 +- main/enigma-gui.cpp | 2 +- main/enigma.cpp | 8 +- skin.py | 2 +- 22 files changed, 122 insertions(+), 328 deletions(-) diff --git a/data/skin.xml b/data/skin.xml index f36d2a8..4c1a25c 100644 --- a/data/skin.xml +++ b/data/skin.xml @@ -37,8 +37,8 @@ - - + + @@ -53,22 +53,22 @@ - + - - - - + + + + - + - - + + @@ -80,16 +80,16 @@ - + - - + + - + @@ -99,30 +99,30 @@ - + - + - - + + - - + + - + - - - - - - + + + + + + @@ -138,10 +138,10 @@ - - - - + + + + @@ -151,12 +151,12 @@ - - - - - - + + + + + + @@ -167,19 +167,19 @@ - - - - - - - - + + + + + + + + - + - + @@ -197,18 +197,18 @@ --> - - - + + - - + + @@ -224,55 +224,55 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + - + - - - - - + + + + + - + - - - + + + # this should be factored out into some helper code, but currently demonstrates applets. from enigma import eSize, ePoint diff --git a/lib/components/listboxepg.cpp b/lib/components/listboxepg.cpp index 0d5c541..e69de29 100644 --- a/lib/components/listboxepg.cpp +++ b/lib/components/listboxepg.cpp @@ -1,206 +0,0 @@ -#include -#include -#include - -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 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 &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 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 = ""; - - 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 95d92e0..6e49dcb 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 fnt = new gFont("Arial", 20); + ePtr 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 fnt = new gFont("Arial", 20); + ePtr 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 fnt = new gFont("Arial", 20); + ePtr 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 fnt = new gFont("Arial", 20); - ePtr fnt2 = new gFont("Arial", 16); + ePtr fnt = new gFont("Regular", 20); + ePtr 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 79024a3..86ff8a4 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 &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 20d508f..5da4696 100644 --- a/lib/gui/ewindowstyleskinned.cpp +++ b/lib/gui/ewindowstyleskinned.cpp @@ -196,13 +196,13 @@ RESULT eWindowStyleSkinned::getFont(int what, ePtr &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 5628258..6ab3f74 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 58335c0..8905944 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 def29c9..0942374 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 3c5f7e2..0c0bba9 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 d2ae64a..9dec041 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 4c10c66..2cef35c 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 f4176fa..8f8dc50 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 86e2cd1..5b96ee3 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 = """ - + """ def __init__(self, session): diff --git a/lib/python/Plugins/update.py b/lib/python/Plugins/update.py index 7126875..756ed38 100644 --- a/lib/python/Plugins/update.py +++ b/lib/python/Plugins/update.py @@ -8,7 +8,7 @@ import os class Example(Screen): skin = """ - + """ def __init__(self, session): diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py index 6b0a2e0..5b0b622 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 f96d38d..7a37454 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 = """ - + diff --git a/lib/python/Screens/TutorialWizard.py b/lib/python/Screens/TutorialWizard.py index 68a7d84..3febb1a 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 = """ - + diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp index cd48c62..9a8ea29 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(); diff --git a/main/enigma-gdi.cpp b/main/enigma-gdi.cpp index 43c422f..9c3eed9 100644 --- a/main/enigma-gdi.cpp +++ b/main/enigma-gdi.cpp @@ -68,7 +68,7 @@ int main() pal[a | 0x10] = (0x111111 * a) | 0xFF; p.setPalette(pal, 0, 256); - fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Arial", 100); + fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Regular", 100); p.resetClip(gRegion(eRect(0, 0, 720, 576))); @@ -102,7 +102,7 @@ int main() p.setBackgroundColor(gColor(0x1f)); p.setForegroundColor(gColor(0x10)); - ePtr fnt = new gFont("Arial", 70); + ePtr fnt = new gFont("Regular", 70); p.setFont(fnt); p.renderText(eRect(100, 100, 500, 200), "Hello welt!"); diff --git a/main/enigma-gui.cpp b/main/enigma-gui.cpp index 67d9c0c..e53fcca 100644 --- a/main/enigma-gui.cpp +++ b/main/enigma-gui.cpp @@ -67,7 +67,7 @@ int main() pal[a | 0x10] = (0x111111 * a) | 0xFF; p.setPalette(pal, 0, 256); - fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Arial", 100); + fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Regular", 100); eWidgetDesktop dsk(eSize(720, 576)); dsk.setDC(my_dc); diff --git a/main/enigma.cpp b/main/enigma.cpp index 0d1ce6e..4f538e4 100644 --- a/main/enigma.cpp +++ b/main/enigma.cpp @@ -177,7 +177,7 @@ int main(int argc, char **argv) ePtr my_lcd_dc; gLCDDC::getInstance(my_lcd_dc); - fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Arial", 100); + fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Regular", 100); eWidgetDesktop dsk(eSize(720, 576)); eWidgetDesktop dsk_lcd(eSize(132, 64)); @@ -219,14 +219,14 @@ int main(int argc, char **argv) lcd_label = new eLabel(lcd_win); lcd_label->move(ePoint(0, 4)); lcd_label->resize(eSize(132, 42)); - ePtr font = new gFont("Arial", 19); - //ePtr font = new gFont("Arial", 16); + ePtr font = new gFont("Regular", 19); + //ePtr font = new gFont("Regular", 16); lcd_label->setFont(font); lcd_clock = new eLabel(lcd_win); lcd_clock->move(ePoint(50, 46)); lcd_clock->resize(eSize(132, 18)); - ePtr clkfont = new gFont("Arial", 16); + ePtr clkfont = new gFont("Regular", 16); lcd_clock->setFont(clkfont); //lcd_label->setText("bla bla bla, this lcd\nSUCKS!"); diff --git a/skin.py b/skin.py index 8535dc8..c6d0678 100644 --- a/skin.py +++ b/skin.py @@ -165,7 +165,7 @@ def loadSkin(desktop): for windowstyle in elementsWithTag(skin.childNodes, "windowstyle"): style = eWindowStyleSkinned() - style.setTitleFont(gFont("Arial", 20)); + style.setTitleFont(gFont("Regular", 20)); style.setTitleOffset(eSize(20, 5)); for borderset in elementsWithTag(windowstyle.childNodes, "borderset"): -- 2.7.4