Changed display of trick speed in displayReplay (closes Feature 1433)

21 files changed, 14 insertions, 26 deletions

diff --git a/HISTORY b/HISTORY
index dd0075c..497af48 100644
--- a/HISTORY
+++ b/HISTORY
@@ -243,3 +243,4 @@ Version 0.1.4
   information (closes Feature 1401)
 - Added channel number in display of reruns in detailed EPG view 
   (closes Feature 1402)
+- Changed display of trick speed in displayReplay (closes Feature 1433)
diff --git a/displayreplay.c b/displayreplay.c
index 166a04d..a855159 100644
--- a/displayreplay.c
+++ b/displayreplay.c
@@ -33,11 +33,9 @@ cNopacityDisplayReplay::~cNopacityDisplayReplay() {
     }
     osd->DestroyPixmap(pixmapControls);
     osd->DestroyPixmap(pixmapRew);
-    osd->DestroyPixmap(pixmapRewSpeed);
     osd->DestroyPixmap(pixmapPause);
     osd->DestroyPixmap(pixmapPlay);
     osd->DestroyPixmap(pixmapFwd);
-    osd->DestroyPixmap(pixmapFwdSpeed);
     delete fontReplayHeader;
     delete fontReplay;
     delete osd;
@@ -97,12 +95,10 @@ void cNopacityDisplayReplay::CreatePixmaps(void) {
         pixmapControls = osd->CreatePixmap(2, cRect( (width - (5 * backgroundWidth))/2, controlY - 10, 5 * backgroundWidth, controlsHeight + 20));
     }
     pixmapRew = osd->CreatePixmap(4, cRect((width - 4 * backgroundWidth)/2 + iconBorder, controlY + iconBorder, iconSize, iconSize));   
-    pixmapRewSpeed = osd->CreatePixmap(5, cRect((width - 4 * backgroundWidth)/2 + iconBorder, controlY + iconBorder, iconSize, iconSize));  
     pixmapPause = osd->CreatePixmap(4, cRect((width - 4 * backgroundWidth)/2 + (iconSize + 2*iconBorder) + iconBorder, controlY + iconBorder, iconSize, iconSize)); 
     pixmapPlay = osd->CreatePixmap(4, cRect((width - 4 * backgroundWidth)/2 + 2*(iconSize + 2*iconBorder) + iconBorder, controlY + iconBorder, iconSize, iconSize));    
     pixmapFwd = osd->CreatePixmap(4, cRect((width - 4 * backgroundWidth)/2 + 3*(iconSize + 2*iconBorder) + iconBorder, controlY + iconBorder, iconSize, iconSize)); 
-    pixmapFwdSpeed = osd->CreatePixmap(5, cRect((width - 4 * backgroundWidth)/2 + 3*(iconSize + 2*iconBorder) + iconBorder, controlY + iconBorder, iconSize, iconSize));    
-
+    
     if (config.replayFadeTime) {
         if (!modeOnly) {
             pixmapHeader->SetAlpha(0);
@@ -119,11 +115,9 @@ void cNopacityDisplayReplay::CreatePixmaps(void) {
         }
         pixmapControls->SetAlpha(0);
         pixmapRew->SetAlpha(0); 
-        pixmapRewSpeed->SetAlpha(0);    
         pixmapPause->SetAlpha(0);   
         pixmapPlay->SetAlpha(0);    
         pixmapFwd->SetAlpha(0);
-        pixmapFwdSpeed->SetAlpha(0);    
     }
 }
 
