theme color clrChannelEPGBorderFg and clrChannelEPGBorderBg for border color of epg image in chanel info + decor option ChannelEPGBorderType and ChannelEPGBorderSize for border of epg image in chanel info

27 files changed, 230 insertions, 133 deletions

diff --git a/HISTORY b/HISTORY
index 763a3c71..eaaf6b51 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8,7 +8,9 @@ VDR Plugin 'skinflatplus' Revision History
 - [update] tvsraper service api. ! Use only with new TVScraper Version 0.2.0 or greater !
 - [update] crypted.png
 - [update] use 10_rect_sml.decor as default
-- [add] theme colors clrMenuEventTitleLine and clrMenuRecTitleLine for the Line under Title in Event and Recording
+- [add] theme colors clrMenuEventTitleLine and clrMenuRecTitleLine for the line under title in event and recording
+- [add] theme color clrChannelEPGBorderFg and clrChannelEPGBorderBg for border color of epg image in chanel info
+- [add] decor option ChannelEPGBorderType and ChannelEPGBorderSize for border of epg image in chanel info
 
 2014-11-05: Version 0.3.0
 - [fix] use only current Event in extraevent display in displaychannel
diff --git a/config.c b/config.c
index 2c5fae94..0e581e2c 100644
--- a/config.c
+++ b/config.c
@@ -68,6 +68,10 @@ cFlatConfig::cFlatConfig(void) {
     decorBorderChannelTypeUser = 0;
     decorBorderChannelSizeUser = 0;
 
+    decorBorderChannelEPGByTheme = 1;
+    decorBorderChannelEPGTypeUser = 0;
+    decorBorderChannelEPGSizeUser = 0;
+
     decorBorderTopBarByTheme = 1;
     decorBorderTopBarTypeUser = 0;
     decorBorderTopBarSizeUser = 0;
@@ -134,6 +138,9 @@ bool cFlatConfig::SetupParse(const char *Name, const char *Value) {
     if      (strcmp(Name, "decorBorderChannelByTheme") == 0)            decorBorderChannelByTheme = atoi(Value);
     else if (strcmp(Name, "decorBorderChannelTypeUser") == 0)           decorBorderChannelTypeUser = atoi(Value);
     else if (strcmp(Name, "decorBorderChannelSizeUser") == 0)           decorBorderChannelSizeUser = atoi(Value);
+    else if (strcmp(Name, "decorBorderChannelEPGByTheme") == 0)         decorBorderChannelEPGByTheme = atoi(Value);
+    else if (strcmp(Name, "decorBorderChannelEPGTypeUser") == 0)        decorBorderChannelEPGTypeUser = atoi(Value);
+    else if (strcmp(Name, "decorBorderChannelEPGSizeUser") == 0)        decorBorderChannelEPGSizeUser = atoi(Value);
     else if (strcmp(Name, "decorBorderTopBarByTheme") == 0)             decorBorderTopBarByTheme = atoi(Value);
     else if (strcmp(Name, "decorBorderTopBarTypeUser") == 0)            decorBorderTopBarTypeUser = atoi(Value);
     else if (strcmp(Name, "decorBorderTopBarSizeUser") == 0)            decorBorderTopBarSizeUser = atoi(Value);
@@ -235,152 +242,163 @@ void cFlatConfig::DecorCheckAndInit(void) {
         DecorCurrent = DecorIndex;
         DecorLoadCurrent();
     }
-        if( decorBorderChannelByTheme ) {
-            decorBorderChannelType = decorBorderChannelTypeTheme;
-            decorBorderChannelSize = decorBorderChannelSizeTheme;
-        } else {
-            decorBorderChannelType = decorBorderChannelTypeUser;
-            decorBorderChannelSize = decorBorderChannelSizeUser;
-        }
+    if( decorBorderChannelByTheme ) {
+        decorBorderChannelType = decorBorderChannelTypeTheme;
+        decorBorderChannelSize = decorBorderChannelSizeTheme;
+    } else {
+        decorBorderChannelType = decorBorderChannelTypeUser;
+        decorBorderChannelSize = decorBorderChannelSizeUser;
+    }
 
-        if( decorBorderTopBarByTheme ) {
-            decorBorderTopBarType = decorBorderTopBarTypeTheme;
-            decorBorderTopBarSize = decorBorderTopBarSizeTheme;
-        } else {
-            decorBorderTopBarType = decorBorderTopBarTypeUser;
-            decorBorderTopBarSize = decorBorderTopBarSizeUser;
-        }
+    if( decorBorderChannelEPGByTheme ) {
+        decorBorderChannelEPGType = decorBorderChannelEPGTypeTheme;
+        decorBorderChannelEPGSize = decorBorderChannelEPGSizeTheme;
+    } else {
+        decorBorderChannelEPGType = decorBorderChannelEPGTypeUser;
+        decorBorderChannelEPGSize = decorBorderChannelEPGSizeUser;
+    }
 
-        if( decorBorderMessageByTheme ) {
-            decorBorderMessageType = decorBorderMessageTypeTheme;
-            decorBorderMessageSize = decorBorderMessageSizeTheme;
-        } else {
-            decorBorderMessageType = decorBorderMessageTypeUser;
-            decorBorderMessageSize = decorBorderMessageSizeUser;
-        }
+    if( decorBorderTopBarByTheme ) {
+        decorBorderTopBarType = decorBorderTopBarTypeTheme;
+        decorBorderTopBarSize = decorBorderTopBarSizeTheme;
+    } else {
+        decorBorderTopBarType = decorBorderTopBarTypeUser;
+        decorBorderTopBarSize = decorBorderTopBarSizeUser;
+    }
 
-        if( decorBorderVolumeByTheme ) {
-            decorBorderVolumeType = decorBorderVolumeTypeTheme;
-            decorBorderVolumeSize = decorBorderVolumeSizeTheme;
-        } else {
-            decorBorderVolumeType = decorBorderVolumeTypeUser;
-            decorBorderVolumeSize = decorBorderVolumeSizeUser;
-        }
+    if( decorBorderMessageByTheme ) {
+        decorBorderMessageType = decorBorderMessageTypeTheme;
+        decorBorderMessageSize = decorBorderMessageSizeTheme;
+    } else {
+        decorBorderMessageType = decorBorderMessageTypeUser;
+        decorBorderMessageSize = decorBorderMessageSizeUser;
+    }
 
-        if( decorBorderTrackByTheme ) {
-            decorBorderTrackType = decorBorderTrackTypeTheme;
-            decorBorderTrackSize = decorBorderTrackSizeTheme;
-        } else {
-            decorBorderTrackType = decorBorderTrackTypeUser;
-            decorBorderTrackSize = decorBorderTrackSizeUser;
-        }
+    if( decorBorderVolumeByTheme ) {
+        decorBorderVolumeType = decorBorderVolumeTypeTheme;
+        decorBorderVolumeSize = decorBorderVolumeSizeTheme;
+    } else {
+        decorBorderVolumeType = decorBorderVolumeTypeUser;
+        decorBorderVolumeSize = decorBorderVolumeSizeUser;
+    }
 
-        if( decorBorderReplayByTheme ) {
-            decorBorderReplayType = decorBorderReplayTypeTheme;
-            decorBorderReplaySize = decorBorderReplaySizeTheme;
-        } else {
-            decorBorderReplayType = decorBorderReplayTypeUser;
-            decorBorderReplaySize = decorBorderReplaySizeUser;
-        }
+    if( decorBorderTrackByTheme ) {
+        decorBorderTrackType = decorBorderTrackTypeTheme;
+        decorBorderTrackSize = decorBorderTrackSizeTheme;
+    } else {
+        decorBorderTrackType = decorBorderTrackTypeUser;
+        decorBorderTrackSize = decorBorderTrackSizeUser;
+    }
 
-        if( decorBorderMenuItemByTheme ) {
-            decorBorderMenuItemType = decorBorderMenuItemTypeTheme;
-            decorBorderMenuItemSize = decorBorderMenuItemSizeTheme;
-        } else {
-            decorBorderMenuItemType = decorBorderMenuItemTypeUser;
-            decorBorderMenuItemSize = decorBorderMenuItemSizeUser;
-        }
+    if( decorBorderReplayByTheme ) {
+        decorBorderReplayType = decorBorderReplayTypeTheme;
+        decorBorderReplaySize = decorBorderReplaySizeTheme;
+    } else {
+        decorBorderReplayType = decorBorderReplayTypeUser;
+        decorBorderReplaySize = decorBorderReplaySizeUser;
+    }
 
-        if( decorBorderMenuContentHeadByTheme ) {
-            decorBorderMenuContentHeadType = decorBorderMenuContentHeadTypeTheme;
-            decorBorderMenuContentHeadSize = decorBorderMenuContentHeadSizeTheme;
-        } else {
-            decorBorderMenuContentHeadType = decorBorderMenuContentHeadTypeUser;
-            decorBorderMenuContentHeadSize = decorBorderMenuContentHeadSizeUser;
-        }
+    if( decorBorderMenuItemByTheme ) {
+        decorBorderMenuItemType = decorBorderMenuItemTypeTheme;
+        decorBorderMenuItemSize = decorBorderMenuItemSizeTheme;
+    } else {
+        decorBorderMenuItemType = decorBorderMenuItemTypeUser;
+        decorBorderMenuItemSize = decorBorderMenuItemSizeUser;
+    }
 
-        if( decorBorderMenuContentByTheme ) {
-            decorBorderMenuContentType = decorBorderMenuContentTypeTheme;
-            decorBorderMenuContentSize = decorBorderMenuContentSizeTheme;
-        } else {
-            decorBorderMenuContentType = decorBorderMenuContentTypeUser;
-            decorBorderMenuContentSize = decorBorderMenuContentSizeUser;
-        }
+    if( decorBorderMenuContentHeadByTheme ) {
+        decorBorderMenuContentHeadType = decorBorderMenuContentHeadTypeTheme;
+        decorBorderMenuContentHeadSize = decorBorderMenuContentHeadSizeTheme;
+    } else {
+        decorBorderMenuContentHeadType = decorBorderMenuContentHeadTypeUser;
+        decorBorderMenuContentHeadSize = decorBorderMenuContentHeadSizeUser;
+    }
 
-        if( decorBorderButtonByTheme ) {
-            decorBorderButtonType = decorBorderButtonTypeTheme;
-            decorBorderButtonSize = decorBorderButtonSizeTheme;
-        } else {
-            decorBorderButtonType = decorBorderButtonTypeUser;
-            decorBorderButtonSize = decorBorderButtonSizeUser;
-        }
+    if( decorBorderMenuContentByTheme ) {
+        decorBorderMenuContentType = decorBorderMenuContentTypeTheme;
+        decorBorderMenuContentSize = decorBorderMenuContentSizeTheme;
+    } else {
+        decorBorderMenuContentType = decorBorderMenuContentTypeUser;
+        decorBorderMenuContentSize = decorBorderMenuContentSizeUser;
+    }
 
-        if( decorProgressChannelByTheme ) {
-            decorProgressChannelType = decorProgressChannelTypeTheme;
-            decorProgressChannelSize = decorProgressChannelSizeTheme;
-        } else {
-            decorProgressChannelType = decorProgressChannelTypeUser;
-            decorProgressChannelSize = decorProgressChannelSizeUser;
-        }
+    if( decorBorderButtonByTheme ) {
+        decorBorderButtonType = decorBorderButtonTypeTheme;
+        decorBorderButtonSize = decorBorderButtonSizeTheme;
+    } else {
+        decorBorderButtonType = decorBorderButtonTypeUser;
+        decorBorderButtonSize = decorBorderButtonSizeUser;
+    }
 
-        if( decorProgressVolumeByTheme ) {
-            decorProgressVolumeType = decorProgressVolumeTypeTheme;
-            decorProgressVolumeSize = decorProgressVolumeSizeTheme;
-        } else {
-            decorProgressVolumeType = decorProgressVolumeTypeUser;
-            decorProgressVolumeSize = decorProgressVolumeSizeUser;
-        }
+    if( decorProgressChannelByTheme ) {
+        decorProgressChannelType = decorProgressChannelTypeTheme;
+        decorProgressChannelSize = decorProgressChannelSizeTheme;
+    } else {
+        decorProgressChannelType = decorProgressChannelTypeUser;
+        decorProgressChannelSize = decorProgressChannelSizeUser;
+    }
 
-        if( decorProgressMenuItemByTheme ) {
-            decorProgressMenuItemType = decorProgressMenuItemTypeTheme;
-            decorProgressMenuItemSize = decorProgressMenuItemSizeTheme;
-        } else {
-            decorProgressMenuItemType = decorProgressMenuItemTypeUser;
-            decorProgressMenuItemSize = decorProgressMenuItemSizeUser;
-        }
+    if( decorProgressVolumeByTheme ) {
+        decorProgressVolumeType = decorProgressVolumeTypeTheme;
+        decorProgressVolumeSize = decorProgressVolumeSizeTheme;
+    } else {
+        decorProgressVolumeType = decorProgressVolumeTypeUser;
+        decorProgressVolumeSize = decorProgressVolumeSizeUser;
+    }
 
-        if( decorProgressReplayByTheme ) {
-            decorProgressReplayType = decorProgressReplayTypeTheme;
-            decorProgressReplaySize = decorProgressReplaySizeTheme;
-        } else {
-            decorProgressReplayType = decorProgressReplayTypeUser;
-            decorProgressReplaySize = decorProgressReplaySizeUser;
-        }
+    if( decorProgressMenuItemByTheme ) {
+        decorProgressMenuItemType = decorProgressMenuItemTypeTheme;
+        decorProgressMenuItemSize = decorProgressMenuItemSizeTheme;
+    } else {
+        decorProgressMenuItemType = decorProgressMenuItemTypeUser;
+        decorProgressMenuItemSize = decorProgressMenuItemSizeUser;
+    }
 
-        if( decorProgressSignalByTheme ) {
-            decorProgressSignalType = decorProgressSignalTypeTheme;
-            decorProgressSignalSize = decorProgressSignalSizeTheme;
-        } else {
-            decorProgressSignalType = decorProgressSignalTypeUser;
-            decorProgressSignalSize = decorProgressSignalSizeUser;
-        }
+    if( decorProgressReplayByTheme ) {
+        decorProgressReplayType = decorProgressReplayTypeTheme;
+        decorProgressReplaySize = decorProgressReplaySizeTheme;
+    } else {
+        decorProgressReplayType = decorProgressReplayTypeUser;
+        decorProgressReplaySize = decorProgressReplaySizeUser;
+    }
+
+    if( decorProgressSignalByTheme ) {
+        decorProgressSignalType = decorProgressSignalTypeTheme;
+        decorProgressSignalSize = decorProgressSignalSizeTheme;
+    } else {
+        decorProgressSignalType = decorProgressSignalTypeUser;
+        decorProgressSignalSize = decorProgressSignalSizeUser;
+    }
 
-        if( decorBorderChannelType == 0 )
-            decorBorderChannelSize = 0;
-        if( decorBorderTopBarType == 0 )
-            decorBorderTopBarSize = 0;
-        if( decorBorderMessageType == 0 )
-            decorBorderMessageSize = 0;
-        if( decorBorderVolumeType == 0 )
-            decorBorderVolumeSize = 0;
-        if( decorBorderTrackType == 0 )
-            decorBorderTrackSize = 0;
-        if( decorBorderReplayType == 0 )
-            decorBorderReplaySize = 0;
-        if( decorBorderMenuItemType == 0 )
-            decorBorderMenuItemSize = 0;
-        if( decorBorderMenuContentHeadType == 0 )
-            decorBorderMenuContentHeadSize = 0;
-        if( decorBorderMenuContentType == 0 )
-            decorBorderMenuContentSize = 0;
-        if( decorBorderButtonType == 0 )
-            decorBorderButtonSize = 0;
+    if( decorBorderChannelType == 0 )
+        decorBorderChannelSize = 0;
+    if( decorBorderTopBarType == 0 )
+        decorBorderTopBarSize = 0;
+    if( decorBorderMessageType == 0 )
+        decorBorderMessageSize = 0;
+    if( decorBorderVolumeType == 0 )
+        decorBorderVolumeSize = 0;
+    if( decorBorderTrackType == 0 )
+        decorBorderTrackSize = 0;
+    if( decorBorderReplayType == 0 )
+        decorBorderReplaySize = 0;
+    if( decorBorderMenuItemType == 0 )
+        decorBorderMenuItemSize = 0;
+    if( decorBorderMenuContentHeadType == 0 )
+        decorBorderMenuContentHeadSize = 0;
+    if( decorBorderMenuContentType == 0 )
+        decorBorderMenuContentSize = 0;
+    if( decorBorderButtonType == 0 )
+        decorBorderButtonSize = 0;
 }
 
 void cFlatConfig::ThemeInit(void) {
     decorBorderChannelFg = Theme.Color(clrChannelBorderFg);
     decorBorderChannelBg = Theme.Color(clrChannelBorderBg);
 
+    decorBorderChannelEPGFg = Theme.Color(clrChannelEPGBorderFg);
+    decorBorderChannelEPGBg = Theme.Color(clrChannelEPGBorderBg);
+
     decorBorderTopBarFg = Theme.Color(clrTopBarBorderFg);
     decorBorderTopBarBg = Theme.Color(clrTopBarBorderBg);
 
@@ -560,6 +578,10 @@ void cFlatConfig::DecorLoadFile(cString File) {
                         decorBorderChannelTypeTheme = value; continue; }
                     if( strstr(n, "ChannelBorderSize") == n ) {
                         decorBorderChannelSizeTheme = value; continue; }
+                    if( strstr(n, "ChannelEPGBorderType") == n ) {
+                        decorBorderChannelEPGTypeTheme = value; continue; }
+                    if( strstr(n, "ChannelEPGBorderSize") == n ) {
+                        decorBorderChannelEPGSizeTheme = value; continue; }
                     if( strstr(n, "TopBarBorderType") == n ) {
                         decorBorderTopBarTypeTheme = value; continue; }
                     if( strstr(n, "TopBarBorderSize") == n ) {
diff --git a/config.h b/config.h
index 1334c2b8..86fa6307 100644
--- a/config.h
+++ b/config.h
@@ -51,6 +51,12 @@ class cFlatConfig
         int decorBorderChannelType, decorBorderChannelSize;
         tColor decorBorderChannelFg, decorBorderChannelBg;
 
+        int decorBorderChannelEPGByTheme;
+        int decorBorderChannelEPGTypeTheme, decorBorderChannelEPGSizeTheme;
+        int decorBorderChannelEPGTypeUser, decorBorderChannelEPGSizeUser;
+        int decorBorderChannelEPGType, decorBorderChannelEPGSize;
+        tColor decorBorderChannelEPGFg, decorBorderChannelEPGBg;
+
         int decorBorderTopBarByTheme;
         int decorBorderTopBarTypeTheme, decorBorderTopBarSizeTheme;
         int decorBorderTopBarTypeUser, decorBorderTopBarSizeUser;
diff --git a/decors/10_rect_sml.decor b/decors/10_rect_sml.decor
index d2ac51b3..ca5d7351 100644
--- a/decors/10_rect_sml.decor
+++ b/decors/10_rect_sml.decor
@@ -35,6 +35,8 @@ MessageBorderSize = 5
 # Display Channel
 ChannelBorderType = 1
 ChannelBorderSize = 5
+ChannelEPGBorderType = 1
+ChannelEPGBorderSize = 5
 ChannelProgressType = 0
 ChannelProgressSize = 10
 ChannelSignalProgressType = 2
diff --git a/decors/11_rect_mid.decor b/decors/11_rect_mid.decor
index 18f934db..cd4523ad 100644
--- a/decors/11_rect_mid.decor
+++ b/decors/11_rect_mid.decor
@@ -35,6 +35,8 @@ MessageBorderSize = 10
 # Display Channel
 ChannelBorderType = 1
 ChannelBorderSize = 10
+ChannelEPGBorderType = 1
+ChannelEPGBorderSize = 10
 ChannelProgressType = 0
 ChannelProgressSize = 10
 ChannelSignalProgressType = 2
diff --git a/decors/12_rect_big.decor b/decors/12_rect_big.decor
index f25d2fe8..75bba8ca 100644
--- a/decors/12_rect_big.decor
+++ b/decors/12_rect_big.decor
@@ -35,6 +35,8 @@ MessageBorderSize = 20
 # Display Channel
 ChannelBorderType = 1
 ChannelBorderSize = 20
+ChannelEPGBorderType = 1
+ChannelEPGBorderSize = 20
 ChannelProgressType = 0
 ChannelProgressSize = 10
 ChannelSignalProgressType = 2
diff --git a/decors/20_round_sml.decor b/decors/20_round_sml.decor
index 88610fa2..34612afc 100644
--- a/decors/20_round_sml.decor
+++ b/decors/20_round_sml.decor
@@ -35,6 +35,8 @@ MessageBorderSize = 5
 # Display Channel
 ChannelBorderType = 2
 ChannelBorderSize = 5
+ChannelEPGBorderType = 2
+ChannelEPGBorderSize = 5
 ChannelProgressType = 0
 ChannelProgressSize = 10
 ChannelSignalProgressType = 2
diff --git a/decors/21_round_mid.decor b/decors/21_round_mid.decor
index 290f3152..6ee68415 100644
--- a/decors/21_round_mid.decor
+++ b/decors/21_round_mid.decor
@@ -35,6 +35,8 @@ MessageBorderSize = 10
 # Display Channel
 ChannelBorderType = 2
 ChannelBorderSize = 10
+ChannelEPGBorderType = 2
+ChannelEPGBorderSize = 10
 ChannelProgressType = 0
 ChannelProgressSize = 10
 ChannelSignalProgressType = 2
diff --git a/decors/22_round_big.decor b/decors/22_round_big.decor
index 23e24e61..f147c706 100644
--- a/decors/22_round_big.decor
+++ b/decors/22_round_big.decor
@@ -35,6 +35,8 @@ MessageBorderSize = 20
 # Display Channel
 ChannelBorderType = 2
 ChannelBorderSize = 20
+ChannelEPGBorderType = 2
+ChannelEPGBorderSize = 20
 ChannelProgressType = 0
 ChannelProgressSize = 10
 ChannelSignalProgressType = 2
diff --git a/decors/30_invert-round_sml.decor b/decors/30_invert-round_sml.decor
index d86124b4..5550d339 100644
--- a/decors/30_invert-round_sml.decor
+++ b/decors/30_invert-round_sml.decor
@@ -35,6 +35,8 @@ MessageBorderSize = 5
 # Display Channel
 ChannelBorderType = 3
 ChannelBorderSize = 5
+ChannelEPGBorderType = 3
+ChannelEPGBorderSize = 5
 ChannelProgressType = 0
 ChannelProgressSize = 10
 ChannelSignalProgressType = 2
diff --git a/decors/31_invert-round_mid.decor b/decors/31_invert-round_mid.decor
index dc1b586d..54b9d482 100644
--- a/decors/31_invert-round_mid.decor
+++ b/decors/31_invert-round_mid.decor
@@ -35,6 +35,8 @@ MessageBorderSize = 10
 # Display Channel
 ChannelBorderType = 3
 ChannelBorderSize = 10
+ChannelEPGBorderType = 3
+ChannelEPGBorderSize = 10
 ChannelProgressType = 0
 ChannelProgressSize = 10
 ChannelSignalProgressType = 2
diff --git a/decors/32_invert-round_big.decor b/decors/32_invert-round_big.decor
index b54b53df..03e7b218 100644
--- a/decors/32_invert-round_big.decor
+++ b/decors/32_invert-round_big.decor
@@ -35,6 +35,8 @@ MessageBorderSize = 20
 # Display Channel
 ChannelBorderType = 3
 ChannelBorderSize = 20
+ChannelEPGBorderType = 3
+ChannelEPGBorderSize = 20
 ChannelProgressType = 0
 ChannelProgressSize = 10
 ChannelSignalProgressType = 2
diff --git a/decors/40_rect-alpha_sml.decor b/decors/40_rect-alpha_sml.decor
index e2172e27..f673a04a 100644
--- a/decors/40_rect-alpha_sml.decor
+++ b/decors/40_rect-alpha_sml.decor
@@ -35,6 +35,8 @@ MessageBorderSize = 5
 # Display Channel
 ChannelBorderType = 4
 ChannelBorderSize = 5
+ChannelEPGBorderType = 4
+ChannelEPGBorderSize = 5
 ChannelProgressType = 0
 ChannelProgressSize = 10
 ChannelSignalProgressType = 2
diff --git a/decors/41_rect-alpha_mid.decor b/decors/41_rect-alpha_mid.decor
index dee9e046..0ebc356a 100644
--- a/decors/41_rect-alpha_mid.decor
+++ b/decors/41_rect-alpha_mid.decor
@@ -35,6 +35,8 @@ MessageBorderSize = 10
 # Display Channel
 ChannelBorderType = 4
 ChannelBorderSize = 10
+ChannelEPGBorderType = 4
+ChannelEPGBorderSize = 10
 ChannelProgressType = 0
 ChannelProgressSize = 10
 ChannelSignalProgressType = 2
diff --git a/decors/42_rect-alpha_big.decor b/decors/42_rect-alpha_big.decor
index 15d84fb3..62e81cae 100644
--- a/decors/42_rect-alpha_big.decor
+++ b/decors/42_rect-alpha_big.decor
@@ -35,6 +35,8 @@ MessageBorderSize = 20
 # Display Channel
 ChannelBorderType = 4
 ChannelBorderSize = 20
+ChannelEPGBorderType = 4
+ChannelEPGBorderSize = 20
 ChannelProgressType = 0
 ChannelProgressSize = 10
 ChannelSignalProgressType = 2
diff --git a/decors/50_round-alpha_sml.decor b/decors/50_round-alpha_sml.decor
index 653e1b3e..dee6083e 100644
--- a/decors/50_round-alpha_sml.decor
+++ b/decors/50_round-alpha_sml.decor
@@ -35,6 +35,8 @@ MessageBorderSize = 5
 # Display Channel
 ChannelBorderType = 5
 ChannelBorderSize = 5
+ChannelEPGBorderType = 5
+ChannelEPGBorderSize = 5
 ChannelProgressType = 0
 ChannelProgressSize = 10
 ChannelSignalProgressType = 2
diff --git a/decors/51_round-alpha_mid.decor0 b/decors/51_round-alpha_mid.decor
index b554a485..97c6ab82 100644
--- a/decors/51_round-alpha_mid.decor0
+++ b/decors/51_round-alpha_mid.decor
@@ -35,6 +35,8 @@ MessageBorderSize = 10
 # Display Channel
 ChannelBorderType = 5
 ChannelBorderSize = 10
+ChannelEPGBorderType = 5
+ChannelEPGBorderSize = 10
 ChannelProgressType = 0
 ChannelProgressSize = 10
 ChannelSignalProgressType = 2
diff --git a/decors/52_round-alpha_big.decor0 b/decors/52_round-alpha_big.decor
index 10c08493..8555ea85 100644
--- a/decors/52_round-alpha_big.decor0
+++ b/decors/52_round-alpha_big.decor
@@ -35,6 +35,8 @@ MessageBorderSize = 20
 # Display Channel
 ChannelBorderType = 5
 ChannelBorderSize = 20
+ChannelEPGBorderType = 5
+ChannelEPGBorderSize = 20
 ChannelProgressType = 0
 ChannelProgressSize = 10
 ChannelSignalProgressType = 2
diff --git a/decors/60_invert-round-alpha_sml.decor b/decors/60_invert-round-alpha_sml.decor
index 5a4e4dfe..bfb92b28 100644
--- a/decors/60_invert-round-alpha_sml.decor
+++ b/decors/60_invert-round-alpha_sml.decor
@@ -35,6 +35,8 @@ MessageBorderSize = 5
 # Display Channel
 ChannelBorderType = 6
 ChannelBorderSize = 5
+ChannelEPGBorderType = 6
+ChannelEPGBorderSize = 5
 ChannelProgressType = 0
 ChannelProgressSize = 10
 ChannelSignalProgressType = 2
diff --git a/decors/61_invert-round-alpha_mid.decor b/decors/61_invert-round-alpha_mid.decor
index cc52f553..367607dd 100644
--- a/decors/61_invert-round-alpha_mid.decor
+++ b/decors/61_invert-round-alpha_mid.decor
@@ -35,6 +35,8 @@ MessageBorderSize = 10
 # Display Channel
 ChannelBorderType = 6
 ChannelBorderSize = 10
+ChannelEPGBorderType = 6
+ChannelEPGBorderSize = 10
 ChannelProgressType = 0
 ChannelProgressSize = 10
 ChannelSignalProgressType = 2
diff --git a/decors/62_invert-round-alpha_big.decor b/decors/62_invert-round-alpha_big.decor
index e4d5d60c..a2195e54 100644
--- a/decors/62_invert-round-alpha_big.decor
+++ b/decors/62_invert-round-alpha_big.decor
@@ -35,6 +35,8 @@ MessageBorderSize = 20
 # Display Channel
 ChannelBorderType = 6
 ChannelBorderSize = 20
+ChannelEPGBorderType = 6
+ChannelEPGBorderSize = 20
 ChannelProgressType = 0
 ChannelProgressSize = 10
 ChannelSignalProgressType = 2
diff --git a/decors/70_MV_rect_sml.decor b/decors/70_MV_rect_sml.decor
index 942d0028..bb0bba5e 100644
--- a/decors/70_MV_rect_sml.decor
+++ b/decors/70_MV_rect_sml.decor
@@ -35,6 +35,8 @@ MessageBorderSize = 2
 # Display Channel
 ChannelBorderType = 1
 ChannelBorderSize = 5
+ChannelEPGBorderType = 1
+ChannelEPGBorderSize = 5
 ChannelProgressType = 0
 ChannelProgressSize = 10
 ChannelSignalProgressType = 2
diff --git a/decors/99_none.decor b/decors/99_none.decor
index e18fc4ca..4e1a6262 100644
--- a/decors/99_none.decor
+++ b/decors/99_none.decor
@@ -35,6 +35,8 @@ MessageBorderSize = 0
 # Display Channel
 ChannelBorderType = 0
 ChannelBorderSize = 0
+ChannelEPGBorderType = 0
+ChannelEPGBorderSize = 0
 ChannelProgressType = 0
 ChannelProgressSize = 10
 ChannelSignalProgressType = 2
diff --git a/displaychannel.c b/displaychannel.c
index b06ec3f7..c55077c2 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -54,10 +54,10 @@ cFlatDisplayChannel::cFlatDisplayChannel(bool WithInfo) {
         Config.decorBorderChannelSize+channelHeight - height, channelWidth, heightBottom));
     chanIconsPixmap->Fill( clrTransparent );
 
-    TVSLeft = 20 + Config.decorBorderChannelSize;
-    TVSTop = topBarHeight + Config.decorBorderTopBarSize*2 + 20 + Config.decorBorderChannelSize;
-    TVSWidth = osdWidth - 40 - Config.decorBorderChannelSize*2;
-    TVSHeight = osdHeight - topBarHeight - heightBottom - 40 - Config.decorBorderChannelSize*2;
+    TVSLeft = 20 + Config.decorBorderChannelEPGSize;
+    TVSTop = topBarHeight + Config.decorBorderTopBarSize*2 + 20 + Config.decorBorderChannelEPGSize;
+    TVSWidth = osdWidth - 40 - Config.decorBorderChannelEPGSize*2;
+    TVSHeight = osdHeight - topBarHeight - heightBottom - 40 - Config.decorBorderChannelEPGSize*2;
 
     chanEpgImagesPixmap = osd->CreatePixmap(2, cRect(TVSLeft, TVSTop, TVSWidth, TVSHeight));
     chanEpgImagesPixmap->Fill( clrTransparent );
@@ -466,8 +466,8 @@ void cFlatDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Followi
         if( img ) {
             chanEpgImagesPixmap->DrawImage(cPoint(0, 0), *img);
 
-            DecorBorderDraw(20 + Config.decorBorderChannelSize, topBarHeight + Config.decorBorderTopBarSize*2 + 20 + Config.decorBorderChannelSize, img->Width(), img->Height(),
-                Config.decorBorderChannelSize, Config.decorBorderChannelType, Config.decorBorderChannelFg, Config.decorBorderChannelBg, BorderTVSPoster);
+            DecorBorderDraw(20 + Config.decorBorderChannelEPGSize, topBarHeight + Config.decorBorderTopBarSize*2 + 20 + Config.decorBorderChannelEPGSize, img->Width(), img->Height(),
+                Config.decorBorderChannelEPGSize, Config.decorBorderChannelEPGType, Config.decorBorderChannelEPGFg, Config.decorBorderChannelEPGBg, BorderTVSPoster);
         }
     }
 }
