update SetItemRecording

7 files changed, 172 insertions, 18 deletions

diff --git a/displaymenu.c b/displaymenu.c
index 7b571ab1..c618975e 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -1373,11 +1373,32 @@ bool cFlatDisplayMenu::SetItemEvent(const cEvent *Event, int Index, bool Current
     return true;
 }
 
+const char * GetFolderName(const cRecording *Recording, int Level) {
+    std::string recNamePart;
+    std::string recName = Recording->Name();
+    try {
+        std::vector<std::string> tokens;
+        std::istringstream f(recName.c_str());
+        std::string s;
+        while (std::getline(f, s, FOLDERDELIMCHAR)) {
+            tokens.push_back(s);
+        }
+        recNamePart = tokens.at(Level);
+        if( Recording->IsEdited() ) {
+            recNamePart = recNamePart.substr(1);
+        }
+    } catch (...) {
+        recNamePart = recName.c_str();
+    }    
+    return recNamePart.c_str();
+}
+
 bool cFlatDisplayMenu::SetItemRecording(const cRecording *Recording, int Index, bool Current, bool Selectable, int Level, int Total, int New) {
     if( Config.MenuRecordingView == 0 )
         return false;
 
     cString buffer;
+    cString Folder = GetFolderName(Recording, Level);
     int y = Index * itemRecordingHeight;
 
     int Height = fontHeight;
@@ -1391,7 +1412,8 @@ bool cFlatDisplayMenu::SetItemRecording(const cRecording *Recording, int Index,
     if( isScrolling )
         menuItemWidth -= scrollBarWidth;
 
-    tColor ColorFg, ColorBg;
+    tColor ColorFg, ColorBg, ColorExtraTextFg;
+    ColorExtraTextFg = Theme.Color(clrMenuItemReplayExtraTextFont);
     if (Current) {
         ColorFg = Theme.Color(clrItemCurrentFont);
         ColorBg = Theme.Color(clrItemCurrentBg);
@@ -1454,13 +1476,27 @@ bool cFlatDisplayMenu::SetItemRecording(const cRecording *Recording, int Index,
                 menuIconsPixmap->DrawImage( cPoint(Left, Top), *img );
                 Left += img->Width() + marginItem;
             }
+
+            /*
             buffer = cString::sprintf("%s %d %s %d", tr("Recordings"), Total, tr("Unwatched"), New);
             if( Left + font->Width(*buffer) > LeftWidth )
                 buffer = cString::sprintf("%s %d %s %d", tr("Recs"), Total, tr("Unwatched"), New);
-                
+            */    
+            buffer = cString::sprintf("%d  ", Total);
+            menuPixmap->DrawText(cPoint(Left, Top), buffer, ColorFg, ColorBg, font, menuItemWidth - Left - marginItem);
+            Left += font->Width( buffer );
+
+            if( imgRecNew )
+                menuIconsPixmap->DrawImage( cPoint(Left, Top), *imgRecNew );
+            Left += imgRecNew->Width() + marginItem;
+            buffer = cString::sprintf("%d", New);
             menuPixmap->DrawText(cPoint(Left, Top), buffer, ColorFg, ColorBg, font, menuItemWidth - Left - marginItem);
             Left += font->Width( buffer );
-            menuPixmap->DrawText(cPoint(LeftWidth, Top), Recording->Name(), ColorFg, ColorBg, font, menuItemWidth - Left - marginItem);
+            
+            menuPixmap->DrawText(cPoint(LeftWidth, Top), Folder, ColorFg, ColorBg, font, menuItemWidth - LeftWidth - marginItem);
+            LeftWidth += font->Width(Folder) + marginItem*2;
+            buffer = cString::sprintf("(%s)", *ShortDateString(Recording->Start()));
+            menuPixmap->DrawText(cPoint(LeftWidth, Top), buffer, ColorExtraTextFg, ColorBg, font, menuItemWidth - LeftWidth - marginItem);
         }
     } else {
         if( Total == 0 ) {
@@ -1503,13 +1539,23 @@ bool cFlatDisplayMenu::SetItemRecording(const cRecording *Recording, int Index,
                 menuIconsPixmap->DrawImage( cPoint(Left, Top), *img );
                 Left += img->Width() + marginItem;
             }
-            menuPixmap->DrawText(cPoint(Left, Top), Recording->Name(), ColorFg, ColorBg, font, menuItemWidth - Left - marginItem);
+            menuPixmap->DrawText(cPoint(Left, Top), Folder, ColorFg, ColorBg, font, menuItemWidth - Left - marginItem);
+            Left += font->Width(Folder) + marginItem*2;
+            buffer = cString::sprintf("(%s)", *ShortDateString(Recording->Start()));
+            menuPixmap->DrawText(cPoint(Left, Top), buffer, ColorExtraTextFg, ColorBg, font, menuItemWidth - Left - marginItem);
+            Left -= font->Width(Folder) + marginItem*2;
 
-            buffer = cString::sprintf("%s %d %s %d", tr("Recordings"), Total, tr("Unwatched"), New);
-            if( Left + fontSml->Width(*buffer) > menuWidth )
-                buffer = cString::sprintf("%s %d %s %d", tr("Recs"), Total, tr("Unwatched"), New);
             Top += fontHeight;
-            menuPixmap->DrawText(cPoint(Left, Top), buffer, ColorFg, ColorBg, fontSml, menuItemWidth - Left - marginItem);
+            buffer = cString::sprintf("%d  ", Total);
+            menuPixmap->DrawText(cPoint(Left, Top), buffer, ColorFg, ColorBg, font, menuItemWidth - Left - marginItem);
+            Left += font->Width( buffer );
+
+            if( imgRecNew )
+                menuIconsPixmap->DrawImage( cPoint(Left, Top), *imgRecNew );
+            Left += imgRecNew->Width() + marginItem;
+            buffer = cString::sprintf("%d", New);
+            menuPixmap->DrawText(cPoint(Left, Top), buffer, ColorFg, ColorBg, font, menuItemWidth - Left - marginItem);
+            Left += font->Width( buffer );
         }
     }
 
diff --git a/displaymenu.h b/displaymenu.h
index 1c23f169..865816c1 100644
--- a/displaymenu.h
+++ b/displaymenu.h
@@ -9,6 +9,7 @@
 using namespace std;
 
 string xml_substring(string source, const char* str_start, const char* str_end);
+const char * GetFolderName(const cRecording *Recording, int Level);
 
 class cFlatDisplayMenu : public cFlatBaseRender,  public cSkinDisplayMenu {
     private:
diff --git a/flat.h b/flat.h
index a1bf2bb7..171f1235 100644
--- a/flat.h
+++ b/flat.h
@@ -132,6 +132,9 @@ THEME_CLR(Theme, clrMenuTimerItemRecordingFont,      0xFFEEEEEE);
 // Program Menu
 THEME_CLR(Theme, clrMenuItemProgramShortTextFont,    0xFFA0A0A0);
 
+// Replay Menu
+THEME_CLR(Theme, clrMenuItemReplayExtraTextFont,    0xFFA0A0A0);
+
 // Replay
 THEME_CLR(Theme, clrReplayBg,               0xC0101010);
 THEME_CLR(Theme, clrReplayFont,             0xFFEEEEEE);
diff --git a/icons/default/extraIcons/PlayInfo.png b/icons/default/extraIcons/PlayInfo.png
index 3349e140..2b8eb8dd 100644
--- a/icons/default/extraIcons/PlayInfo.png
+++ b/icons/default/extraIcons/PlayInfo.png
diff --git a/icons/default/recording_new.png b/icons/default/recording_new.png
index 452222db..8291f32f 100644
--- a/icons/default/recording_new.png
+++ b/icons/default/recording_new.png
diff --git a/po/de_DE.po b/po/de_DE.po
index b6d691f0..24c666a6 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skinflat 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-02-16 22:22+0100\n"
+"POT-Creation-Date: 2014-02-18 18:04+0100\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"
@@ -36,15 +36,6 @@ msgstr "Untertitel"
 msgid "timer not enabled"
 msgstr "Timer nicht aktiv"
 
-msgid "Recordings"
-msgstr "Aufnahmen"
-
-msgid "Unwatched"
-msgstr "Ungesehen"
-
-msgid "Recs"
-msgstr "Aufn."
-
 msgid "no recording info"
 msgstr "keine Aufnahme Informationen"
 
@@ -365,3 +356,12 @@ msgstr "Audiospur Rand Typ"
 
 msgid "Tracks border size"
 msgstr "Audiospur Rand Größe"
+
+#~ msgid "Recordings"
+#~ msgstr "Aufnahmen"
+
+#~ msgid "Unwatched"
+#~ msgstr "Ungesehen"
+
+#~ msgid "Recs"
+#~ msgstr "Aufn."
diff --git a/themes/flatPlus-MVDeepBlue.theme b/themes/flatPlus-MVDeepBlue.theme
new file mode 100755
index 00000000..6d5ab07b
--- /dev/null
+++ b/themes/flatPlus-MVDeepBlue.theme
@@ -0,0 +1,104 @@
+Description = MV DeepBlue
+clrTopBarBg = C5101030
+clrTopBarFont = FFDDDDEE
+clrTopBarTimeFont = FF0545DF
+clrTopBarDateFont = FFA0A0A0
+clrTopBarRecordingActiveFg = FFCC1111
+clrTopBarRecordingActiveBg = C5101030
+clrTopBarBorderFg = C5101030
+clrTopBarBorderBg = C5101030
+clrButtonBg = C5101030
+clrButtonFont = FFDDDDEE
+clrButtonRed = FFCC2222
+clrButtonGreen = FF40A040
+clrButtonYellow = FFCCBB22
+clrButtonBlue = FF0000CC
+clrButtonBorderFg = C5101030
+clrButtonBorderBg = C5101030
+clrMessageBg = C5101030
+clrMessageFont = FFDDDDEE
+clrMessageStatus = FF1311CC
+clrMessageInfo = FF337633
+clrMessageWarning = FFCCBB33
+clrMessageError = FFCC2222
+clrMessageBorderFg = C5101030
+clrMessageBorderBg = C5101030
+clrChannelBg = C5101030
+clrChannelFontTitle = FF0545DF
+clrChannelFontEpg = FFDDDDEE
+clrChannelFontEpgFollow = FFA0A0A0
+clrChannelProgressFg = FFA0A0A0
+clrChannelProgressBarFg = FF0545DF
+clrChannelProgressBg = C5101030
+clrChannelRecordingPresentFg = FFCC1111
+clrChannelRecordingPresentBg = C5101030
+clrChannelRecordingFollowFg = FFA0A0A0
+clrChannelRecordingFollowBg = C5101030
+clrChannelBorderFg = C5101030
+clrChannelBorderBg = C5101030
+clrChannelSignalFont = FFA0A0A0
+clrChannelSignalProgressFg = FFA0A0A0
+clrChannelSignalProgressBarFg = FFA0A0A0
+clrChannelSignalProgressBg = C5101030
+clrItemBg = C5101030
+clrItemFont = FF0545DF
+clrItemCurrentBg = E00545DF
+clrItemCurrentFont = FFDDDDEE
+clrItemSelableBg = C5101030
+clrItemSelableFont = FFDDDDEE
+clrScrollbarFg = C5A0A0A0
+clrScrollbarBarFg = FF0545DF
+clrScrollbarBg = C5101030
+clrMenuEventBg = C5101030
+clrMenuEventFontTitle = FF0545DF
+clrMenuEventFontInfo = FFD0D0D0
+clrMenuRecBg = C5101030
+clrMenuRecFontTitle = FF0545DF
+clrMenuRecFontInfo = FFD0D0D0
+clrMenuTextBg = C5101030
+clrMenuTextFont = FFDDDDEE
+clrMenuTextFixedFont = FFCCBB22
+clrMenuContentHeadBorderFg = C5101030
+clrMenuContentHeadBorderBg = C5101030
+clrMenuContentBorderFg = C5101030
+clrMenuContentBorderBg = C5101030
+clrMenuItemProgressFg = FFDDDDEE
+clrMenuItemProgressBarFg = FFDDDDEE
+clrMenuItemProgressBg = C5101030
+clrMenuItemCurProgressFg = FFDDDDEE
+clrMenuItemCurProgressBarFg = FFDDDDEE
+clrMenuItemCurProgressBg = C50545DF
+clrMenuItemBorderFg = C5101030
+clrMenuItemBorderBg = C5101030
+clrMenuItemSelableBorderFg = C5101030
+clrMenuItemSelableBorderBg = C5101030
+clrMenuItemCurrentBorderFg = C50545DF
+clrMenuItemCurrentBorderBg = C50545DF
+clrMenuTimerItemDisabledFont = FFA0A0A0
+clrMenuTimerItemRecordingFont = FFCC1111
+clrReplayBg = C5101030
+clrReplayFont = FFDDDDEE
+clrReplayFontSpeed = FF0545DF
+clrReplayProgressFg = FF555555
+clrReplayProgressBarFg = FF757575
+clrReplayProgressBarCurFg = FF0545DF
+clrReplayProgressBg = C5101030
+clrReplayMarkFg = FFDDDDEE
+clrReplayMarkCurrentFg = FF0545DF
+clrReplayBorderFg = C5101030
+clrReplayBorderBg = C5101030
+clrTrackItemBg = C5101030
+clrTrackItemFont = FFDDDDEE
+clrTrackItemCurrentBg = C50545DF
+clrTrackItemCurrentFont = FFDDDDEE
+clrTrackItemBorderFg = C5101030
+clrTrackItemBorderBg = C5101030
+clrTrackItemCurrentBorderFg = C50545DF
+clrTrackItemCurrentBorderBg = C50545DF
+clrVolumeBg = C5101030
+clrVolumeFont = FFDDDDEE
+clrVolumeProgressFg = FF555555
+clrVolumeProgressBarFg = FF0545DF
+clrVolumeProgressBg = C5101030
+clrVolumeBorderFg = C5101030
+clrVolumeBorderBg = C5101030