Get rid of "--with-colorlcd" parameter
authorMike Looijmans <milo@openpli.org>
Sat, 2 Jan 2016 09:56:14 +0000 (10:56 +0100)
committerMike Looijmans <milo@openpli.org>
Sat, 2 Jan 2016 10:04:24 +0000 (11:04 +0100)
Don't special case the skinning just for one box that's out of production,
use the regular skinning system. Makes it easier to add new boxes with
different panels too.

The LCD being color or not is detected runtime anyway.

configure.ac
data/Makefile.am
data/skin_default.xml
data/skin_display_dm800se.xml [moved from data/skin_display96.xml with 100% similarity]
skin.py

index 9782627..45de5cc 100644 (file)
@@ -72,17 +72,6 @@ if test x"$withtextlcd" != xno ; then
 fi
 AM_CONDITIONAL(HAVE_TEXTLCD, test x"$withtextlcd" != xno)
 
 fi
 AM_CONDITIONAL(HAVE_TEXTLCD, test x"$withtextlcd" != xno)
 
-AC_ARG_WITH(colorlcd,
-       AC_HELP_STRING([--with-colorlcd], [use 96x64 16bpp color display, yes or no]),
-       [[withcolorlcd=$withval]],
-       [[withcolorlcd=no]]
-)
-if test x"$withcolorlcd" != xno ; then
-       AC_DEFINE(HAVE_COLORLCD, 1,[Define when using a 96x64 color display device])
-fi
-AM_CONDITIONAL(HAVE_COLORLCD, test x"$withcolorlcd" != xno)
-
-
 AC_ARG_WITH(oldpvr,
        AC_HELP_STRING([--with-oldpvr], [use /dev/misc/pvr instead of /dev/dvb/adapterX/dvrX, yes or no]),
        [[witholdpvr=$withval]],
 AC_ARG_WITH(oldpvr,
        AC_HELP_STRING([--with-oldpvr], [use /dev/misc/pvr instead of /dev/dvb/adapterX/dvrX, yes or no]),
        [[witholdpvr=$withval]],
index 97a3ca2..654555e 100644 (file)
@@ -21,12 +21,8 @@ dist_pkgdata_DATA = \
 if HAVE_TEXTLCD
 dist_pkgdata_DATA += skin_text.xml
 else
 if HAVE_TEXTLCD
 dist_pkgdata_DATA += skin_text.xml
 else
-if HAVE_COLORLCD
-dist_pkgdata_DATA += skin_display96.xml
-else
 dist_pkgdata_DATA += skin_display.xml
 endif
 dist_pkgdata_DATA += skin_display.xml
 endif
-endif
 
 skin_display.xml: $(srcdir)/skin_display_default.xml
        test -f $(srcdir)/skin_display_$(BOXTYPE).xml && cp $(srcdir)/skin_display_$(BOXTYPE).xml skin_display.xml || cp $(srcdir)/skin_display_default.xml skin_display.xml
 
 skin_display.xml: $(srcdir)/skin_display_default.xml
        test -f $(srcdir)/skin_display_$(BOXTYPE).xml && cp $(srcdir)/skin_display_$(BOXTYPE).xml skin_display.xml || cp $(srcdir)/skin_display_default.xml skin_display.xml
index 688caf2..1158195 100644 (file)
                <color color="#ffffff" name="WindowTitleForeground"/>
                <color color="#000000" name="WindowTitleBackground"/>
        </windowstyle>
                <color color="#ffffff" name="WindowTitleForeground"/>
                <color color="#000000" name="WindowTitleBackground"/>
        </windowstyle>
-       <!-- id=2 is for dm800se 16-bit OLED -->
-       <windowstyle type="skinned" id="2">
-               <color name="Background" color="#000000"/>
-               <color name="LabelForeground" color="#ffffff"/>
-               <color name="ListboxBackground" color="#000000"/>
-               <color name="ListboxForeground" color="#ffffff"/>
-               <color name="ListboxSelectedBackground" color="#000000"/>
-               <color name="ListboxSelectedForeground" color="#ffffff"/>
-               <color name="ListboxMarkedBackground" color="#000000"/>
-               <color name="ListboxMarkedForeground" color="#ffffff"/>
-               <color name="ListboxMarkedAndSelectedBackground" color="#000000"/>
-               <color name="ListboxMarkedAndSelectedForeground" color="#ffffff"/>
-               <color name="WindowTitleForeground" color="#ffffff"/>
-               <color name="WindowTitleBackground" color="#000000"/>
-       </windowstyle>
        <fonts>
                <font filename="nmsbd.ttf" name="Regular" scale="90" />
                <font filename="andale.ttf" name="Fixed" scale="100" />
        <fonts>
                <font filename="nmsbd.ttf" name="Regular" scale="90" />
                <font filename="andale.ttf" name="Fixed" scale="100" />
diff --git a/skin.py b/skin.py
index 869c304..c8bab0f 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -94,12 +94,8 @@ if not name or not res:
 addSkin('skin_box.xml')
 # add optional discrete second infobar
 addSkin('skin_second_infobar.xml')
 addSkin('skin_box.xml')
 # add optional discrete second infobar
 addSkin('skin_second_infobar.xml')
-# Only one of these is present, compliments of AM_CONDITIONAL
 display_skin_id = 1
 addSkin('skin_display.xml')
 display_skin_id = 1
 addSkin('skin_display.xml')
-if addSkin('skin_display96.xml'):
-       # Color OLED
-       display_skin_id = 2
 addSkin('skin_text.xml')
 
 addSkin('skin_subtitles.xml')
 addSkin('skin_text.xml')
 
 addSkin('skin_subtitles.xml')