Merge remote branch 'remotes/origin/bug_593_i2c_device_from_file'

diff --git a/data/skin_default.xml b/data/skin_default.xml
index f9fb09c..e5b3132 100755 (executable)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -1304,7 +1304,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
        </screen>
        <!-- Color OLED screen (standby) -->
        <screen name="StandbySummary" position="0,0" size="96,64" id="2">
-               <widget source="global.CurrentTime" render="Label" position="0,0" size="96,64" font="Regular;40" halign="center" valign="center">
+               <widget source="global.CurrentTime" render="Label" position="0,0" size="96,64" font="Regular;38" halign="center" valign="center">
                        <convert type="ClockToText">Format:%H:%M</convert>
                </widget>
                <widget source="session.RecordState" render="FixedLabel" position="0,0" zPosition="1" size="96,64" text=" ">

diff --git a/data/skin_default/icons/Makefile.am b/data/skin_default/icons/Makefile.am
index 5a836bc..b453aa7 100755 (executable)
--- a/data/skin_default/icons/Makefile.am
+++ b/data/skin_default/icons/Makefile.am
@@ -65,3 +65,4 @@ dist_install_DATA = \
        selectioncross.png \
        unlock.png \
        unlockBouquet.png
+

diff --git a/lib/driver/rcinput.cpp b/lib/driver/rcinput.cpp
index 2bfeefa..f30ba8c 100644 (file)
--- a/lib/driver/rcinput.cpp
+++ b/lib/driver/rcinput.cpp
@@ -73,16 +73,8 @@ void eRCDeviceInputDev::handleCode(long rccode)
 eRCDeviceInputDev::eRCDeviceInputDev(eRCInputEventDriver *driver)
        :eRCDevice(driver->getDeviceName(), driver), iskeyboard(false)
 {
-       int len=id.length();
-       int idx=0;
-       while(idx <= len-8)
-       {
-               if (!strncasecmp(&id[idx++], "KEYBOARD", 8))
-               {
-                       iskeyboard=true;
-                       break;
-               }
-       }
+       if (strcasestr(id.c_str(), "keyboard") != NULL)
+               iskeyboard = true;
        setExclusive(true);
        eDebug("Input device \"%s\" is %sa keyboard.", id.c_str(), iskeyboard ? "" : "not ");
 }

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index ef8dadc..88cd3ee 100644 (file)
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -601,7 +601,7 @@ RESULT eDVBVideo::connectEvent(const Slot1<void, struct iTSMPEGDecoder::videoEve
        return 0;
 }
 
-static int readMpegProc(char *str, int decoder)
+static int readMpegProc(const char *str, int decoder)
 {
        int val = -1;
        char tmp[64];

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 40d4418..5162945 100644 (file)
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -320,27 +320,34 @@ PyObject *eDVBResourceManager::setFrontendSlotInformations(ePyObject list)
                PyErr_SetString(PyExc_StandardError, "eDVBResourceManager::setFrontendSlotInformations argument should be a python list");
                return NULL;
        }
-       if ((unsigned int)PyList_Size(list) != m_frontend.size())
+       unsigned int assigned=0;
+       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
        {
+               int pos=0;
+               while (pos < PyList_Size(list)) {
+                       ePyObject obj = PyList_GET_ITEM(list, pos++);
+                       if (!i->m_frontend->setSlotInfo(obj))
+                               continue;
+                       ++assigned;
+                       break;
+               }
+       }
+       if (assigned != m_frontend.size()) {
                char blasel[256];
-               sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations list size incorrect %d frontends avail, but %d entries in slotlist",
-                       m_frontend.size(), PyList_Size(list));
+               sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations .. assigned %d socket informations, but %d registered frontends!",
+                       m_frontend.size(), assigned);
                PyErr_SetString(PyExc_StandardError, blasel);
                return NULL;
        }
-       int pos=0;
-       for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
-       {
-               ePyObject obj = PyList_GET_ITEM(list, pos++);
-               if (!i->m_frontend->setSlotInfo(obj))
-                       return NULL;
-       }
-       pos=0;
        for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_simulate_frontend.begin()); i != m_simulate_frontend.end(); ++i)
        {
-               ePyObject obj = PyList_GET_ITEM(list, pos++);
-               if (!i->m_frontend->setSlotInfo(obj))
-                       return NULL;
+               int pos=0;
+               while (pos < PyList_Size(list)) {
+                       ePyObject obj = PyList_GET_ITEM(list, pos++);
+                       if (!i->m_frontend->setSlotInfo(obj))
+                               continue;
+                       break;
+               }
        }
        Py_RETURN_NONE;
 }

