diff --git a/HISTORY b/HISTORY index b077372..375e574 100644 --- a/HISTORY +++ b/HISTORY @@ -251,5 +251,5 @@ Version 0.3.3 - added viewelement in displaymenu to display the sort mode of the currently displayed menu. can be used in any list menu, implementation in displaymenu.xml is default - - +- use recording info for viewelement in main menu + if recording is replayed. New token {islivetv} indicates this. diff --git a/displaymenu.c b/displaymenu.c index c1c83d5..241503b 100644 --- a/displaymenu.c +++ b/displaymenu.c @@ -1,3 +1,4 @@ +#include #include "displaymenu.h" #include "libcore/helpers.h" @@ -19,6 +20,7 @@ cSDDisplayMenu::cSDDisplayMenu(cTemplate *menuTemplate) { doOutput = false; return; } + SetCurrentRecording(); } cSDDisplayMenu::~cSDDisplayMenu() { @@ -312,3 +314,19 @@ void cSDDisplayMenu::Flush(void) { } state = vsIdle; } + +void cSDDisplayMenu::SetCurrentRecording(void) { + cControl *control = cControl::Control(); + if (!control) { + return; + } + const cRecording *recording = control->GetRecording(); + if (!recording) { + return; + } + string recFileName = ""; + if (recording->FileName()) { + recFileName = recording->FileName(); + } + rootView->SetCurrentRecording(recFileName); +} diff --git a/displaymenu.h b/displaymenu.h index c30ce17..f1edbaa 100644 --- a/displaymenu.h +++ b/displaymenu.h @@ -21,6 +21,7 @@ private: int pluginMenu; ePluginMenuType pluginMenuType; mutable cFont *textAreaFont; + void SetCurrentRecording(void); protected: int Tab(int n); public: diff --git a/skins/blackhole/themes/default/icons/ico_sort_name.png b/skins/blackhole/themes/default/icons/ico_sort_name.png new file mode 100644 index 0000000..bef06d5 Binary files /dev/null and b/skins/blackhole/themes/default/icons/ico_sort_name.png differ diff --git a/skins/blackhole/themes/default/icons/ico_sort_number.png b/skins/blackhole/themes/default/icons/ico_sort_number.png new file mode 100644 index 0000000..4084ba5 Binary files /dev/null and b/skins/blackhole/themes/default/icons/ico_sort_number.png differ diff --git a/skins/blackhole/themes/default/icons/ico_sort_provider.png b/skins/blackhole/themes/default/icons/ico_sort_provider.png new file mode 100644 index 0000000..fe5cc64 Binary files /dev/null and b/skins/blackhole/themes/default/icons/ico_sort_provider.png differ diff --git a/skins/blackhole/themes/default/icons/ico_sort_time.png b/skins/blackhole/themes/default/icons/ico_sort_time.png new file mode 100644 index 0000000..a8f3515 Binary files /dev/null and b/skins/blackhole/themes/default/icons/ico_sort_time.png differ diff --git a/skins/metrixhd/themes/default/icons/ico_sort_name.png b/skins/metrixhd/themes/default/icons/ico_sort_name.png new file mode 100644 index 0000000..bef06d5 Binary files /dev/null and b/skins/metrixhd/themes/default/icons/ico_sort_name.png differ diff --git a/skins/metrixhd/themes/default/icons/ico_sort_number.png b/skins/metrixhd/themes/default/icons/ico_sort_number.png new file mode 100644 index 0000000..4084ba5 Binary files /dev/null and b/skins/metrixhd/themes/default/icons/ico_sort_number.png differ diff --git a/skins/metrixhd/themes/default/icons/ico_sort_provider.png b/skins/metrixhd/themes/default/icons/ico_sort_provider.png new file mode 100644 index 0000000..fe5cc64 Binary files /dev/null and b/skins/metrixhd/themes/default/icons/ico_sort_provider.png differ diff --git a/skins/metrixhd/themes/default/icons/ico_sort_time.png b/skins/metrixhd/themes/default/icons/ico_sort_time.png new file mode 100644 index 0000000..a8f3515 Binary files /dev/null and b/skins/metrixhd/themes/default/icons/ico_sort_time.png differ diff --git a/skinskeleton/xmlfiles/displaymenumain.xml b/skinskeleton/xmlfiles/displaymenumain.xml index 61816bb..13af71f 100644 --- a/skinskeleton/xmlfiles/displaymenumain.xml +++ b/skinskeleton/xmlfiles/displaymenumain.xml @@ -88,15 +88,17 @@