From df3e9f1854af5efe1b253dac54a73ff6043aa2c1 Mon Sep 17 00:00:00 2001 From: Martin Schirrmacher Date: Sun, 8 Feb 2015 14:23:20 +0100 Subject: [add] recording menu, progressbar icon to show how much seen from the recording --- HISTORY | 1 + displaymenu.c | 72 +++++++++++++++++++++++++++++++++++++ icons/default/SortDate.png | Bin 3095 -> 2949 bytes icons/default/recording_new2.png | Bin 0 -> 1430 bytes icons/default/recording_seen_0.png | Bin 0 -> 335 bytes icons/default/recording_seen_1.png | Bin 0 -> 334 bytes icons/default/recording_seen_2.png | Bin 0 -> 334 bytes icons/default/recording_seen_3.png | Bin 0 -> 336 bytes icons/default/recording_seen_4.png | Bin 0 -> 336 bytes icons/default/recording_seen_5.png | Bin 0 -> 327 bytes icons/default/recording_seen_6.png | Bin 0 -> 336 bytes icons/default/recording_seen_7.png | Bin 0 -> 337 bytes icons/default/recording_seen_8.png | Bin 0 -> 337 bytes icons/default/recording_seen_9.png | Bin 0 -> 337 bytes 14 files changed, 73 insertions(+) create mode 100644 icons/default/recording_new2.png create mode 100644 icons/default/recording_seen_0.png create mode 100644 icons/default/recording_seen_1.png create mode 100644 icons/default/recording_seen_2.png create mode 100644 icons/default/recording_seen_3.png create mode 100644 icons/default/recording_seen_4.png create mode 100644 icons/default/recording_seen_5.png create mode 100644 icons/default/recording_seen_6.png create mode 100644 icons/default/recording_seen_7.png create mode 100644 icons/default/recording_seen_8.png create mode 100644 icons/default/recording_seen_9.png diff --git a/HISTORY b/HISTORY index f5540771..005f51f7 100644 --- a/HISTORY +++ b/HISTORY @@ -17,6 +17,7 @@ VDR Plugin 'skinflatplus' Revision History - [update] widgets: weather text size of temperature in long view - [add] support for message text with parse tilde and extra text color - [add] provide support for new SetMenuSortMode function, to show sort in menus +- [add] recording menu, progressbar icon to show how much seen from the recording 2014-12-04: Version 0.5.0 - [fix] femon receiver - do not get data from previous channel diff --git a/displaymenu.c b/displaymenu.c index 957b0f1b..763806f4 100644 --- a/displaymenu.c +++ b/displaymenu.c @@ -1932,6 +1932,42 @@ bool cFlatDisplayMenu::SetItemRecording(const cRecording *Recording, int Index, menuIconsPixmap->DrawImage( cPoint(Left, Top), *imgRecNew ); } } + #if APIVERSNUM >= 20108 + else { + int FrameTotal = Recording->NumFrames(); + int FrameResume = Recording->GetResume(); + double FrameSeen = (double)FrameResume / (double)FrameTotal; + cString SeenIcon; + + if( FrameSeen < 0.1 ) + SeenIcon = "recording_seen_0"; + else if( FrameSeen < 0.2 ) + SeenIcon = "recording_seen_1"; + else if( FrameSeen < 0.3 ) + SeenIcon = "recording_seen_2"; + else if( FrameSeen < 0.4 ) + SeenIcon = "recording_seen_3"; + else if( FrameSeen < 0.5 ) + SeenIcon = "recording_seen_4"; + else if( FrameSeen < 0.6 ) + SeenIcon = "recording_seen_5"; + else if( FrameSeen < 0.7 ) + SeenIcon = "recording_seen_6"; + else if( FrameSeen < 0.8 ) + SeenIcon = "recording_seen_7"; + else if( FrameSeen < 0.9 ) + SeenIcon = "recording_seen_8"; + else if( FrameSeen < 0.98 ) + SeenIcon = "recording_seen_9"; + else + SeenIcon = ""; // Do not show seenicon if recording is full seen + + cImage *imgSeen = imgLoader.LoadIcon(SeenIcon, fontHeight, fontHeight); + if( imgSeen != NULL ) + menuIconsPixmap->DrawImage( cPoint(Left, Top), *imgSeen ); + } + #endif + Left += imgRecNew->Width() + marginItem; if (Recording->IsEdited()) { if( imgRecCut ) { @@ -2018,6 +2054,42 @@ bool cFlatDisplayMenu::SetItemRecording(const cRecording *Recording, int Index, menuIconsPixmap->DrawImage( cPoint(Left, Top), *imgRecNew ); } } + #if APIVERSNUM >= 20108 + else { + int FrameTotal = Recording->NumFrames(); + int FrameResume = Recording->GetResume(); + double FrameSeen = (double)FrameResume / (double)FrameTotal; + cString SeenIcon; + + if( FrameSeen < 0.1 ) + SeenIcon = "recording_seen_0"; + else if( FrameSeen < 0.2 ) + SeenIcon = "recording_seen_1"; + else if( FrameSeen < 0.3 ) + SeenIcon = "recording_seen_2"; + else if( FrameSeen < 0.4 ) + SeenIcon = "recording_seen_3"; + else if( FrameSeen < 0.5 ) + SeenIcon = "recording_seen_4"; + else if( FrameSeen < 0.6 ) + SeenIcon = "recording_seen_5"; + else if( FrameSeen < 0.7 ) + SeenIcon = "recording_seen_6"; + else if( FrameSeen < 0.8 ) + SeenIcon = "recording_seen_7"; + else if( FrameSeen < 0.9 ) + SeenIcon = "recording_seen_8"; + else if( FrameSeen < 0.98 ) + SeenIcon = "recording_seen_9"; + else + SeenIcon = ""; // Do not show seenicon if recording is full seen + + cImage *imgSeen = imgLoader.LoadIcon(SeenIcon, fontHeight, fontHeight); + if( imgSeen != NULL ) + menuIconsPixmap->DrawImage( cPoint(Left, Top), *imgSeen ); + } + #endif + Left += imgRecNew->Width() + marginItem; if (Recording->IsEdited()) { if( imgRecCut ) { diff --git a/icons/default/SortDate.png b/icons/default/SortDate.png index 1b1aeac6..a8f35158 100644 Binary files a/icons/default/SortDate.png and b/icons/default/SortDate.png differ diff --git a/icons/default/recording_new2.png b/icons/default/recording_new2.png new file mode 100644 index 00000000..c2781cf2 Binary files /dev/null and b/icons/default/recording_new2.png differ diff --git a/icons/default/recording_seen_0.png b/icons/default/recording_seen_0.png new file mode 100644 index 00000000..3d6f1a4a Binary files /dev/null and b/icons/default/recording_seen_0.png differ diff --git a/icons/default/recording_seen_1.png b/icons/default/recording_seen_1.png new file mode 100644 index 00000000..51c4aa41 Binary files /dev/null and b/icons/default/recording_seen_1.png differ diff --git a/icons/default/recording_seen_2.png b/icons/default/recording_seen_2.png new file mode 100644 index 00000000..d666cab5 Binary files /dev/null and b/icons/default/recording_seen_2.png differ diff --git a/icons/default/recording_seen_3.png b/icons/default/recording_seen_3.png new file mode 100644 index 00000000..c14a7e5a Binary files /dev/null and b/icons/default/recording_seen_3.png differ diff --git a/icons/default/recording_seen_4.png b/icons/default/recording_seen_4.png new file mode 100644 index 00000000..7e6f1027 Binary files /dev/null and b/icons/default/recording_seen_4.png differ diff --git a/icons/default/recording_seen_5.png b/icons/default/recording_seen_5.png new file mode 100644 index 00000000..aa24571d Binary files /dev/null and b/icons/default/recording_seen_5.png differ diff --git a/icons/default/recording_seen_6.png b/icons/default/recording_seen_6.png new file mode 100644 index 00000000..ed8a9291 Binary files /dev/null and b/icons/default/recording_seen_6.png differ diff --git a/icons/default/recording_seen_7.png b/icons/default/recording_seen_7.png new file mode 100644 index 00000000..396ce6fe Binary files /dev/null and b/icons/default/recording_seen_7.png differ diff --git a/icons/default/recording_seen_8.png b/icons/default/recording_seen_8.png new file mode 100644 index 00000000..8ae0f44d Binary files /dev/null and b/icons/default/recording_seen_8.png differ diff --git a/icons/default/recording_seen_9.png b/icons/default/recording_seen_9.png new file mode 100644 index 00000000..b2db8c0f Binary files /dev/null and b/icons/default/recording_seen_9.png differ -- cgit v1.2.3