diff --git a/lib/dvb/dvbtime.cpp b/lib/dvb/dvbtime.cpp
index bb6b94b..26b6767 100644 (file)
--- a/lib/dvb/dvbtime.cpp
+++ b/lib/dvb/dvbtime.cpp
@@ -111,7 +111,7 @@ void TDT::ready(int error)
 
 int TDT::createTable(unsigned int nr, const __u8 *data, unsigned int max)
 {
-       if ( data && data[0] == 0x70 || data[0] == 0x73 )
+       if ( data && (data[0] == 0x70 || data[0] == 0x73 ))
        {
                int length = ((data[1] & 0x0F) << 8) | data[2];
                if ( length >= 5 )

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index 1e8414c..119223a 100644 (file)
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -2562,7 +2562,7 @@ void eEPGCache::PMTready(eDVBServicePMTHandler *pmthandler)
                                                                {
                                                                        __u8 buffer[10];
                                                                        (*desc)->writeToBuffer(buffer);
-                                                                       if (!strncmp((char*)buffer+2, "EPGDATA", 7))
+                                                                       if (!strncmp((const char *)buffer+2, "EPGDATA", 7))
                                                                        {
                                                                                eServiceReferenceDVB ref;
                                                                                if (!pmthandler->getServiceReference(ref))
@@ -2571,7 +2571,7 @@ void eEPGCache::PMTready(eDVBServicePMTHandler *pmthandler)
                                                                                        messages.send(Message(Message::got_mhw2_channel_pid, ref, pid));
                                                                                }
                                                                        }
-                                                                       else if(!strncmp((char*)buffer+2, "FICHAS", 6))
+                                                                       else if(!strncmp((const char *)buffer+2, "FICHAS", 6))
                                                                        {
                                                                                eServiceReferenceDVB ref;
                                                                                if (!pmthandler->getServiceReference(ref))
@@ -2580,7 +2580,7 @@ void eEPGCache::PMTready(eDVBServicePMTHandler *pmthandler)
                                                                                        messages.send(Message(Message::got_mhw2_summary_pid, ref, pid));
                                                                                }
                                                                        }
-                                                                       else if(!strncmp((char*)buffer+2, "GENEROS", 7))
+                                                                       else if(!strncmp((const char *)buffer+2, "GENEROS", 7))
                                                                        {
                                                                                eServiceReferenceDVB ref;
                                                                                if (!pmthandler->getServiceReference(ref))

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index abbb8d2..ebdad8a 100644 (file)
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -813,7 +813,7 @@ int eDVBFrontend::readFrontendData(int type)
                                        float fval1 = SDS_SNRE / 268435456.0,
                                                  fval2, fval3, fval4;
 
-                                       if (parm_u_qpsk_fec_inner <= FEC_S2_QPSK_9_10) // DVB-S2 QPSK
+                                       if (oparm.sat.modulation == eDVBFrontendParametersSatellite::Modulation_QPSK)
                                        {
                                                fval2 = 6.76;
                                                fval3 = 4.35;
@@ -2700,17 +2700,23 @@ int eDVBFrontend::isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)
 
 bool eDVBFrontend::setSlotInfo(ePyObject obj)
 {
-       ePyObject Id, Descr, Enabled, IsDVBS2;
-       if (!PyTuple_Check(obj) || PyTuple_Size(obj) != 4)
+       ePyObject Id, Descr, Enabled, IsDVBS2, frontendId;
+       if (!PyTuple_Check(obj) || PyTuple_Size(obj) != 5)
                goto arg_error;
        Id = PyTuple_GET_ITEM(obj, 0);
        Descr = PyTuple_GET_ITEM(obj, 1);
        Enabled = PyTuple_GET_ITEM(obj, 2);
        IsDVBS2 = PyTuple_GET_ITEM(obj, 3);
-       if (!PyInt_Check(Id) || !PyString_Check(Descr) || !PyBool_Check(Enabled) || !PyBool_Check(IsDVBS2))
+       frontendId = PyTuple_GET_ITEM(obj, 4);
+       m_slotid = PyInt_AsLong(Id);
+       if (!PyInt_Check(Id) || !PyString_Check(Descr) || !PyBool_Check(Enabled) || !PyBool_Check(IsDVBS2) || !PyInt_Check(frontendId))
                goto arg_error;
        strcpy(m_description, PyString_AS_STRING(Descr));
-       m_slotid = PyInt_AsLong(Id);
+       if (PyInt_AsLong(frontendId) == -1 || PyInt_AsLong(frontendId) != m_dvbid) {
+//             eDebugNoSimulate("skip slotinfo for slotid %d, descr %s",
+//                     m_slotid, m_description);
+               return false;
+       }
        m_enabled = Enabled == Py_True;
        // HACK.. the rotor workaround is neede for all NIMs with LNBP21 voltage regulator...
        m_need_rotor_workaround = !!strstr(m_description, "Alps BSBE1") ||

diff --git a/lib/gdi/accel.cpp b/lib/gdi/accel.cpp
index 5e489eb..9450ecc 100644 (file)
--- a/lib/gdi/accel.cpp
+++ b/lib/gdi/accel.cpp
@@ -32,7 +32,7 @@ extern void bcm_accel_blit(
                int dst_addr, int dst_width, int dst_height, int dst_stride,
                int src_x, int src_y, int width, int height,
                int dst_x, int dst_y, int dwidth, int dheight,
-               int pal_addr);
+               int pal_addr, int flags);
 extern void bcm_accel_fill(
                int dst_addr, int dst_width, int dst_height, int dst_stride,
                int x, int y, int width, int height,
@@ -122,7 +122,7 @@ int gAccel::blit(gSurface *dst, const gSurface *src, const eRect &p, const eRect
                        dst->data_phys, dst->x, dst->y, dst->stride, 
                        area.left(), area.top(), area.width(), area.height(),
                        p.x(), p.y(), p.width(), p.height(),
-                       pal_addr);
+                       pal_addr, flags);
                return 0;
        }
 #endif

diff --git a/lib/gdi/bcm.cpp b/lib/gdi/bcm.cpp
index 3beb677..12b5f22 100644 (file)
--- a/lib/gdi/bcm.cpp
+++ b/lib/gdi/bcm.cpp
@@ -64,7 +64,7 @@ void bcm_accel_blit(
                int dst_addr, int dst_width, int dst_height, int dst_stride,
                int src_x, int src_y, int width, int height,
                int dst_x, int dst_y, int dwidth, int dheight,
-               int pal_addr)
+               int pal_addr, int flags)
 {
        C(0x43); // reset source
        C(0x53); // reset dest

diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp
index 74cda40..a5db43a 100644 (file)
--- a/lib/gdi/font.cpp
+++ b/lib/gdi/font.cpp
@@ -370,7 +370,7 @@ int eTextPara::appendGlyph(Font *current_font, FT_Face current_face, FT_UInt gly
        }
 
        pGlyph ng;
-       ng.bbox.setLeft( (flags&GS_ISFIRST|cursor.x()-1)+glyph->left );
+       ng.bbox.setLeft( ((flags&GS_ISFIRST)|(cursor.x()-1))+glyph->left );
        ng.bbox.setTop( cursor.y() - glyph->top );
        ng.bbox.setWidth( glyph->width );
        ng.bbox.setHeight( glyph->height );

diff --git a/lib/gui/epixmap.cpp b/lib/gui/epixmap.cpp
index 1768685..bc0d42d 100644 (file)
--- a/lib/gui/epixmap.cpp
+++ b/lib/gui/epixmap.cpp
@@ -46,25 +46,25 @@ void ePixmap::setPixmapFromFile(const char *filename)
        
                // TODO: This only works for desktop 0
        getDesktop(0)->makeCompatiblePixmap(*m_pixmap);
-        event(evtChangedPixmap);
+       event(evtChangedPixmap);
 }
 
 void ePixmap::setBorderWidth(int pixel)
 {
-        m_border_width=pixel;
-        invalidate();
+       m_border_width=pixel;
+       invalidate();
 }
 
 void ePixmap::setBorderColor(const gRGB &color)
 {
-        m_border_color=color;
-        m_have_border_color=true;
-        invalidate();
+       m_border_color=color;
+       m_have_border_color=true;
+       invalidate();
 }
 
 void ePixmap::checkSize()
 {
-                        /* when we have no pixmap, or a pixmap of different size, we need 
+       /* when we have no pixmap, or a pixmap of different size, we need
           to enable transparency in any case. */
        if (m_pixmap && m_pixmap->size() == size() && !m_alphatest)
                setTransparent(0);
@@ -78,16 +78,16 @@ int ePixmap::event(int event, void *data, void *data2)
        switch (event)
        {
        case evtPaint:
-        {
-                ePtr<eWindowStyle> style;
+       {
+               ePtr<eWindowStyle> style;
 
-                eSize s(size());
-                getStyle(style);
+               eSize s(size());
+               getStyle(style);
 
-//      we don't clear the background before because of performance reasons.
+//     we don't clear the background before because of performance reasons.
 //     when the pixmap is too small to fit the whole widget area, the widget is
 //     transparent anyway, so the background is already painted.
-//             eWidget::event(event, data, data2); 
+//             eWidget::event(event, data, data2);
 
                gPainter &painter = *(gPainter*)data2;
                if (m_pixmap)
@@ -102,20 +102,22 @@ int ePixmap::event(int event, void *data, void *data2)
                        if (m_scale)
                                painter.blitScale(m_pixmap, eRect(ePoint(0, 0), size()), eRect(), flags);
                        else
-                                painter.blit(m_pixmap, ePoint(0, 0), eRect(), flags);
-                }
-
-// border
-                if (m_have_border_color)
-                        painter.setForegroundColor(m_border_color);
-                painter.fill(eRect(0, 0, s.width(), m_border_width));
-                painter.fill(eRect(0, m_border_width, m_border_width, s.height()-m_border_width));
-                painter.fill(eRect(m_border_width, s.height()-m_border_width, s.width()-m_border_width, m_border_width));
-                painter.fill(eRect(s.width()-m_border_width, m_border_width, m_border_width, s.height()-m_border_width));
-
-                return 0;
-        }
-        case evtChangedPixmap:
+                               painter.blit(m_pixmap, ePoint(0, 0), eRect(), flags);
+               }
+
+               if (m_have_border_color)
+                       painter.setForegroundColor(m_border_color);
+
+               if (m_border_width) {
+                       painter.fill(eRect(0, 0, s.width(), m_border_width));
+                       painter.fill(eRect(0, m_border_width, m_border_width, s.height()-m_border_width));
+                       painter.fill(eRect(m_border_width, s.height()-m_border_width, s.width()-m_border_width, m_border_width));
+                       painter.fill(eRect(s.width()-m_border_width, m_border_width, m_border_width, s.height()-m_border_width));
+               }
+
+               return 0;
+       }
+       case evtChangedPixmap:
                checkSize();
                invalidate();
                return 0;