diff --git a/flat.h b/flat.h
index 3d222dba..1b1e86c6 100644
--- a/flat.h
+++ b/flat.h
@@ -83,6 +83,9 @@ THEME_CLR(Theme, clrChannelProgressBg,      0xC0101010);
 THEME_CLR(Theme, clrChannelBorderFg,        0xC03090B0);
 THEME_CLR(Theme, clrChannelBorderBg,        0xC03090B0);
 
+THEME_CLR(Theme, clrChannelEPGBorderFg,        0xC03090B0);
+THEME_CLR(Theme, clrChannelEPGBorderBg,        0xC03090B0);
+
 THEME_CLR(Theme, clrChannelSignalFont,            0xFFA0A0A0);
 THEME_CLR(Theme, clrChannelSignalProgressFg,      0xFFA0A0A0);
 THEME_CLR(Theme, clrChannelSignalProgressBarFg,   0xFFA0A0A0);
diff --git a/po/de_DE.po b/po/de_DE.po
index fcff4790..6efb1c28 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skinflat 0.3.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-05-30 14:32+0200\n"
+"POT-Creation-Date: 2014-05-30 15:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -330,6 +330,15 @@ msgstr "Kanalinfo Rand Typ"
 msgid "Channelinfo border size"
 msgstr "Kanalinfo Rand Größe"
 