@@ -249,9 +243,6 @@ void cNopacityDisplayReplay::SetTitle(const char *Title) {
 
 void cNopacityDisplayReplay::SetMode(bool Play, bool Forward, int Speed) {
     LoadControlIcons();
-    pixmapRewSpeed->Fill(clrTransparent);
-    pixmapFwdSpeed->Fill(clrTransparent);
-
     cImageLoader imgLoader;
     if (Speed == -1) {
         if (Play) {
@@ -273,13 +264,13 @@ void cNopacityDisplayReplay::SetMode(bool Play, bool Forward, int Speed) {
             }
         }
         pixmapFwd->Fill(clrTransparent);
-        if (imgLoader.LoadIcon("skinIcons/fwd", iconSize)) {
-            pixmapFwd->DrawImage(cPoint(0,0), imgLoader.GetImage());
-        }
         if (Speed > 0) {
-            cString speed = cString::sprintf("x%d", Speed);
-            int sWidth = fontReplayHeader->Width(*speed);
-            pixmapFwdSpeed->DrawText(cPoint((iconSize - sWidth)/2, (iconSize - fontReplayHeader->Height())/2), *speed, Theme.Color(clrReplayHighlightIcon), clrTransparent, fontReplayHeader); 
+            cString trickIcon = cString::sprintf("skinIcons/fwdx%d", Speed);
+            if (imgLoader.LoadIcon(*trickIcon, iconSize)) {
+                pixmapFwd->DrawImage(cPoint(0,0), imgLoader.GetImage());
+            }
+        } else if (imgLoader.LoadIcon("skinIcons/fwd", iconSize)) {
+            pixmapFwd->DrawImage(cPoint(0,0), imgLoader.GetImage());
         }
     } else {
         if (!Play) {
@@ -289,13 +280,13 @@ void cNopacityDisplayReplay::SetMode(bool Play, bool Forward, int Speed) {
             }
         }
         pixmapRew->Fill(clrTransparent);
-        if (imgLoader.LoadIcon("skinIcons/rew", iconSize)) {
-            pixmapRew->DrawImage(cPoint(0,0), imgLoader.GetImage());
-        }
         if (Speed > 0) {
-            cString speed = cString::sprintf("x%d", Speed);
-            int sWidth = fontReplayHeader->Width(*speed);
-            pixmapRewSpeed->DrawText(cPoint((iconSize - sWidth)/2, (iconSize - fontReplayHeader->Height())/2), *speed, Theme.Color(clrReplayHighlightIcon), clrTransparent, fontReplayHeader); 
+            cString trickIcon = cString::sprintf("skinIcons/rewx%d", Speed);
+            if (imgLoader.LoadIcon(*trickIcon, iconSize)) {
+                pixmapRew->DrawImage(cPoint(0,0), imgLoader.GetImage());
+            }
+        } else if (imgLoader.LoadIcon("skinIcons/rew", iconSize)) {
+            pixmapRew->DrawImage(cPoint(0,0), imgLoader.GetImage());
         }
     }
 }
@@ -366,11 +357,9 @@ void cNopacityDisplayReplay::Action(void) {
         }
         pixmapControls->SetAlpha(Alpha);
         pixmapRew->SetAlpha(Alpha); 
-        pixmapRewSpeed->SetAlpha(Alpha);    
         pixmapPause->SetAlpha(Alpha);   
         pixmapPlay->SetAlpha(Alpha);    
         pixmapFwd->SetAlpha(Alpha);
-        pixmapFwdSpeed->SetAlpha(Alpha);
         cPixmap::Unlock();
         if (Running())
             osd->Flush();
diff --git a/displayreplay.h b/displayreplay.h
index ae7ee5f..2ed0a41 100644
--- a/displayreplay.h
+++ b/displayreplay.h
@@ -34,11 +34,9 @@ private:
     cPixmap *pixmapScreenResolution;
     cPixmap *pixmapControls;
     cPixmap *pixmapRew;
-    cPixmap *pixmapRewSpeed;
     cPixmap *pixmapPause;
     cPixmap *pixmapPlay;
     cPixmap *pixmapFwd;
-    cPixmap *pixmapFwdSpeed;
     cPixmap *pixmapJump;
     cPixmap *pixmapFooter;
     cFont *fontReplayHeader;
diff --git a/icons/darkred/skinIcons/fwdx1.png b/icons/darkred/skinIcons/fwdx1.png
new file mode 100644
index 0000000..b01657a
--- /dev/null
+++ b/icons/darkred/skinIcons/fwdx1.png
diff --git a/icons/darkred/skinIcons/fwdx2.png b/icons/darkred/skinIcons/fwdx2.png
new file mode 100644
index 0000000..8ea9774
--- /dev/null
+++ b/icons/darkred/skinIcons/fwdx2.png
diff --git a/icons/darkred/skinIcons/fwdx3.png b/icons/darkred/skinIcons/fwdx3.png
new file mode 100644
index 0000000..cab7859
--- /dev/null
+++ b/icons/darkred/skinIcons/fwdx3.png
diff --git a/icons/darkred/skinIcons/rewx1.png b/icons/darkred/skinIcons/rewx1.png
new file mode 100644
index 0000000..28263f0
--- /dev/null
+++ b/icons/darkred/skinIcons/rewx1.png
diff --git a/icons/darkred/skinIcons/rewx2.png b/icons/darkred/skinIcons/rewx2.png
new file mode 100644
index 0000000..5c26b44
--- /dev/null
+++ b/icons/darkred/skinIcons/rewx2.png
diff --git a/icons/darkred/skinIcons/rewx3.png b/icons/darkred/skinIcons/rewx3.png
new file mode 100644
index 0000000..60be17d
--- /dev/null
+++ b/icons/darkred/skinIcons/rewx3.png
diff --git a/icons/green/skinIcons/fwdx1.png b/icons/green/skinIcons/fwdx1.png
new file mode 100644
index 0000000..7cda81f
--- /dev/null
+++ b/icons/green/skinIcons/fwdx1.png
diff --git a/icons/green/skinIcons/fwdx2.png b/icons/green/skinIcons/fwdx2.png
new file mode 100644
index 0000000..b978ecb
--- /dev/null
+++ b/icons/green/skinIcons/fwdx2.png
diff --git a/icons/green/skinIcons/fwdx3.png b/icons/green/skinIcons/fwdx3.png
new file mode 100644
index 0000000..a2e9e58
--- /dev/null
+++ b/icons/green/skinIcons/fwdx3.png
diff --git a/icons/green/skinIcons/rewx1.png b/icons/green/skinIcons/rewx1.png
new file mode 100644
index 0000000..b43191f
--- /dev/null
+++ b/icons/green/skinIcons/rewx1.png
diff --git a/icons/green/skinIcons/rewx2.png b/icons/green/skinIcons/rewx2.png
new file mode 100644
index 0000000..c5d81fc
--- /dev/null
+++ b/icons/green/skinIcons/rewx2.png
diff --git a/icons/green/skinIcons/rewx3.png b/icons/green/skinIcons/rewx3.png
new file mode 100644
index 0000000..d2631d5
--- /dev/null
+++ b/icons/green/skinIcons/rewx3.png
diff --git a/icons/skinIcons/fwdx1.png b/icons/skinIcons/fwdx1.png
new file mode 100644
index 0000000..93caa61
--- /dev/null
+++ b/icons/skinIcons/fwdx1.png
diff --git a/icons/skinIcons/fwdx2.png b/icons/skinIcons/fwdx2.png
new file mode 100644
index 0000000..dc39d9f
--- /dev/null
+++ b/icons/skinIcons/fwdx2.png
diff --git a/icons/skinIcons/fwdx3.png b/icons/skinIcons/fwdx3.png
new file mode 100644
index 0000000..89ae796
--- /dev/null
+++ b/icons/skinIcons/fwdx3.png
diff --git a/icons/skinIcons/rewx1.png b/icons/skinIcons/rewx1.png
new file mode 100644
index 0000000..dde466f
--- /dev/null
+++ b/icons/skinIcons/rewx1.png
diff --git a/icons/skinIcons/rewx2.png b/icons/skinIcons/rewx2.png
new file mode 100644
index 0000000..fede1b5
--- /dev/null
+++ b/icons/skinIcons/rewx2.png
diff --git a/icons/skinIcons/rewx3.png b/icons/skinIcons/rewx3.png
new file mode 100644
index 0000000..db43c59
--- /dev/null
+++ b/icons/skinIcons/rewx3.png