diff --git a/lib/gui/epixmap.h b/lib/gui/epixmap.h
index 9a6e20d..2db26f2 100644 (file)
--- a/lib/gui/epixmap.h
+++ b/lib/gui/epixmap.h
@@ -12,23 +12,23 @@ public:
 
        void setPixmap(gPixmap *pixmap);
        void setPixmap(ePtr<gPixmap> &pixmap);
-        void setPixmapFromFile(const char *filename);
-        void setAlphatest(int alphatest); /* 1 for alphatest, 2 for alphablend */
-        void setScale(int scale);
-        void setBorderWidth(int pixel);
-        void setBorderColor(const gRGB &color);
+       void setPixmapFromFile(const char *filename);
+       void setAlphatest(int alphatest); /* 1 for alphatest, 2 for alphablend */
+       void setScale(int scale);
+       void setBorderWidth(int pixel);
+       void setBorderColor(const gRGB &color);
 protected:
-        ePtr<gPixmap> m_pixmap;
-        int event(int event, void *data=0, void *data2=0);
+       ePtr<gPixmap> m_pixmap;
+       int event(int event, void *data=0, void *data2=0);
        void checkSize();
 private:
        enum eLabelEvent
-        {
-                evtChangedPixmap = evtUserWidget,
-        };
-        bool m_have_border_color;
-        int m_border_width;
-        gRGB m_border_color;
+       {
+               evtChangedPixmap = evtUserWidget,
+       };
+       bool m_have_border_color;
+       int m_border_width;
+       gRGB m_border_color;
 };
 
 #endif

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 67a1abc..7303186 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -150,7 +150,7 @@ class SecConfigure:
 
                for slot in nim_slots:
                        if slot.type is not None:
-                               used_nim_slots.append((slot.slot, slot.description, slot.config.configMode.value != "nothing" and True or False, slot.isCompatible("DVB-S2")))
+                               used_nim_slots.append((slot.slot, slot.description, slot.config.configMode.value != "nothing" and True or False, slot.isCompatible("DVB-S2"), slot.frontend_id is None and -1 or slot.frontend_id))
                eDVBResourceManager.getInstance().setFrontendSlotInformations(used_nim_slots)
 
                for slot in nim_slots:
@@ -481,8 +481,7 @@ class SecConfigure:
                self.update()
 
 class NIM(object):
-       def __init__(self, slot, type, description, has_outputs = True, internally_connectable = None, multi_type = {}, frontend_id = None, i2c = None):
-
+       def __init__(self, slot, type, description, has_outputs = True, internally_connectable = None, multi_type = {}, frontend_id = None, i2c = None, is_empty = False):
                self.slot = slot
 
                if type not in ("DVB-S", "DVB-C", "DVB-T", "DVB-S2", None):
@@ -496,6 +495,7 @@ class NIM(object):
                self.multi_type = multi_type
                self.i2c = i2c
                self.frontend_id = frontend_id
+               self.__is_empty = is_empty
 
        def isCompatible(self, what):
                if not self.isSupported():
