From c942b1c829bf49d77dcdb2bfda776e6288c99828 Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Thu, 1 Dec 2005 08:41:25 +0000 Subject: [PATCH] add blinking dish-picture if positioner is moving (we need a function which returns true when the positioner is moving for it to work) --- data/dish.png | Bin 0 -> 1303 bytes data/skin.xml | 5 +++++ lib/dvb/sec.cpp | 7 ++++++- lib/dvb/sec.h | 6 ++++-- lib/python/Components/BlinkingPixmap.py | 2 +- lib/python/Screens/InfoBar.py | 6 +++--- lib/python/Screens/InfoBarGenerics.py | 6 ++++++ lib/python/Screens/Makefile.am | 3 ++- 8 files changed, 27 insertions(+), 8 deletions(-) create mode 100755 data/dish.png diff --git a/data/dish.png b/data/dish.png new file mode 100755 index 0000000000000000000000000000000000000000..8253b8ac51817205d23813b2e8dfcb8cd5f2a82d GIT binary patch literal 1303 zcmW-h4@}f$7{?!k_$N2{lLmJ7sMrTrSA$xf|C#=BnhQkB_qj63X+nff)Xi4ijxwgBqKZfTxow8i%JMCBo|8C1qBYJ;8Jp_;2u!8%a!0tas_+H1DNPW z9PkeaI0QAs01Zl91qTL08`98HIyrre8jlo0=^)_`V^K*dq(ZK+3kn+Py-)v=G?YJgy}?T3T6ISzlk@($do1-R*X}M@L6J9?#6o%f<3hJk2&m~0^ZHbu~OS}FWFFpRoP0aiBb~v8&E&6qZVI=)Y#w74*4k}AT&BK zq50Q#^hmqa;yiqB`EF&wbZSJC$-K7b(u+ z>CukK_+3c=G6OFOWn2UyPmC_PMJxM zSnrOz*mBAdVO#2dVceK*_SLlOnL9tcdZl3^TwR!oaMgceY(`z_RZ!U z_tNtBJo#(=#l%M^r_1i1Z%rTEzFPgpa$Wht{11I$z1zpEX9oMXUawmg&R@1vPaJ8i fx|85twLZw`$PC{0@!2Z<50C8G1=i8bvZnt53iVx! literal 0 HcmV?d00001 diff --git a/data/skin.xml b/data/skin.xml index ca8632db..58523bae 100644 --- a/data/skin.xml +++ b/data/skin.xml @@ -9,6 +9,7 @@ + @@ -203,6 +204,10 @@ + + + + diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp index 48eb971d..8b7b25db 100644 --- a/lib/dvb/sec.cpp +++ b/lib/dvb/sec.cpp @@ -460,7 +460,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA RotorCmd=sw_param.m_rotorPosNum; else // we must calc gotoxx cmd { - eDebug("Entry for %d,%d° not in Rotor Table found... i try gotoXX°", sat.orbital_position / 10, sat.orbital_position % 10 ); + eDebug("Entry for %d,%d? not in Rotor Table found... i try gotoXX?", sat.orbital_position / 10, sat.orbital_position % 10 ); useGotoXX = true; int satDir = sat.orbital_position < 0 ? @@ -935,3 +935,8 @@ RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2) } return -1; } + +bool eDVBSatelliteEquipmentControl::isRotorMoving() +{ + return false; +} diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h index 7f8bbeee..93d9cf24 100644 --- a/lib/dvb/sec.h +++ b/lib/dvb/sec.h @@ -165,8 +165,8 @@ public: { __u8 m_lo_direction; // EAST, WEST __u8 m_la_direction; // NORT, SOUTH - double m_longitude; // longitude for gotoXX° function - double m_latitude; // latitude for gotoXX° function + double m_longitude; // longitude for gotoXX? function + double m_latitude; // latitude for gotoXX? function }; eDVBSatelliteRotorGotoxxParameters m_gotoxx_parameters; @@ -252,6 +252,8 @@ public: RESULT setRotorPosNum(int rotor_pos_num); /* Tuner Specific Parameters */ RESULT setTunerLinked(int from, int to); + + bool isRotorMoving(); }; #endif diff --git a/lib/python/Components/BlinkingPixmap.py b/lib/python/Components/BlinkingPixmap.py index 45b8a06b..b19bdc5d 100644 --- a/lib/python/Components/BlinkingPixmap.py +++ b/lib/python/Components/BlinkingPixmap.py @@ -8,7 +8,7 @@ class BlinkingPixmap(Pixmap): def __init__(self): Pixmap.__init__(self) - self.blinking = False + self.blinking = True self.setBlinkTime(500) diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index 3ddb1c3c..45a0538b 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -12,7 +12,7 @@ from Tools.Notifications import AddNotificationWithCallback from Screens.InfoBarGenerics import InfoBarVolumeControl, InfoBarShowHide, \ InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \ InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord, \ - InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications + InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish from Screens.HelpMenu import HelpableScreen, HelpMenu @@ -23,7 +23,7 @@ import time class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, - HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications): + HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish): def __init__(self, session): Screen.__init__(self, session) @@ -37,7 +37,7 @@ class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \ InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \ InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \ - InfoBarAdditionalInfo, InfoBarNotifications: + InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish: x.__init__(self) self.helpList.append((self["actions"], "InfobarActions", [("showMovies", "Watch a Movie...")])) diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index c1842796..ddfac4a0 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -17,6 +17,7 @@ from EpgSelection import EPGSelection from Screens.MessageBox import MessageBox from Screens.Volume import Volume from Screens.Mute import Mute +from Screens.Dish import Dish from Screens.Standby import Standby from Screens.EventView import EventView @@ -89,6 +90,11 @@ class InfoBarVolumeControl: else: self.muteDialog.instance.hide() +class InfoBarDish: + def __init__(self): + self.dishDialog = self.session.instantiateDialog(Dish) + self.onShown.append(self.dishDialog.instance.show) + class InfoBarShowHide: """ InfoBar show/hide control, accepts toggleShow and hide actions, might start fancy animations. """ diff --git a/lib/python/Screens/Makefile.am b/lib/python/Screens/Makefile.am index cb54ec5b..20e0961b 100644 --- a/lib/python/Screens/Makefile.am +++ b/lib/python/Screens/Makefile.am @@ -6,4 +6,5 @@ install_PYTHON = \ MovieSelection.py Setup.py About.py HarddiskSetup.py FixedMenu.py \ Satconfig.py ScanSetup.py NetworkSetup.py Ci.py TimerEntry.py Volume.py \ EpgSelection.py EventView.py Mute.py Standby.py ServiceInfo.py \ - AudioSelection.py InfoBarGenerics.py HelpMenu.py Wizard.py __init__.py + AudioSelection.py InfoBarGenerics.py HelpMenu.py Wizard.py __init__.py \ + Dish.py -- 2.30.2