+msgid "Channelinfo EPG border by decor-file?"
+msgstr ""
+
+msgid "Channelinfo EPG border type"
+msgstr ""
+
+msgid "Channelinfo EPG border size"
+msgstr ""
+
 msgid "Channelinfo progress by decor-file?"
 msgstr "Kanalinfo Progress von Decordatei?"
 
diff --git a/setup.c b/setup.c
index bc1af413..7dd7721d 100644
--- a/setup.c
+++ b/setup.c
@@ -132,6 +132,9 @@ void cFlatSetup::Store(void) {
     SetupStore("decorBorderChannelByTheme", Config.decorBorderChannelByTheme);
     SetupStore("decorBorderChannelTypeUser", Config.decorBorderChannelTypeUser);
     SetupStore("decorBorderChannelSizeUser", Config.decorBorderChannelSizeUser);
+    SetupStore("decorBorderChannelEPGByTheme", Config.decorBorderChannelEPGByTheme);
+    SetupStore("decorBorderChannelEPGTypeUser", Config.decorBorderChannelEPGTypeUser);
+    SetupStore("decorBorderChannelEPGSizeUser", Config.decorBorderChannelEPGSizeUser);
     SetupStore("decorBorderTopBarByTheme", Config.decorBorderTopBarByTheme);
     SetupStore("decorBorderTopBarTypeUser", Config.decorBorderTopBarTypeUser);
     SetupStore("decorBorderTopBarSizeUser", Config.decorBorderTopBarSizeUser);
@@ -356,6 +359,17 @@ void cFlatSetupChannelInfo::Setup(void) {
         Add(new cMenuEditIntItem(tr("Channelinfo border size"), &SetupConfig->decorBorderChannelSizeUser));
     }
 
+    Add(new cMenuEditBoolItem(tr("Channelinfo EPG border by decor-file?"), &SetupConfig->decorBorderChannelEPGByTheme));
+    if( SetupConfig->decorBorderChannelEPGByTheme ) {
+        cString type = cString::sprintf("%s:\t%s", tr("Channelinfo EPG border type"), Bordertypes[SetupConfig->decorBorderChannelEPGTypeTheme]);
+        Add(new cOsdItem(type, osUnknown, false));
+        cString size = cString::sprintf("%s:\t%d", tr("Channelinfo EPG border size"), SetupConfig->decorBorderChannelEPGSizeTheme);
+        Add(new cOsdItem(size, osUnknown, false));
+    } else {
+        Add(new cMenuEditStraItem(tr("Channelinfo EPG border type"), &SetupConfig->decorBorderChannelEPGTypeUser, Bordertypes.Size(), &Bordertypes[0]));
+        Add(new cMenuEditIntItem(tr("Channelinfo EPG border size"), &SetupConfig->decorBorderChannelEPGSizeUser));
+    }
+
     Add(new cMenuEditBoolItem(tr("Channelinfo progress by decor-file?"), &SetupConfig->decorProgressChannelByTheme));
     if( SetupConfig->decorProgressChannelByTheme ) {
         cString type = cString::sprintf("%s:\t%s", tr("Channelinfo progress type"), Progresstypes[SetupConfig->decorProgressChannelTypeTheme]);
@@ -399,6 +413,7 @@ eOSState cFlatSetupChannelInfo::ProcessKey(eKeys Key) {
     if( Key == kLeft || Key == kRight ) {
         const char* ItemText = Get(Current())->Text();
         if( strstr(ItemText, tr("Channelinfo border by decor-file?")) != NULL ||
+            strstr(ItemText, tr("Channelinfo EPG border by decor-file?")) != NULL ||
             strstr(ItemText, tr("Channelinfo progress by decor-file?")) != NULL ||
             strstr(ItemText, tr("Signalquality progress by decor-file?")) != NULL
         ) {