@@ -554,8 +554,12 @@ class NIM(object):
        def isMultiType(self):
                return (len(self.multi_type) > 0)
        
+       def isEmpty(self):
+               return self.__is_empty
+       
+       # empty tuners are supported!
        def isSupported(self):
-               return (self.frontend_id is not None)
+               return (self.frontend_id is not None) or self.__is_empty
        
        # returns dict {<slotid>: <type>}
        def getMultiTypeList(self):
@@ -700,8 +704,10 @@ class NimManager:
                                entries[current_slot] = {}
                        elif line.strip().startswith("Type:"):
                                entries[current_slot]["type"] = str(line.strip()[6:])
+                               entries[current_slot]["isempty"] = False
                        elif line.strip().startswith("Name:"):
                                entries[current_slot]["name"] = str(line.strip()[6:])
+                               entries[current_slot]["isempty"] = False
                        elif line.strip().startswith("Has_Outputs:"):
                                input = str(line.strip()[len("Has_Outputs:") + 1:])
                                entries[current_slot]["has_outputs"] = (input == "yes")
@@ -725,6 +731,7 @@ class NimManager:
                        elif line.strip().startswith("empty"):
                                entries[current_slot]["type"] = None
                                entries[current_slot]["name"] = _("N/A")
+                               entries[current_slot]["isempty"] = True
                nimfile.close()
                
                from os import path
@@ -746,8 +753,7 @@ class NimManager:
                                entry["frontend_device"] = entry["internally_connectable"] = None
                        if not (entry.has_key("multi_type")):
                                entry["multi_type"] = {}
-                       self.nim_slots.append(NIM(slot = id, description = entry["name"], type = entry["type"], has_outputs = entry["has_outputs"], internally_connectable = entry["internally_connectable"], multi_type = entry["multi_type"], frontend_id = entry["frontend_device"], i2c = entry["i2c"]))
-
+                       self.nim_slots.append(NIM(slot = id, description = entry["name"], type = entry["type"], has_outputs = entry["has_outputs"], internally_connectable = entry["internally_connectable"], multi_type = entry["multi_type"], frontend_id = entry["frontend_device"], i2c = entry["i2c"], is_empty = entry["isempty"]))
 
        def hasNimType(self, chktype):
                for slot in self.nim_slots:
@@ -1398,7 +1404,7 @@ def InitNimManager(nimmgr):
                nim = config.Nims[x]
 
                if slot.isCompatible("DVB-S"):
