From: ghost Date: Thu, 14 Oct 2010 11:21:33 +0000 (+0200) Subject: Merge remote branch 'remotes/origin/bug_587_new_internally_connectable_and_unsupporte... X-Git-Tag: 3.0.0~28 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/12e1565871ab397a50384af408b9120aeb35d077?hp=d21824019fe93603f1c05c7263ef7570aa60e135 Merge remote branch 'remotes/origin/bug_587_new_internally_connectable_and_unsupported_tuner_management' --- diff --git a/RecordTimer.py b/RecordTimer.py index def75684..4ece9c58 100755 --- a/RecordTimer.py +++ b/RecordTimer.py @@ -102,7 +102,7 @@ class RecordTimerEntry(timer.TimerEntry, object): assert isinstance(serviceref, ServiceReference) - if serviceref.getType() == eServiceReference.idDVB and serviceref.getPath() == "": + if serviceref.isRecordable(): self.service_ref = serviceref else: self.service_ref = ServiceReference(None) diff --git a/ServiceReference.py b/ServiceReference.py index 5d11ae77..4907fa28 100644 --- a/ServiceReference.py +++ b/ServiceReference.py @@ -10,7 +10,7 @@ class ServiceReference(eServiceReference): def __str__(self): return self.ref.toString() - + def getServiceName(self): info = self.info() return info and info.getName(self.ref) or "" @@ -20,9 +20,16 @@ class ServiceReference(eServiceReference): def list(self): return self.serviceHandler.list(self.ref) - + def getType(self): return self.ref.type - + def getPath(self): return self.ref.getPath() + + def getFlags(self): + return self.ref.flags + + def isRecordable(self): + ref = self.ref + return ref.flags & eServiceReference.isGroup or (ref.type == eServiceReference.idDVB and ref.getPath() == "") \ No newline at end of file diff --git a/data/defaults/Dream/hdbouquets/userbouquet.favourites.tv b/data/defaults/Dream/hdbouquets/userbouquet.favourites.tv index 91536b10..b6bc62fc 100644 --- a/data/defaults/Dream/hdbouquets/userbouquet.favourites.tv +++ b/data/defaults/Dream/hdbouquets/userbouquet.favourites.tv @@ -11,6 +11,7 @@ #SERVICE 1:0:1:701:5:85:C00000:0:0:0: #SERVICE 1:0:1:2F1C:441:1:C00000:0:0:0: #SERVICE 1:0:1:6D6E:437:1:C00000:0:0:0: +#SERVICE 1:0:1:308:5:85:C00000:0:0:0: #SERVICE 1:0:1:2FC:5:85:C00000:0:0:0: #SERVICE 1:0:1:F98:454:1:C00000:0:0:0: #SERVICE 1:0:19:2B70:3F3:1:C00000:0:0:0: @@ -25,12 +26,12 @@ #SERVICE 1:0:1:6E42:431:1:C00000:0:0:0: #SERVICE 1:64:B:0:0:0:0:0:0:0::Doku/Wissen/Themen #DESCRIPTION Doku/Wissen/Themen -#SERVICE 1:0:1:6DD0:44D:1:C00000:0:0:0: +#SERVICE 1:0:1:6F47:445:1:C00000:0:0:0: #SERVICE 1:0:1:6D6B:437:1:C00000:0:0:0: #SERVICE 1:0:1:2775:444:1:C00000:0:0:0: #SERVICE 1:0:1:293:5:85:C00000:0:0:0: #SERVICE 1:0:1:6D70:437:1:C00000:0:0:0: -#SERVICE 1:0:1:277B:444:1:C00000:0:0:0: +#SERVICE 1:0:1:49:5:85:C00000:0:0:0: #SERVICE 1:0:1:332D:45B:1:C00000:0:0:0: #SERVICE 1:0:1:3139:459:1:C00000:0:0:0: #SERVICE 1:0:1:2F5A:454:1:C00000:0:0:0: diff --git a/data/defaults/Dream/sdbouquets/userbouquet.favourites.tv b/data/defaults/Dream/sdbouquets/userbouquet.favourites.tv index 5f89c48a..1cea3669 100644 --- a/data/defaults/Dream/sdbouquets/userbouquet.favourites.tv +++ b/data/defaults/Dream/sdbouquets/userbouquet.favourites.tv @@ -11,6 +11,7 @@ #SERVICE 1:0:1:701:5:85:C00000:0:0:0: #SERVICE 1:0:1:2F1C:441:1:C00000:0:0:0: #SERVICE 1:0:1:6D6E:437:1:C00000:0:0:0: +#SERVICE 1:0:1:308:5:85:C00000:0:0:0: #SERVICE 1:0:1:2FC:5:85:C00000:0:0:0: #SERVICE 1:0:1:F98:454:1:C00000:0:0:0: #SERVICE 1:0:1:7034:41B:1:C00000:0:0:0: @@ -25,12 +26,12 @@ #SERVICE 1:0:1:6E42:431:1:C00000:0:0:0: #SERVICE 1:64:B:0:0:0:0:0:0:0::Doku/Wissen/Themen #DESCRIPTION Doku/Wissen/Themen -#SERVICE 1:0:1:6DD0:44D:1:C00000:0:0:0: +#SERVICE 1:0:1:6F47:445:1:C00000:0:0:0: #SERVICE 1:0:1:6D6B:437:1:C00000:0:0:0: #SERVICE 1:0:1:2775:444:1:C00000:0:0:0: #SERVICE 1:0:1:293:5:85:C00000:0:0:0: #SERVICE 1:0:1:6D70:437:1:C00000:0:0:0: -#SERVICE 1:0:1:277B:444:1:C00000:0:0:0: +#SERVICE 1:0:1:49:5:85:C00000:0:0:0: #SERVICE 1:0:1:332D:45B:1:C00000:0:0:0: #SERVICE 1:0:1:3139:459:1:C00000:0:0:0: #SERVICE 1:0:1:2F5A:454:1:C00000:0:0:0: diff --git a/data/skin_default.xml b/data/skin_default.xml index f9fb09c1..e5b31322 100755 --- 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())) - + Format:%H:%M diff --git a/data/skin_default/icons/Makefile.am b/data/skin_default/icons/Makefile.am index 5a836bc1..b453aa77 100755 --- 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 2bfeefa1..f30ba8cb 100644 --- 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 ef8dadc3..88cd3ee1 100644 --- a/lib/dvb/decoder.cpp +++ b/lib/dvb/decoder.cpp @@ -601,7 +601,7 @@ RESULT eDVBVideo::connectEvent(const Slot1= 5 ) diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp index 1e8414c3..119223a3 100644 --- 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 6f78197a..ebdad8a7 100644 --- 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; diff --git a/lib/gdi/accel.cpp b/lib/gdi/accel.cpp index 5e489eb3..9450ecca 100644 --- 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 3beb6772..12b5f22a 100644 --- 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 74cda40e..a5db43a9 100644 --- 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 f20c1a9f..bc0d42df 100644 --- a/lib/gui/epixmap.cpp +++ b/lib/gui/epixmap.cpp @@ -3,7 +3,7 @@ #include ePixmap::ePixmap(eWidget *parent) - :eWidget(parent), m_alphatest(false), m_scale(false) + :eWidget(parent), m_alphatest(false), m_scale(false), m_have_border_color(false), m_border_width(0) { } @@ -49,9 +49,22 @@ void ePixmap::setPixmapFromFile(const char *filename) event(evtChangedPixmap); } +void ePixmap::setBorderWidth(int pixel) +{ + m_border_width=pixel; + invalidate(); +} + +void ePixmap::setBorderColor(const gRGB &color) +{ + 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); @@ -67,13 +80,14 @@ int ePixmap::event(int event, void *data, void *data2) case evtPaint: { ePtr style; - + + eSize s(size()); getStyle(style); // 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) @@ -91,6 +105,16 @@ int ePixmap::event(int event, void *data, void *data2) 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: diff --git a/lib/gui/epixmap.h b/lib/gui/epixmap.h index 6280fb34..2db26f25 100644 --- a/lib/gui/epixmap.h +++ b/lib/gui/epixmap.h @@ -15,6 +15,8 @@ public: 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 m_pixmap; int event(int event, void *data=0, void *data2=0); @@ -24,6 +26,9 @@ private: { 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 815cfe35..33f1c13c 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -1392,7 +1392,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 ee18898d..e926e3ff 100755 --- 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 0b3be7d6..1a823b70 100755 --- 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 12d13710..aa22b996 100755 --- 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 5766ff34..a11d35d0 100755 --- 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 84e01672..e17f0bf5 100755 --- 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 d80b8c27..c4ab27d8 100755 --- 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 87b59f43..e501fb6f 100755 --- 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 34ccbeb7..67388bc4 100755 --- 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 ecdcac8a..1ab8aeea 100755 --- 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 d9d96bcf..8fc21e7f 100755 --- 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 60d1d461..e0ce313e 100755 --- 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 aed728db..02655d5d 100755 --- 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 07dc1378..5e2d194c 100755 --- 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 9b0a2ede..92a5473f 100755 --- 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 b1a93d3e..5ab313aa 100755 --- 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 a757b538..cf5608ba 100755 --- 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 0633e7cf..598c0715 100755 --- 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 e8f738c6..db985bf7 100755 --- 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 3bc5cb24..a6b296cf 100755 --- 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 b31fa653..5dfb239a 100755 --- 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 ba035e86..23499a4e 100755 --- 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 d29fb002..992f4b0e 100755 --- 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 05a87d5a..bf064c29 100755 --- 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 new mode 100755 index c8af9cdd..42fe82da --- 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 2e80f306..d08de4a0 100755 --- 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 d0368ed9..a8649058 100755 --- 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 ef474435..ddcc18c9 100755 --- 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 6bc4aab0..692d91aa 100755 --- 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 diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py index 62faf9bf..9885e700 100644 --- a/lib/python/Screens/TimerEntry.py +++ b/lib/python/Screens/TimerEntry.py @@ -278,7 +278,7 @@ class TimerEntry(Screen, ConfigListScreen): self.keyGo() def keyGo(self, result = None): - if self.timerentry_service_ref.getType() != eServiceReference.idDVB or self.timerentry_service_ref.getPath() != "": + if not self.timerentry_service_ref.isRecordable(): self.session.openWithCallback(self.selectChannelSelector, MessageBox, _("You didn't select a channel to record from."), MessageBox.TYPE_ERROR) return self.timer.name = self.timerentry_name.value