From 2e241f83443a9bfdc6a3245b1a7c8e38675297ab Mon Sep 17 00:00:00 2001 From: Martin Schirrmacher Date: Fri, 24 Oct 2014 20:29:46 +0200 Subject: new genre icon handling --- displaymenu.c | 184 ++++++++++++++++++--- icons/default/EPGInfo/FSK/unknown.png | Bin 0 -> 8328 bytes icons/default/EPGInfo/FSK/unknown2.png | Bin 0 -> 7892 bytes icons/default/EPGInfo/Genre/Abenteuer.png | Bin 0 -> 3702 bytes icons/default/EPGInfo/Genre/Action.png | Bin 0 -> 3065 bytes icons/default/EPGInfo/Genre/Action2.png | Bin 0 -> 2609 bytes icons/default/EPGInfo/Genre/Adult Movie_Drama.png | Bin 0 -> 3485 bytes .../EPGInfo/Genre/Adventure_Western_War.png | Bin 0 -> 5343 bytes icons/default/EPGInfo/Genre/Athletics.png | Bin 0 -> 4158 bytes icons/default/EPGInfo/Genre/Ballet.png | Bin 0 -> 2014 bytes icons/default/EPGInfo/Genre/Comedy.png | Bin 0 -> 4083 bytes icons/default/EPGInfo/Genre/Detective_Thriller.png | Bin 0 -> 4839 bytes icons/default/EPGInfo/Genre/Documentary.png | Bin 0 -> 2881 bytes icons/default/EPGInfo/Genre/Dokumentation.png | Bin 0 -> 1996 bytes icons/default/EPGInfo/Genre/Equestrian.png | Bin 0 -> 4158 bytes icons/default/EPGInfo/Genre/Erotik.png | Bin 0 -> 2556 bytes icons/default/EPGInfo/Genre/Erotik2.png | Bin 0 -> 2542 bytes icons/default/EPGInfo/Genre/Fantasie.png | Bin 0 -> 2364 bytes .../default/EPGInfo/Genre/Folk_Tradional Music.png | Bin 0 -> 2014 bytes icons/default/EPGInfo/Genre/Football_Soccer.png | Bin 0 -> 4158 bytes .../EPGInfo/Genre/Game Show_Quiz_Contest.png | Bin 0 -> 3195 bytes icons/default/EPGInfo/Genre/Historisch.png | Bin 0 -> 2269 bytes icons/default/EPGInfo/Genre/Horror.png | Bin 0 -> 2226 bytes icons/default/EPGInfo/Genre/Jazz.png | Bin 0 -> 2014 bytes "icons/default/EPGInfo/Genre/Kom\303\266die.png" | Bin 0 -> 2415 bytes "icons/default/EPGInfo/Genre/Kom\303\266die2.png" | Bin 0 -> 2629 bytes icons/default/EPGInfo/Genre/Krimi.png | Bin 0 -> 1513 bytes icons/default/EPGInfo/Genre/Martial Sports.png | Bin 0 -> 4158 bytes icons/default/EPGInfo/Genre/Motor Sport.png | Bin 0 -> 4158 bytes icons/default/EPGInfo/Genre/Movie_Drama.png | Bin 0 -> 3575 bytes icons/default/EPGInfo/Genre/Music_Ballet_Dance.png | Bin 0 -> 2014 bytes icons/default/EPGInfo/Genre/Musical_Opera.png | Bin 0 -> 2014 bytes icons/default/EPGInfo/Genre/Musik.png | Bin 0 -> 1265 bytes "icons/default/EPGInfo/Genre/M\303\244rchen.png" | Bin 0 -> 1783 bytes icons/default/EPGInfo/Genre/Rock_Pop.png | Bin 0 -> 2014 bytes icons/default/EPGInfo/Genre/Roman.png | Bin 0 -> 2330 bytes icons/default/EPGInfo/Genre/Romance.png | Bin 0 -> 3252 bytes .../Genre/Science Fiction_Fantasy_Horror.png | Bin 0 -> 3784 bytes icons/default/EPGInfo/Genre/Science-Fiction.png | Bin 0 -> 2416 bytes .../EPGInfo/Genre/Serious_Classical Music.png | Bin 0 -> 2014 bytes ..._Classical_Religious_Historical Movie_Drama.png | Bin 0 -> 3740 bytes icons/default/EPGInfo/Genre/Show_Game Show.png | Bin 0 -> 3195 bytes .../EPGInfo/Genre/Soap_Melodrama_Folkloric.png | Bin 0 -> 3252 bytes icons/default/EPGInfo/Genre/Spiel.png | Bin 0 -> 2590 bytes icons/default/EPGInfo/Genre/Sport Magazine.png | Bin 0 -> 4158 bytes icons/default/EPGInfo/Genre/Sport.png | Bin 0 -> 3128 bytes icons/default/EPGInfo/Genre/Sports.png | Bin 0 -> 4158 bytes icons/default/EPGInfo/Genre/Team Sports.png | Bin 0 -> 4158 bytes icons/default/EPGInfo/Genre/Tennis_Squash.png | Bin 0 -> 4158 bytes icons/default/EPGInfo/Genre/Thriller.png | Bin 0 -> 3121 bytes icons/default/EPGInfo/Genre/Water Sport.png | Bin 0 -> 4158 bytes icons/default/EPGInfo/Genre/Western.png | Bin 0 -> 1618 bytes icons/default/EPGInfo/Genre/Winter Sports.png | Bin 0 -> 4158 bytes icons/default/EPGInfo/Genre/action.png | Bin 3065 -> 0 bytes icons/default/EPGInfo/Genre/actions2.png | Bin 2609 -> 0 bytes icons/default/EPGInfo/Genre/adventures.png | Bin 3702 -> 0 bytes icons/default/EPGInfo/Genre/comedy.png | Bin 2415 -> 0 bytes icons/default/EPGInfo/Genre/comedy2.png | Bin 2629 -> 0 bytes icons/default/EPGInfo/Genre/crime.png | Bin 1513 -> 0 bytes icons/default/EPGInfo/Genre/documentary.png | Bin 1996 -> 0 bytes icons/default/EPGInfo/Genre/g_Action.png | Bin 0 -> 4955 bytes icons/default/EPGInfo/Genre/g_Action2.png | Bin 0 -> 4184 bytes icons/default/EPGInfo/Genre/g_Erotik.png | Bin 0 -> 3460 bytes icons/default/EPGInfo/Genre/g_Fantasie.png | Bin 0 -> 3482 bytes icons/default/EPGInfo/Genre/g_Horror.png | Bin 0 -> 3119 bytes "icons/default/EPGInfo/Genre/g_Kom\303\266die.png" | Bin 0 -> 3335 bytes icons/default/EPGInfo/Genre/g_Krimi.png | Bin 0 -> 2254 bytes "icons/default/EPGInfo/Genre/g_M\303\244rchen.png" | Bin 0 -> 3150 bytes icons/default/EPGInfo/Genre/g_Thriller.png | Bin 0 -> 4766 bytes icons/default/EPGInfo/Genre/g_Western.png | Bin 0 -> 2434 bytes icons/default/EPGInfo/Genre/unknown.png | Bin 0 -> 2824 bytes 71 files changed, 157 insertions(+), 27 deletions(-) create mode 100644 icons/default/EPGInfo/FSK/unknown.png create mode 100644 icons/default/EPGInfo/FSK/unknown2.png create mode 100644 icons/default/EPGInfo/Genre/Abenteuer.png create mode 100644 icons/default/EPGInfo/Genre/Action.png create mode 100644 icons/default/EPGInfo/Genre/Action2.png create mode 100644 icons/default/EPGInfo/Genre/Adult Movie_Drama.png create mode 100644 icons/default/EPGInfo/Genre/Adventure_Western_War.png create mode 100644 icons/default/EPGInfo/Genre/Athletics.png create mode 100644 icons/default/EPGInfo/Genre/Ballet.png create mode 100644 icons/default/EPGInfo/Genre/Comedy.png create mode 100644 icons/default/EPGInfo/Genre/Detective_Thriller.png create mode 100644 icons/default/EPGInfo/Genre/Documentary.png create mode 100644 icons/default/EPGInfo/Genre/Dokumentation.png create mode 100644 icons/default/EPGInfo/Genre/Equestrian.png create mode 100644 icons/default/EPGInfo/Genre/Erotik.png create mode 100644 icons/default/EPGInfo/Genre/Erotik2.png create mode 100644 icons/default/EPGInfo/Genre/Fantasie.png create mode 100644 icons/default/EPGInfo/Genre/Folk_Tradional Music.png create mode 100644 icons/default/EPGInfo/Genre/Football_Soccer.png create mode 100644 icons/default/EPGInfo/Genre/Game Show_Quiz_Contest.png create mode 100644 icons/default/EPGInfo/Genre/Historisch.png create mode 100644 icons/default/EPGInfo/Genre/Horror.png create mode 100644 icons/default/EPGInfo/Genre/Jazz.png create mode 100644 "icons/default/EPGInfo/Genre/Kom\303\266die.png" create mode 100644 "icons/default/EPGInfo/Genre/Kom\303\266die2.png" create mode 100644 icons/default/EPGInfo/Genre/Krimi.png create mode 100644 icons/default/EPGInfo/Genre/Martial Sports.png create mode 100644 icons/default/EPGInfo/Genre/Motor Sport.png create mode 100644 icons/default/EPGInfo/Genre/Movie_Drama.png create mode 100644 icons/default/EPGInfo/Genre/Music_Ballet_Dance.png create mode 100644 icons/default/EPGInfo/Genre/Musical_Opera.png create mode 100644 icons/default/EPGInfo/Genre/Musik.png create mode 100644 "icons/default/EPGInfo/Genre/M\303\244rchen.png" create mode 100644 icons/default/EPGInfo/Genre/Rock_Pop.png create mode 100644 icons/default/EPGInfo/Genre/Roman.png create mode 100644 icons/default/EPGInfo/Genre/Romance.png create mode 100644 icons/default/EPGInfo/Genre/Science Fiction_Fantasy_Horror.png create mode 100644 icons/default/EPGInfo/Genre/Science-Fiction.png create mode 100644 icons/default/EPGInfo/Genre/Serious_Classical Music.png create mode 100644 icons/default/EPGInfo/Genre/Serious_Classical_Religious_Historical Movie_Drama.png create mode 100644 icons/default/EPGInfo/Genre/Show_Game Show.png create mode 100644 icons/default/EPGInfo/Genre/Soap_Melodrama_Folkloric.png create mode 100644 icons/default/EPGInfo/Genre/Spiel.png create mode 100644 icons/default/EPGInfo/Genre/Sport Magazine.png create mode 100644 icons/default/EPGInfo/Genre/Sport.png create mode 100644 icons/default/EPGInfo/Genre/Sports.png create mode 100644 icons/default/EPGInfo/Genre/Team Sports.png create mode 100644 icons/default/EPGInfo/Genre/Tennis_Squash.png create mode 100644 icons/default/EPGInfo/Genre/Thriller.png create mode 100644 icons/default/EPGInfo/Genre/Water Sport.png create mode 100644 icons/default/EPGInfo/Genre/Western.png create mode 100644 icons/default/EPGInfo/Genre/Winter Sports.png delete mode 100644 icons/default/EPGInfo/Genre/action.png delete mode 100644 icons/default/EPGInfo/Genre/actions2.png delete mode 100644 icons/default/EPGInfo/Genre/adventures.png delete mode 100644 icons/default/EPGInfo/Genre/comedy.png delete mode 100644 icons/default/EPGInfo/Genre/comedy2.png delete mode 100644 icons/default/EPGInfo/Genre/crime.png delete mode 100644 icons/default/EPGInfo/Genre/documentary.png create mode 100644 icons/default/EPGInfo/Genre/g_Action.png create mode 100644 icons/default/EPGInfo/Genre/g_Action2.png create mode 100644 icons/default/EPGInfo/Genre/g_Erotik.png create mode 100644 icons/default/EPGInfo/Genre/g_Fantasie.png create mode 100644 icons/default/EPGInfo/Genre/g_Horror.png create mode 100644 "icons/default/EPGInfo/Genre/g_Kom\303\266die.png" create mode 100644 icons/default/EPGInfo/Genre/g_Krimi.png create mode 100644 "icons/default/EPGInfo/Genre/g_M\303\244rchen.png" create mode 100644 icons/default/EPGInfo/Genre/g_Thriller.png create mode 100644 icons/default/EPGInfo/Genre/g_Western.png create mode 100644 icons/default/EPGInfo/Genre/unknown.png diff --git a/displaymenu.c b/displaymenu.c index 3fb2d6cc..187857ff 100644 --- a/displaymenu.c +++ b/displaymenu.c @@ -2137,8 +2137,9 @@ void cFlatDisplayMenu::SetEvent(const cEvent *Event) { Config.decorBorderMenuContentHeadFg, Config.decorBorderMenuContentHeadBg); // Description - ostringstream text, textAdditional, ossGenres; - std::string Genres, Fsk; + ostringstream text, textAdditional; + std::string Fsk; + std::list GenreIcons; if( !isempty(Event->Description()) ) { text << Event->Description(); @@ -2152,16 +2153,150 @@ void cFlatDisplayMenu::SetEvent(const cEvent *Event) { if (!isempty(Event->ContentToString(Event->Contents(i)))) { // skip empty (user defined) content if (!firstContent) { text << ", "; - ossGenres << ","; } else { text << endl << tr("Genre") << ": "; } text << Event->ContentToString(Event->Contents(i)); - ossGenres << Event->ContentToString(Event->Contents(i)) << ","; firstContent = false; + switch (Event->Contents(i) & 0xF0) { + case ecgMovieDrama: + switch (Event->Contents(i) & 0x0F) { + default: isyslog("skinflatplus: Genre not found: %x", Event->Contents(i)); + case 0x00: GenreIcons.push_back("Movie_Drama"); break; + case 0x01: GenreIcons.push_back("Detective_Thriller"); break; + case 0x02: GenreIcons.push_back("Adventure_Western_War"); break; + case 0x03: GenreIcons.push_back("Science Fiction_Fantasy_Horror"); break; + case 0x04: GenreIcons.push_back("Comedy"); break; + case 0x05: GenreIcons.push_back("Soap_Melodrama_Folkloric"); break; + case 0x06: GenreIcons.push_back("Romance"); break; + case 0x07: GenreIcons.push_back("Serious_Classical_Religious_Historical Movie_Drama"); break; + case 0x08: GenreIcons.push_back("Adult Movie_Drama"); break; + } + break; + case ecgNewsCurrentAffairs: + switch (Event->Contents(i) & 0x0F) { + default: isyslog("skinflatplus: Genre not found: %x", Event->Contents(i)); + case 0x00: GenreIcons.push_back("News_Current Affairs"); break; + case 0x01: GenreIcons.push_back("News_Weather Report"); break; + case 0x02: GenreIcons.push_back("News Magazine"); break; + case 0x03: GenreIcons.push_back("Documentary"); break; + case 0x04: GenreIcons.push_back("Discussion_Inverview_Debate"); break; + } + break; + case ecgShow: + switch (Event->Contents(i) & 0x0F) { + default: isyslog("skinflatplus: Genre not found: %x", Event->Contents(i)); + case 0x00: GenreIcons.push_back("Show_Game Show"); break; + case 0x01: GenreIcons.push_back("Game Show_Quiz_Contest"); break; + case 0x02: GenreIcons.push_back("Variety Show"); break; + case 0x03: GenreIcons.push_back("Talk Show"); break; + } + break; + case ecgSports: + switch (Event->Contents(i) & 0x0F) { + default: isyslog("skinflatplus: Genre not found: %x", Event->Contents(i)); + case 0x00: GenreIcons.push_back("Sports"); break; + case 0x01: GenreIcons.push_back("Special Event"); break; + case 0x02: GenreIcons.push_back("Sport Magazine"); break; + case 0x03: GenreIcons.push_back("Football_Soccer"); break; + case 0x04: GenreIcons.push_back("Tennis_Squash"); break; + case 0x05: GenreIcons.push_back("Team Sports"); break; + case 0x06: GenreIcons.push_back("Athletics"); break; + case 0x07: GenreIcons.push_back("Motor Sport"); break; + case 0x08: GenreIcons.push_back("Water Sport"); break; + case 0x09: GenreIcons.push_back("Winter Sports"); break; + case 0x0A: GenreIcons.push_back("Equestrian"); break; + case 0x0B: GenreIcons.push_back("Martial Sports"); break; + } + break; + case ecgChildrenYouth: + switch (Event->Contents(i) & 0x0F) { + default: isyslog("skinflatplus: Genre not found: %x", Event->Contents(i)); + case 0x00: GenreIcons.push_back("Childrens_Youth Programme"); break; + case 0x01: GenreIcons.push_back("Pre-school Childrens Programme"); break; + case 0x02: GenreIcons.push_back("Entertainment Programme for 6 to 14"); break; + case 0x03: GenreIcons.push_back("Entertainment Programme for 10 to 16"); break; + case 0x04: GenreIcons.push_back("Informational_Educational_School Programme"); break; + case 0x05: GenreIcons.push_back("Cartoons_Puppets"); break; + } + break; + case ecgMusicBalletDance: + switch (Event->Contents(i) & 0x0F) { + default: isyslog("skinflatplus: Genre not found: %x", Event->Contents(i)); + case 0x00: GenreIcons.push_back("Music_Ballet_Dance"); break; + case 0x01: GenreIcons.push_back("Rock_Pop"); break; + case 0x02: GenreIcons.push_back("Serious_Classical Music"); break; + case 0x03: GenreIcons.push_back("Folk_Tradional Music"); break; + case 0x04: GenreIcons.push_back("Jazz"); break; + case 0x05: GenreIcons.push_back("Musical_Opera"); break; + case 0x06: GenreIcons.push_back("Ballet"); break; + } + break; + case ecgArtsCulture: + switch (Event->Contents(i) & 0x0F) { + default: isyslog("skinflatplus: Genre not found: %x", Event->Contents(i)); + case 0x00: GenreIcons.push_back("Arts_Culture"); break; + case 0x01: GenreIcons.push_back("Performing Arts"); break; + case 0x02: GenreIcons.push_back("Fine Arts"); break; + case 0x03: GenreIcons.push_back("Religion"); break; + case 0x04: GenreIcons.push_back("Popular Culture_Traditional Arts"); break; + case 0x05: GenreIcons.push_back("Literature"); break; + case 0x06: GenreIcons.push_back("Film_Cinema"); break; + case 0x07: GenreIcons.push_back("Experimental Film_Video"); break; + case 0x08: GenreIcons.push_back("Broadcasting_Press"); break; + case 0x09: GenreIcons.push_back("New Media"); break; + case 0x0A: GenreIcons.push_back("Arts_Culture Magazine"); break; + case 0x0B: GenreIcons.push_back("Fashion"); break; + } + break; + case ecgSocialPoliticalEconomics: + switch (Event->Contents(i) & 0x0F) { + default: isyslog("skinflatplus: Genre not found: %x", Event->Contents(i)); + case 0x00: GenreIcons.push_back("Social_Political_Economics"); break; + case 0x01: GenreIcons.push_back("Magazine_Report_Documentary"); break; + case 0x02: GenreIcons.push_back("Economics_Social Advisory"); break; + case 0x03: GenreIcons.push_back("Remarkable People"); break; + } + break; + case ecgEducationalScience: + switch (Event->Contents(i) & 0x0F) { + default: isyslog("skinflatplus: Genre not found: %x", Event->Contents(i)); + case 0x00: GenreIcons.push_back("Education_Science_Factual"); break; + case 0x01: GenreIcons.push_back("Nature_Animals_Environment"); break; + case 0x02: GenreIcons.push_back("Technology_Natural Sciences"); break; + case 0x03: GenreIcons.push_back("Medicine_Physiology_Psychology"); break; + case 0x04: GenreIcons.push_back("Foreign Countries_Expeditions"); break; + case 0x05: GenreIcons.push_back("Social_Spiritual Sciences"); break; + case 0x06: GenreIcons.push_back("Further Education"); break; + case 0x07: GenreIcons.push_back("Languages"); break; + } + break; + case ecgLeisureHobbies: + switch (Event->Contents(i) & 0x0F) { + default: isyslog("skinflatplus: Genre not found: %x", Event->Contents(i)); + case 0x00: GenreIcons.push_back("Leisure/Hobbies"); break; + case 0x01: GenreIcons.push_back("Tourism/Travel"); break; + case 0x02: GenreIcons.push_back("Handicraft"); break; + case 0x03: GenreIcons.push_back("Motoring"); break; + case 0x04: GenreIcons.push_back("Fitness & Health"); break; + case 0x05: GenreIcons.push_back("Cooking"); break; + case 0x06: GenreIcons.push_back("Advertisement/Shopping"); break; + case 0x07: GenreIcons.push_back("Gardening"); break; + } + break; + case ecgSpecial: + switch (Event->Contents(i) & 0x0F) { + case 0x00: GenreIcons.push_back("Original Language"); break; + case 0x01: GenreIcons.push_back("Black & White"); break; + case 0x02: GenreIcons.push_back("Unpublished"); break; + case 0x03: GenreIcons.push_back("Live Broadcast"); break; + default: isyslog("skinflatplus: Genre not found: %x", Event->Contents(i)); + } + break; + default: isyslog("skinflatplus: Genre not found: %x", Event->Contents(i)); + } } } - Genres = ossGenres.str(); // FSK if( Event->ParentalRating() ) { text << endl << tr("FSK") << ": "; @@ -2249,35 +2384,30 @@ void cFlatDisplayMenu::SetEvent(const cEvent *Event) { if( img ) { contentHeadIconsPixmap->DrawImage(cPoint(headIconLeft, headIconTop), *img); headIconLeft -= fontHeight + marginItem; + } else { + isyslog("skinflatplus: FSK icon not found: %s", *iconName); + img = imgLoader.LoadIcon("EPGInfo/FSK/unknown", fontHeight, fontHeight); + if( img ) { + contentHeadIconsPixmap->DrawImage(cPoint(headIconLeft, headIconTop), *img); + headIconLeft -= fontHeight + marginItem; + } } } - if( Genres.length() > 0 ) { - dsyslog("Genre: %s", Genres.c_str()); - std::replace(Genres.begin(), Genres.end(), '/', ','); - dsyslog("Genre: %s", Genres.c_str()); - size_t pos = 0; - std::string token; - std::string delimiter = ","; - std::list listGenre; - while( (pos = Genres.find(delimiter)) != std::string::npos) { - token = Genres.substr(0, pos); - Genres.erase(0, pos + delimiter.length()); - dsyslog("token: %s Genre: %s", token.c_str(), Genres.c_str()); - if( token.length() == 0 ) - continue; - listGenre.push_back(token); - } - listGenre.sort(); - listGenre.unique(); - while( !listGenre.empty() ) { - cString iconName = cString::sprintf("EPGInfo/Genre/%s", listGenre.back().c_str()); - cImage *img = imgLoader.LoadIcon(*iconName, fontHeight, fontHeight); + while( !GenreIcons.empty() ) { + cString iconName = cString::sprintf("EPGInfo/Genre/%s", GenreIcons.back().c_str()); + cImage *img = imgLoader.LoadIcon(*iconName, fontHeight, fontHeight); + if( img ) { + contentHeadIconsPixmap->DrawImage(cPoint(headIconLeft, headIconTop), *img); + headIconLeft -= fontHeight + marginItem; + } else { + isyslog("skinflatplus: Genre icon not found: %s", *iconName); + img = imgLoader.LoadIcon("EPGInfo/Genre/unknown", fontHeight, fontHeight); if( img ) { contentHeadIconsPixmap->DrawImage(cPoint(headIconLeft, headIconTop), *img); headIconLeft -= fontHeight + marginItem; } - listGenre.pop_back(); } + GenreIcons.pop_back(); } #ifdef DEBUGEPGTIME diff --git a/icons/default/EPGInfo/FSK/unknown.png b/icons/default/EPGInfo/FSK/unknown.png new file mode 100644 index 00000000..645b77cc Binary files /dev/null and b/icons/default/EPGInfo/FSK/unknown.png differ diff --git a/icons/default/EPGInfo/FSK/unknown2.png b/icons/default/EPGInfo/FSK/unknown2.png new file mode 100644 index 00000000..5a0706e7 Binary files /dev/null and b/icons/default/EPGInfo/FSK/unknown2.png differ diff --git a/icons/default/EPGInfo/Genre/Abenteuer.png b/icons/default/EPGInfo/Genre/Abenteuer.png new file mode 100644 index 00000000..005ff7de Binary files /dev/null and b/icons/default/EPGInfo/Genre/Abenteuer.png differ diff --git a/icons/default/EPGInfo/Genre/Action.png b/icons/default/EPGInfo/Genre/Action.png new file mode 100644 index 00000000..ebd8a3ea Binary files /dev/null and b/icons/default/EPGInfo/Genre/Action.png differ diff --git a/icons/default/EPGInfo/Genre/Action2.png b/icons/default/EPGInfo/Genre/Action2.png new file mode 100644 index 00000000..0f8cd3df Binary files /dev/null and b/icons/default/EPGInfo/Genre/Action2.png differ diff --git a/icons/default/EPGInfo/Genre/Adult Movie_Drama.png b/icons/default/EPGInfo/Genre/Adult Movie_Drama.png new file mode 100644 index 00000000..d71b1a9e Binary files /dev/null and b/icons/default/EPGInfo/Genre/Adult Movie_Drama.png differ diff --git a/icons/default/EPGInfo/Genre/Adventure_Western_War.png b/icons/default/EPGInfo/Genre/Adventure_Western_War.png new file mode 100644 index 00000000..c348372c Binary files /dev/null and b/icons/default/EPGInfo/Genre/Adventure_Western_War.png differ diff --git a/icons/default/EPGInfo/Genre/Athletics.png b/icons/default/EPGInfo/Genre/Athletics.png new file mode 100644 index 00000000..7ea16e45 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Athletics.png differ diff --git a/icons/default/EPGInfo/Genre/Ballet.png b/icons/default/EPGInfo/Genre/Ballet.png new file mode 100644 index 00000000..c421d37c Binary files /dev/null and b/icons/default/EPGInfo/Genre/Ballet.png differ diff --git a/icons/default/EPGInfo/Genre/Comedy.png b/icons/default/EPGInfo/Genre/Comedy.png new file mode 100644 index 00000000..ba51a814 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Comedy.png differ diff --git a/icons/default/EPGInfo/Genre/Detective_Thriller.png b/icons/default/EPGInfo/Genre/Detective_Thriller.png new file mode 100644 index 00000000..1047aae2 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Detective_Thriller.png differ diff --git a/icons/default/EPGInfo/Genre/Documentary.png b/icons/default/EPGInfo/Genre/Documentary.png new file mode 100644 index 00000000..aa879fad Binary files /dev/null and b/icons/default/EPGInfo/Genre/Documentary.png differ diff --git a/icons/default/EPGInfo/Genre/Dokumentation.png b/icons/default/EPGInfo/Genre/Dokumentation.png new file mode 100644 index 00000000..f08ea46f Binary files /dev/null and b/icons/default/EPGInfo/Genre/Dokumentation.png differ diff --git a/icons/default/EPGInfo/Genre/Equestrian.png b/icons/default/EPGInfo/Genre/Equestrian.png new file mode 100644 index 00000000..7ea16e45 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Equestrian.png differ diff --git a/icons/default/EPGInfo/Genre/Erotik.png b/icons/default/EPGInfo/Genre/Erotik.png new file mode 100644 index 00000000..a0cba9cd Binary files /dev/null and b/icons/default/EPGInfo/Genre/Erotik.png differ diff --git a/icons/default/EPGInfo/Genre/Erotik2.png b/icons/default/EPGInfo/Genre/Erotik2.png new file mode 100644 index 00000000..5bf69502 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Erotik2.png differ diff --git a/icons/default/EPGInfo/Genre/Fantasie.png b/icons/default/EPGInfo/Genre/Fantasie.png new file mode 100644 index 00000000..b00225ac Binary files /dev/null and b/icons/default/EPGInfo/Genre/Fantasie.png differ diff --git a/icons/default/EPGInfo/Genre/Folk_Tradional Music.png b/icons/default/EPGInfo/Genre/Folk_Tradional Music.png new file mode 100644 index 00000000..c421d37c Binary files /dev/null and b/icons/default/EPGInfo/Genre/Folk_Tradional Music.png differ diff --git a/icons/default/EPGInfo/Genre/Football_Soccer.png b/icons/default/EPGInfo/Genre/Football_Soccer.png new file mode 100644 index 00000000..7ea16e45 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Football_Soccer.png differ diff --git a/icons/default/EPGInfo/Genre/Game Show_Quiz_Contest.png b/icons/default/EPGInfo/Genre/Game Show_Quiz_Contest.png new file mode 100644 index 00000000..150150c2 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Game Show_Quiz_Contest.png differ diff --git a/icons/default/EPGInfo/Genre/Historisch.png b/icons/default/EPGInfo/Genre/Historisch.png new file mode 100644 index 00000000..75988f8a Binary files /dev/null and b/icons/default/EPGInfo/Genre/Historisch.png differ diff --git a/icons/default/EPGInfo/Genre/Horror.png b/icons/default/EPGInfo/Genre/Horror.png new file mode 100644 index 00000000..d601f031 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Horror.png differ diff --git a/icons/default/EPGInfo/Genre/Jazz.png b/icons/default/EPGInfo/Genre/Jazz.png new file mode 100644 index 00000000..c421d37c Binary files /dev/null and b/icons/default/EPGInfo/Genre/Jazz.png differ diff --git "a/icons/default/EPGInfo/Genre/Kom\303\266die.png" "b/icons/default/EPGInfo/Genre/Kom\303\266die.png" new file mode 100644 index 00000000..193020ed Binary files /dev/null and "b/icons/default/EPGInfo/Genre/Kom\303\266die.png" differ diff --git "a/icons/default/EPGInfo/Genre/Kom\303\266die2.png" "b/icons/default/EPGInfo/Genre/Kom\303\266die2.png" new file mode 100644 index 00000000..66008085 Binary files /dev/null and "b/icons/default/EPGInfo/Genre/Kom\303\266die2.png" differ diff --git a/icons/default/EPGInfo/Genre/Krimi.png b/icons/default/EPGInfo/Genre/Krimi.png new file mode 100644 index 00000000..e436e107 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Krimi.png differ diff --git a/icons/default/EPGInfo/Genre/Martial Sports.png b/icons/default/EPGInfo/Genre/Martial Sports.png new file mode 100644 index 00000000..7ea16e45 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Martial Sports.png differ diff --git a/icons/default/EPGInfo/Genre/Motor Sport.png b/icons/default/EPGInfo/Genre/Motor Sport.png new file mode 100644 index 00000000..7ea16e45 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Motor Sport.png differ diff --git a/icons/default/EPGInfo/Genre/Movie_Drama.png b/icons/default/EPGInfo/Genre/Movie_Drama.png new file mode 100644 index 00000000..cd58061a Binary files /dev/null and b/icons/default/EPGInfo/Genre/Movie_Drama.png differ diff --git a/icons/default/EPGInfo/Genre/Music_Ballet_Dance.png b/icons/default/EPGInfo/Genre/Music_Ballet_Dance.png new file mode 100644 index 00000000..c421d37c Binary files /dev/null and b/icons/default/EPGInfo/Genre/Music_Ballet_Dance.png differ diff --git a/icons/default/EPGInfo/Genre/Musical_Opera.png b/icons/default/EPGInfo/Genre/Musical_Opera.png new file mode 100644 index 00000000..c421d37c Binary files /dev/null and b/icons/default/EPGInfo/Genre/Musical_Opera.png differ diff --git a/icons/default/EPGInfo/Genre/Musik.png b/icons/default/EPGInfo/Genre/Musik.png new file mode 100644 index 00000000..24c4f9a8 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Musik.png differ diff --git "a/icons/default/EPGInfo/Genre/M\303\244rchen.png" "b/icons/default/EPGInfo/Genre/M\303\244rchen.png" new file mode 100644 index 00000000..f72344e0 Binary files /dev/null and "b/icons/default/EPGInfo/Genre/M\303\244rchen.png" differ diff --git a/icons/default/EPGInfo/Genre/Rock_Pop.png b/icons/default/EPGInfo/Genre/Rock_Pop.png new file mode 100644 index 00000000..c421d37c Binary files /dev/null and b/icons/default/EPGInfo/Genre/Rock_Pop.png differ diff --git a/icons/default/EPGInfo/Genre/Roman.png b/icons/default/EPGInfo/Genre/Roman.png new file mode 100644 index 00000000..6358e8c0 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Roman.png differ diff --git a/icons/default/EPGInfo/Genre/Romance.png b/icons/default/EPGInfo/Genre/Romance.png new file mode 100644 index 00000000..c98a274c Binary files /dev/null and b/icons/default/EPGInfo/Genre/Romance.png differ diff --git a/icons/default/EPGInfo/Genre/Science Fiction_Fantasy_Horror.png b/icons/default/EPGInfo/Genre/Science Fiction_Fantasy_Horror.png new file mode 100644 index 00000000..adc539ba Binary files /dev/null and b/icons/default/EPGInfo/Genre/Science Fiction_Fantasy_Horror.png differ diff --git a/icons/default/EPGInfo/Genre/Science-Fiction.png b/icons/default/EPGInfo/Genre/Science-Fiction.png new file mode 100644 index 00000000..1cacb15d Binary files /dev/null and b/icons/default/EPGInfo/Genre/Science-Fiction.png differ diff --git a/icons/default/EPGInfo/Genre/Serious_Classical Music.png b/icons/default/EPGInfo/Genre/Serious_Classical Music.png new file mode 100644 index 00000000..c421d37c Binary files /dev/null and b/icons/default/EPGInfo/Genre/Serious_Classical Music.png differ diff --git a/icons/default/EPGInfo/Genre/Serious_Classical_Religious_Historical Movie_Drama.png b/icons/default/EPGInfo/Genre/Serious_Classical_Religious_Historical Movie_Drama.png new file mode 100644 index 00000000..f415befa Binary files /dev/null and b/icons/default/EPGInfo/Genre/Serious_Classical_Religious_Historical Movie_Drama.png differ diff --git a/icons/default/EPGInfo/Genre/Show_Game Show.png b/icons/default/EPGInfo/Genre/Show_Game Show.png new file mode 100644 index 00000000..150150c2 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Show_Game Show.png differ diff --git a/icons/default/EPGInfo/Genre/Soap_Melodrama_Folkloric.png b/icons/default/EPGInfo/Genre/Soap_Melodrama_Folkloric.png new file mode 100644 index 00000000..c98a274c Binary files /dev/null and b/icons/default/EPGInfo/Genre/Soap_Melodrama_Folkloric.png differ diff --git a/icons/default/EPGInfo/Genre/Spiel.png b/icons/default/EPGInfo/Genre/Spiel.png new file mode 100644 index 00000000..e0699f92 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Spiel.png differ diff --git a/icons/default/EPGInfo/Genre/Sport Magazine.png b/icons/default/EPGInfo/Genre/Sport Magazine.png new file mode 100644 index 00000000..7ea16e45 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Sport Magazine.png differ diff --git a/icons/default/EPGInfo/Genre/Sport.png b/icons/default/EPGInfo/Genre/Sport.png new file mode 100644 index 00000000..37f34c28 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Sport.png differ diff --git a/icons/default/EPGInfo/Genre/Sports.png b/icons/default/EPGInfo/Genre/Sports.png new file mode 100644 index 00000000..7ea16e45 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Sports.png differ diff --git a/icons/default/EPGInfo/Genre/Team Sports.png b/icons/default/EPGInfo/Genre/Team Sports.png new file mode 100644 index 00000000..7ea16e45 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Team Sports.png differ diff --git a/icons/default/EPGInfo/Genre/Tennis_Squash.png b/icons/default/EPGInfo/Genre/Tennis_Squash.png new file mode 100644 index 00000000..7ea16e45 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Tennis_Squash.png differ diff --git a/icons/default/EPGInfo/Genre/Thriller.png b/icons/default/EPGInfo/Genre/Thriller.png new file mode 100644 index 00000000..91db7292 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Thriller.png differ diff --git a/icons/default/EPGInfo/Genre/Water Sport.png b/icons/default/EPGInfo/Genre/Water Sport.png new file mode 100644 index 00000000..7ea16e45 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Water Sport.png differ diff --git a/icons/default/EPGInfo/Genre/Western.png b/icons/default/EPGInfo/Genre/Western.png new file mode 100644 index 00000000..948b8ddd Binary files /dev/null and b/icons/default/EPGInfo/Genre/Western.png differ diff --git a/icons/default/EPGInfo/Genre/Winter Sports.png b/icons/default/EPGInfo/Genre/Winter Sports.png new file mode 100644 index 00000000..7ea16e45 Binary files /dev/null and b/icons/default/EPGInfo/Genre/Winter Sports.png differ diff --git a/icons/default/EPGInfo/Genre/action.png b/icons/default/EPGInfo/Genre/action.png deleted file mode 100644 index ebd8a3ea..00000000 Binary files a/icons/default/EPGInfo/Genre/action.png and /dev/null differ diff --git a/icons/default/EPGInfo/Genre/actions2.png b/icons/default/EPGInfo/Genre/actions2.png deleted file mode 100644 index 0f8cd3df..00000000 Binary files a/icons/default/EPGInfo/Genre/actions2.png and /dev/null differ diff --git a/icons/default/EPGInfo/Genre/adventures.png b/icons/default/EPGInfo/Genre/adventures.png deleted file mode 100644 index 005ff7de..00000000 Binary files a/icons/default/EPGInfo/Genre/adventures.png and /dev/null differ diff --git a/icons/default/EPGInfo/Genre/comedy.png b/icons/default/EPGInfo/Genre/comedy.png deleted file mode 100644 index 193020ed..00000000 Binary files a/icons/default/EPGInfo/Genre/comedy.png and /dev/null differ diff --git a/icons/default/EPGInfo/Genre/comedy2.png b/icons/default/EPGInfo/Genre/comedy2.png deleted file mode 100644 index 66008085..00000000 Binary files a/icons/default/EPGInfo/Genre/comedy2.png and /dev/null differ diff --git a/icons/default/EPGInfo/Genre/crime.png b/icons/default/EPGInfo/Genre/crime.png deleted file mode 100644 index e436e107..00000000 Binary files a/icons/default/EPGInfo/Genre/crime.png and /dev/null differ diff --git a/icons/default/EPGInfo/Genre/documentary.png b/icons/default/EPGInfo/Genre/documentary.png deleted file mode 100644 index f08ea46f..00000000 Binary files a/icons/default/EPGInfo/Genre/documentary.png and /dev/null differ diff --git a/icons/default/EPGInfo/Genre/g_Action.png b/icons/default/EPGInfo/Genre/g_Action.png new file mode 100644 index 00000000..3d29e730 Binary files /dev/null and b/icons/default/EPGInfo/Genre/g_Action.png differ diff --git a/icons/default/EPGInfo/Genre/g_Action2.png b/icons/default/EPGInfo/Genre/g_Action2.png new file mode 100644 index 00000000..9a79c298 Binary files /dev/null and b/icons/default/EPGInfo/Genre/g_Action2.png differ diff --git a/icons/default/EPGInfo/Genre/g_Erotik.png b/icons/default/EPGInfo/Genre/g_Erotik.png new file mode 100644 index 00000000..90b2755c Binary files /dev/null and b/icons/default/EPGInfo/Genre/g_Erotik.png differ diff --git a/icons/default/EPGInfo/Genre/g_Fantasie.png b/icons/default/EPGInfo/Genre/g_Fantasie.png new file mode 100644 index 00000000..9cca154c Binary files /dev/null and b/icons/default/EPGInfo/Genre/g_Fantasie.png differ diff --git a/icons/default/EPGInfo/Genre/g_Horror.png b/icons/default/EPGInfo/Genre/g_Horror.png new file mode 100644 index 00000000..38f197e0 Binary files /dev/null and b/icons/default/EPGInfo/Genre/g_Horror.png differ diff --git "a/icons/default/EPGInfo/Genre/g_Kom\303\266die.png" "b/icons/default/EPGInfo/Genre/g_Kom\303\266die.png" new file mode 100644 index 00000000..7b313678 Binary files /dev/null and "b/icons/default/EPGInfo/Genre/g_Kom\303\266die.png" differ diff --git a/icons/default/EPGInfo/Genre/g_Krimi.png b/icons/default/EPGInfo/Genre/g_Krimi.png new file mode 100644 index 00000000..9b67ed6f Binary files /dev/null and b/icons/default/EPGInfo/Genre/g_Krimi.png differ diff --git "a/icons/default/EPGInfo/Genre/g_M\303\244rchen.png" "b/icons/default/EPGInfo/Genre/g_M\303\244rchen.png" new file mode 100644 index 00000000..c15a722c Binary files /dev/null and "b/icons/default/EPGInfo/Genre/g_M\303\244rchen.png" differ diff --git a/icons/default/EPGInfo/Genre/g_Thriller.png b/icons/default/EPGInfo/Genre/g_Thriller.png new file mode 100644 index 00000000..7cca988d Binary files /dev/null and b/icons/default/EPGInfo/Genre/g_Thriller.png differ diff --git a/icons/default/EPGInfo/Genre/g_Western.png b/icons/default/EPGInfo/Genre/g_Western.png new file mode 100644 index 00000000..c9ab13d9 Binary files /dev/null and b/icons/default/EPGInfo/Genre/g_Western.png differ diff --git a/icons/default/EPGInfo/Genre/unknown.png b/icons/default/EPGInfo/Genre/unknown.png new file mode 100644 index 00000000..6c712c72 Binary files /dev/null and b/icons/default/EPGInfo/Genre/unknown.png differ -- cgit v1.2.3