-                       nim.toneAmplitude = ConfigSelection([("9", "600mV"), ("8", "700mV"), ("7", "800mV"), ("6", "900mV"), ("5", "1100mV")], "7")
+                       nim.toneAmplitude = ConfigSelection([("11", "340mV"), ("10", "360mV"), ("9", "600mV"), ("8", "700mV"), ("7", "800mV"), ("6", "900mV"), ("5", "1100mV")], "7")
                        nim.toneAmplitude.fe_id = x - empty_slots
                        nim.toneAmplitude.slot_id = x
                        nim.toneAmplitude.addNotifier(toneAmplitudeChanged)

diff --git a/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am b/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am
index ee18898..e926e3f 100755 (executable)
--- a/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_cutlisteditor.xml
 

diff --git a/lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am b/lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am
index 0b3be7d..1a823b7 100755 (executable)
--- a/lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_dvdburn.xml
 

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am b/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am
index 12d1371..aa22b99 100755 (executable)
--- a/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_dvdplayer.xml
 

diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am
index 5766ff3..a11d35d 100755 (executable)
--- a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_graphmultiepg.xml
 

diff --git a/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am b/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am
index 84e0167..e17f0bf 100755 (executable)
--- a/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_mediaplayer.xml
 

diff --git a/lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am b/lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am
index d80b8c2..c4ab27d 100755 (executable)
--- a/lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_mediascanner.xml
 

diff --git a/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am b/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am
index 87b59f4..e501fb6 100755 (executable)
--- a/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_pictureplayer.xml
 

diff --git a/lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am b/lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am
index 34ccbeb..67388bc 100755 (executable)
--- a/lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_socketmmi.xml

diff --git a/lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am b/lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am
index ecdcac8..1ab8aee 100755 (executable)
--- a/lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am
+++ b/lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_tuxboxplugins.xml

diff --git a/lib/python/Plugins/SystemPlugins/CleanupWizard/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/CleanupWizard/meta/Makefile.am
index d9d96bc..8fc21e7 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/CleanupWizard/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/CleanupWizard/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_cleanupwizard.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am
index 60d1d46..e0ce313 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_commoninterfaceassignment.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/meta/Makefile.am
index aed728d..02655d5 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_crashlogautosubmit.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am
index 07dc137..5e2d194 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_defaultservicesscanner.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am
index 9b0a2ed..92a5473 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_diseqctester.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am
index b1a93d3..5ab313a 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_frontprocessorupgrade.xml

diff --git a/lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile.am
index a757b53..cf5608b 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile.am
@@ -1,3 +1,3 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_hotplug.xml

diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am
index 0633e7c..598c071 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_nfiflash.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/NetworkWizard/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/NetworkWizard/meta/Makefile.am
index e8f738c..db985bf 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/NetworkWizard/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/NetworkWizard/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_networkwizard.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am
index 3bc5cb2..a6b296c 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_positionersetup.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am
index b31fa65..5dfb239 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_satelliteequipmentcontrol.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am
index ba035e8..23499a4 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_satfinder.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am
index d29fb00..992f4b0 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_skinselector.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am
index 05a87d5..bf064c2 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_softwaremanager.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py b/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
old mode 100644 (file)
new mode 100755 (executable)
index c8af9cd..42fe82d
--- a/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
@@ -131,6 +131,7 @@ class TempFanControl(Screen, ConfigListScreen):
                ConfigListScreen.__init__(self, self.list, session = self.session)
                #self["config"].list = self.list
                #self["config"].setList(self.list)
+               self["config"].l.setSeperation(300)
                
                self["actions"] = ActionMap(["OkCancelActions", "ColorActions"], 
                {

diff --git a/lib/python/Plugins/SystemPlugins/VideoEnhancement/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/VideoEnhancement/meta/Makefile.am
index 2e80f30..d08de4a 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/VideoEnhancement/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/VideoEnhancement/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_videoenhancement.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am
index d0368ed..a864905 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_videotune.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am
index ef47443..ddcc18c 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_videomode.xml
 

diff --git a/lib/python/Plugins/SystemPlugins/WirelessLan/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/WirelessLan/meta/Makefile.am
index 6bc4aab..692d91a 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/WirelessLan/meta/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/WirelessLan/meta/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(datadir)/meta/
+installdir = $(datadir)/meta
 
 dist_install_DATA = plugin_wirelesslan.xml