add blinking dish-picture if positioner is moving (we need a function which returns true when the positioner is moving for it to

work)

8 files changed, 27 insertions, 8 deletions

diff --git a/data/dish.png b/data/dish.png
new file mode 100755
index 00000000..8253b8ac
--- /dev/null
+++ b/data/dish.png
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 @@
 			<color name="green" 	value="#00ff00" />
 			<color name="blue" 		value="#0000ff" />
 			<color name="yellow"	value="#c0c000" />
+			<color name="transparent" 	value="#ffffffff" />
 		</colors>
 		<windowstyle type="skinned">
 			<color name="Background" color="#33294a6b" />
@@ -203,6 +204,10 @@
 		<screen name="Mute" flags="wfNoBorder" position="100,100" size="59,80" title="Mute">
 			<ePixmap position="0,0" size="59,80" pixmap="/usr/share/enigma2/mute-fs8.png" />
 		</screen>
+		<screen name="Dish" flags="wfNoBorder" position="300,100" size="100,107" title="Dish">
+			<widget name="transparent" zPosition="-1" position="0,0" size="100,107" backgroundColor="transparent" />
+			<widget name="Dishpixmap" pixmap="/usr/share/enigma2/dish.png" position="0,0" size="100,107" />
+		</screen>
  		<screen name="ChannelSelection" position="90,98" size="560,417" title="Channel Selection">
 			<widget name="list" position="10,45" size="540,364" />
 			<widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Arial;21" />
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