diff --git a/data/icons/buttons/0.png b/data/icons/buttons/0.png index 8490ecb6e..740256c49 100644 Binary files a/data/icons/buttons/0.png and b/data/icons/buttons/0.png differ diff --git a/data/icons/buttons/1.png b/data/icons/buttons/1.png index 47e031617..23d7a26d7 100644 Binary files a/data/icons/buttons/1.png and b/data/icons/buttons/1.png differ diff --git a/data/icons/buttons/2.png b/data/icons/buttons/2.png index c6cc719fd..d5fdcd235 100644 Binary files a/data/icons/buttons/2.png and b/data/icons/buttons/2.png differ diff --git a/data/icons/buttons/3.png b/data/icons/buttons/3.png index 822081187..5952a3488 100644 Binary files a/data/icons/buttons/3.png and b/data/icons/buttons/3.png differ diff --git a/data/icons/buttons/4.png b/data/icons/buttons/4.png index a51841f3b..a4d98d8c6 100644 Binary files a/data/icons/buttons/4.png and b/data/icons/buttons/4.png differ diff --git a/data/icons/buttons/5.png b/data/icons/buttons/5.png index 8bdf034e1..914f78f65 100644 Binary files a/data/icons/buttons/5.png and b/data/icons/buttons/5.png differ diff --git a/data/icons/buttons/6.png b/data/icons/buttons/6.png index 3acb8fe3a..a66c0ae1d 100644 Binary files a/data/icons/buttons/6.png and b/data/icons/buttons/6.png differ diff --git a/data/icons/buttons/7.png b/data/icons/buttons/7.png index 1f0c4c834..47fd54420 100644 Binary files a/data/icons/buttons/7.png and b/data/icons/buttons/7.png differ diff --git a/data/icons/buttons/8.png b/data/icons/buttons/8.png index 733a71ccd..a35d328bc 100644 Binary files a/data/icons/buttons/8.png and b/data/icons/buttons/8.png differ diff --git a/data/icons/buttons/9.png b/data/icons/buttons/9.png index aa720fb5c..eeacd32a4 100644 Binary files a/data/icons/buttons/9.png and b/data/icons/buttons/9.png differ diff --git a/data/icons/buttons/blau.png b/data/icons/buttons/blau.png index 247d5d542..3db35c83e 100644 Binary files a/data/icons/buttons/blau.png and b/data/icons/buttons/blau.png differ diff --git a/data/icons/buttons/btn_backward.png b/data/icons/buttons/btn_backward.png index 962e71c84..377060e60 100644 Binary files a/data/icons/buttons/btn_backward.png and b/data/icons/buttons/btn_backward.png differ diff --git a/data/icons/buttons/btn_forward.png b/data/icons/buttons/btn_forward.png index cad43950b..2fcb654a4 100644 Binary files a/data/icons/buttons/btn_forward.png and b/data/icons/buttons/btn_forward.png differ diff --git a/data/icons/buttons/btn_pause.png b/data/icons/buttons/btn_pause.png index c18fafa40..cf8fc8eda 100644 Binary files a/data/icons/buttons/btn_pause.png and b/data/icons/buttons/btn_pause.png differ diff --git a/data/icons/buttons/btn_play.png b/data/icons/buttons/btn_play.png index e1baa70ca..558f24093 100644 Binary files a/data/icons/buttons/btn_play.png and b/data/icons/buttons/btn_play.png differ diff --git a/data/icons/buttons/btn_record_active.png b/data/icons/buttons/btn_record_active.png index 7d4b26252..86cb97470 100644 Binary files a/data/icons/buttons/btn_record_active.png and b/data/icons/buttons/btn_record_active.png differ diff --git a/data/icons/buttons/btn_record_inactive.png b/data/icons/buttons/btn_record_inactive.png index 54c109af7..8fa44b04a 100644 Binary files a/data/icons/buttons/btn_record_inactive.png and b/data/icons/buttons/btn_record_inactive.png differ diff --git a/data/icons/buttons/btn_stop.png b/data/icons/buttons/btn_stop.png index 319ed8d9d..e8b661807 100644 Binary files a/data/icons/buttons/btn_stop.png and b/data/icons/buttons/btn_stop.png differ diff --git a/data/icons/buttons/down.png b/data/icons/buttons/down.png index db4ce2538..71bc5c8b7 100644 Binary files a/data/icons/buttons/down.png and b/data/icons/buttons/down.png differ diff --git a/data/icons/buttons/dummy.png b/data/icons/buttons/dummy.png index 284b9301b..27c6719ed 100644 Binary files a/data/icons/buttons/dummy.png and b/data/icons/buttons/dummy.png differ diff --git a/data/icons/buttons/dummy_small.png b/data/icons/buttons/dummy_small.png index a4fb33314..a619133bd 100644 Binary files a/data/icons/buttons/dummy_small.png and b/data/icons/buttons/dummy_small.png differ diff --git a/data/icons/buttons/gelb.png b/data/icons/buttons/gelb.png index 60d18c031..2611c9a4c 100644 Binary files a/data/icons/buttons/gelb.png and b/data/icons/buttons/gelb.png differ diff --git a/data/icons/buttons/gruen.png b/data/icons/buttons/gruen.png index 70806cdd0..72d213076 100644 Binary files a/data/icons/buttons/gruen.png and b/data/icons/buttons/gruen.png differ diff --git a/data/icons/buttons/help.png b/data/icons/buttons/help.png index 1cb97bcf2..027470160 100644 Binary files a/data/icons/buttons/help.png and b/data/icons/buttons/help.png differ diff --git a/data/icons/buttons/help_small.png b/data/icons/buttons/help_small.png index 5610f6941..a31bd8ea5 100644 Binary files a/data/icons/buttons/help_small.png and b/data/icons/buttons/help_small.png differ diff --git a/data/icons/buttons/home.png b/data/icons/buttons/home.png index 3e5e0cb87..61ceac5a8 100644 Binary files a/data/icons/buttons/home.png and b/data/icons/buttons/home.png differ diff --git a/data/icons/buttons/info.png b/data/icons/buttons/info.png index 712126aa2..d6c59a514 100644 Binary files a/data/icons/buttons/info.png and b/data/icons/buttons/info.png differ diff --git a/data/icons/buttons/info_small.png b/data/icons/buttons/info_small.png index e7f76c991..79461d797 100644 Binary files a/data/icons/buttons/info_small.png and b/data/icons/buttons/info_small.png differ diff --git a/data/icons/buttons/left.png b/data/icons/buttons/left.png index 504a1519b..4be429409 100644 Binary files a/data/icons/buttons/left.png and b/data/icons/buttons/left.png differ diff --git a/data/icons/buttons/menu.png b/data/icons/buttons/menu.png index fb4d418d6..059bbbd06 100644 Binary files a/data/icons/buttons/menu.png and b/data/icons/buttons/menu.png differ diff --git a/data/icons/buttons/menu_small.png b/data/icons/buttons/menu_small.png index 71bfe7335..b5463ff15 100644 Binary files a/data/icons/buttons/menu_small.png and b/data/icons/buttons/menu_small.png differ diff --git a/data/icons/buttons/mute_small.png b/data/icons/buttons/mute_small.png index 8ca72d29c..5fc7f1534 100644 Binary files a/data/icons/buttons/mute_small.png and b/data/icons/buttons/mute_small.png differ diff --git a/data/icons/buttons/mute_zap_gray.png b/data/icons/buttons/mute_zap_gray.png index 9ba42bdcb..4ff66f22d 100644 Binary files a/data/icons/buttons/mute_zap_gray.png and b/data/icons/buttons/mute_zap_gray.png differ diff --git a/data/icons/buttons/mute_zap_green.png b/data/icons/buttons/mute_zap_green.png index 746ff165f..b03c2463a 100644 Binary files a/data/icons/buttons/mute_zap_green.png and b/data/icons/buttons/mute_zap_green.png differ diff --git a/data/icons/buttons/ok.png b/data/icons/buttons/ok.png index 18968cb98..4d02b05b5 100644 Binary files a/data/icons/buttons/ok.png and b/data/icons/buttons/ok.png differ diff --git a/data/icons/buttons/power.png b/data/icons/buttons/power.png index 2f7da6ae8..8291ff431 100644 Binary files a/data/icons/buttons/power.png and b/data/icons/buttons/power.png differ diff --git a/data/icons/buttons/right.png b/data/icons/buttons/right.png index 8b06d6bb1..04c25194e 100644 Binary files a/data/icons/buttons/right.png and b/data/icons/buttons/right.png differ diff --git a/data/icons/buttons/rot.png b/data/icons/buttons/rot.png index 6b5acc916..266d0fad5 100644 Binary files a/data/icons/buttons/rot.png and b/data/icons/buttons/rot.png differ diff --git a/data/icons/buttons/up.png b/data/icons/buttons/up.png index d18f6fa30..bfe21ec00 100644 Binary files a/data/icons/buttons/up.png and b/data/icons/buttons/up.png differ diff --git a/data/icons/filetypes/file.png b/data/icons/filetypes/file.png index bafac7e63..0a2da7b4b 100644 Binary files a/data/icons/filetypes/file.png and b/data/icons/filetypes/file.png differ diff --git a/data/icons/filetypes/folder.png b/data/icons/filetypes/folder.png index eb6be69b4..817e56fd0 100644 Binary files a/data/icons/filetypes/folder.png and b/data/icons/filetypes/folder.png differ diff --git a/data/icons/filetypes/movie.png b/data/icons/filetypes/movie.png index bafac7e63..448e93114 100644 Binary files a/data/icons/filetypes/movie.png and b/data/icons/filetypes/movie.png differ diff --git a/data/icons/headers/audio.png b/data/icons/headers/audio.png index 970507439..dc1200e58 100644 Binary files a/data/icons/headers/audio.png and b/data/icons/headers/audio.png differ diff --git a/data/icons/headers/bookmarkmanager.png b/data/icons/headers/bookmarkmanager.png index cc75c540a..84f16627d 100644 Binary files a/data/icons/headers/bookmarkmanager.png and b/data/icons/headers/bookmarkmanager.png differ diff --git a/data/icons/headers/colors.png b/data/icons/headers/colors.png index e4a73fce2..6ce59523d 100644 Binary files a/data/icons/headers/colors.png and b/data/icons/headers/colors.png differ diff --git a/data/icons/headers/error.png b/data/icons/headers/error.png index da889bb9c..13f9e90b4 100644 Binary files a/data/icons/headers/error.png and b/data/icons/headers/error.png differ diff --git a/data/icons/headers/features.png b/data/icons/headers/features.png index a9f3056ed..f937d2151 100644 Binary files a/data/icons/headers/features.png and b/data/icons/headers/features.png differ diff --git a/data/icons/headers/games.png b/data/icons/headers/games.png index fa33b44f7..233bfd299 100644 Binary files a/data/icons/headers/games.png and b/data/icons/headers/games.png differ diff --git a/data/icons/headers/icon_blue.png b/data/icons/headers/icon_blue.png index 4c84e0bb3..91debee83 100644 Binary files a/data/icons/headers/icon_blue.png and b/data/icons/headers/icon_blue.png differ diff --git a/data/icons/headers/icon_green.png b/data/icons/headers/icon_green.png index 5a0048fc7..ea710c28c 100644 Binary files a/data/icons/headers/icon_green.png and b/data/icons/headers/icon_green.png differ diff --git a/data/icons/headers/icon_movieplayer.png b/data/icons/headers/icon_movieplayer.png index d116ff154..fd3998a21 100644 Binary files a/data/icons/headers/icon_movieplayer.png and b/data/icons/headers/icon_movieplayer.png differ diff --git a/data/icons/headers/icon_red.png b/data/icons/headers/icon_red.png index 5b473d464..02ca9c10f 100644 Binary files a/data/icons/headers/icon_red.png and b/data/icons/headers/icon_red.png differ diff --git a/data/icons/headers/icon_yellow.png b/data/icons/headers/icon_yellow.png index 7dee1f3b0..c6b70fde8 100644 Binary files a/data/icons/headers/icon_yellow.png and b/data/icons/headers/icon_yellow.png differ diff --git a/data/icons/headers/icon_ytplay.png b/data/icons/headers/icon_ytplay.png index 858f4ffd4..e3da39a11 100644 Binary files a/data/icons/headers/icon_ytplay.png and b/data/icons/headers/icon_ytplay.png differ diff --git a/data/icons/headers/information.png b/data/icons/headers/information.png index e87fad969..353e06495 100644 Binary files a/data/icons/headers/information.png and b/data/icons/headers/information.png differ diff --git a/data/icons/headers/keybinding.png b/data/icons/headers/keybinding.png index 5c70c6274..e8c24c729 100644 Binary files a/data/icons/headers/keybinding.png and b/data/icons/headers/keybinding.png differ diff --git a/data/icons/headers/language.png b/data/icons/headers/language.png index bbef95490..0bc7dfd48 100644 Binary files a/data/icons/headers/language.png and b/data/icons/headers/language.png differ diff --git a/data/icons/headers/lcd.png b/data/icons/headers/lcd.png index dc190f8bb..a8b5c3289 100644 Binary files a/data/icons/headers/lcd.png and b/data/icons/headers/lcd.png differ diff --git a/data/icons/headers/mainmenue.png b/data/icons/headers/mainmenue.png index f5fc78f4e..ac3bfae4d 100644 Binary files a/data/icons/headers/mainmenue.png and b/data/icons/headers/mainmenue.png differ diff --git a/data/icons/headers/mp3.png b/data/icons/headers/mp3.png index 223f8dfec..dc1200e58 100644 Binary files a/data/icons/headers/mp3.png and b/data/icons/headers/mp3.png differ diff --git a/data/icons/headers/multimedia.png b/data/icons/headers/multimedia.png index 72ea0c77c..62537f659 100644 Binary files a/data/icons/headers/multimedia.png and b/data/icons/headers/multimedia.png differ diff --git a/data/icons/headers/network.png b/data/icons/headers/network.png index 400a1e29b..40430c131 100644 Binary files a/data/icons/headers/network.png and b/data/icons/headers/network.png differ diff --git a/data/icons/headers/personalize.png b/data/icons/headers/personalize.png index 4f9333ccc..f0b1c725d 100644 Binary files a/data/icons/headers/personalize.png and b/data/icons/headers/personalize.png differ diff --git a/data/icons/headers/recording.png b/data/icons/headers/recording.png index f073b4104..f6f53a154 100644 Binary files a/data/icons/headers/recording.png and b/data/icons/headers/recording.png differ diff --git a/data/icons/headers/settings.png b/data/icons/headers/settings.png index 7d7217c81..8909c3553 100644 Binary files a/data/icons/headers/settings.png and b/data/icons/headers/settings.png differ diff --git a/data/icons/headers/shell.png b/data/icons/headers/shell.png index fa92beb83..be23f2b6a 100644 Binary files a/data/icons/headers/shell.png and b/data/icons/headers/shell.png differ diff --git a/data/icons/headers/softupdate.png b/data/icons/headers/softupdate.png index 83e0ed36e..a0c2f860e 100644 Binary files a/data/icons/headers/softupdate.png and b/data/icons/headers/softupdate.png differ diff --git a/data/icons/headers/streaming.png b/data/icons/headers/streaming.png index 1a0fc1469..d62923f16 100644 Binary files a/data/icons/headers/streaming.png and b/data/icons/headers/streaming.png differ diff --git a/data/icons/headers/timer.png b/data/icons/headers/timer.png index cc75c540a..72e1320c4 100644 Binary files a/data/icons/headers/timer.png and b/data/icons/headers/timer.png differ diff --git a/data/icons/headers/upnp.png b/data/icons/headers/upnp.png index 872694601..69d89c4fd 100644 Binary files a/data/icons/headers/upnp.png and b/data/icons/headers/upnp.png differ diff --git a/data/icons/headers/video.png b/data/icons/headers/video.png index 59b5c89f6..82358a982 100644 Binary files a/data/icons/headers/video.png and b/data/icons/headers/video.png differ diff --git a/data/icons/hints/hint_a_pic.png b/data/icons/hints/hint_a_pic.png index 7ed6dfd2b..b309be271 100644 Binary files a/data/icons/hints/hint_a_pic.png and b/data/icons/hints/hint_a_pic.png differ diff --git a/data/icons/hints/hint_adzap.png b/data/icons/hints/hint_adzap.png index 164cffcb7..39739902f 100644 Binary files a/data/icons/hints/hint_adzap.png and b/data/icons/hints/hint_adzap.png differ diff --git a/data/icons/hints/hint_aplay.png b/data/icons/hints/hint_aplay.png index f49692a12..2256abd9f 100644 Binary files a/data/icons/hints/hint_aplay.png and b/data/icons/hints/hint_aplay.png differ diff --git a/data/icons/hints/hint_audio.png b/data/icons/hints/hint_audio.png index 011e3f033..e44e4c090 100644 Binary files a/data/icons/hints/hint_audio.png and b/data/icons/hints/hint_audio.png differ diff --git a/data/icons/hints/hint_back.png b/data/icons/hints/hint_back.png index 42fecf16f..ce5b878b0 100644 Binary files a/data/icons/hints/hint_back.png and b/data/icons/hints/hint_back.png differ diff --git a/data/icons/hints/hint_bedit.png b/data/icons/hints/hint_bedit.png index 43c1eab7a..b2ecd31fc 100644 Binary files a/data/icons/hints/hint_bedit.png and b/data/icons/hints/hint_bedit.png differ diff --git a/data/icons/hints/hint_blank_screen.png b/data/icons/hints/hint_blank_screen.png index b48cab44c..1fe441709 100644 Binary files a/data/icons/hints/hint_blank_screen.png and b/data/icons/hints/hint_blank_screen.png differ diff --git a/data/icons/hints/hint_ci.png b/data/icons/hints/hint_ci.png index 28512a0ce..d76dcf331 100644 Binary files a/data/icons/hints/hint_ci.png and b/data/icons/hints/hint_ci.png differ diff --git a/data/icons/hints/hint_dboxinfo.png b/data/icons/hints/hint_dboxinfo.png index ca657788a..462deaa67 100644 Binary files a/data/icons/hints/hint_dboxinfo.png and b/data/icons/hints/hint_dboxinfo.png differ diff --git a/data/icons/hints/hint_delete.png b/data/icons/hints/hint_delete.png index aee392425..0922752e8 100644 Binary files a/data/icons/hints/hint_delete.png and b/data/icons/hints/hint_delete.png differ diff --git a/data/icons/hints/hint_extended.png b/data/icons/hints/hint_extended.png index fc3e685ac..db384deec 100644 Binary files a/data/icons/hints/hint_extended.png and b/data/icons/hints/hint_extended.png differ diff --git a/data/icons/hints/hint_fileplay.png b/data/icons/hints/hint_fileplay.png index 3e5714bda..6a8458172 100644 Binary files a/data/icons/hints/hint_fileplay.png and b/data/icons/hints/hint_fileplay.png differ diff --git a/data/icons/hints/hint_games.png b/data/icons/hints/hint_games.png index 21964b579..79916ce0a 100644 Binary files a/data/icons/hints/hint_games.png and b/data/icons/hints/hint_games.png differ diff --git a/data/icons/hints/hint_hdd.png b/data/icons/hints/hint_hdd.png index de51810b2..78d643e18 100644 Binary files a/data/icons/hints/hint_hdd.png and b/data/icons/hints/hint_hdd.png differ diff --git a/data/icons/hints/hint_hdd_info.png b/data/icons/hints/hint_hdd_info.png index 894781656..51873bb70 100644 Binary files a/data/icons/hints/hint_hdd_info.png and b/data/icons/hints/hint_hdd_info.png differ diff --git a/data/icons/hints/hint_iconsPKG0.png b/data/icons/hints/hint_iconsPKG0.png index 69f276c44..002ea7e5d 100644 Binary files a/data/icons/hints/hint_iconsPKG0.png and b/data/icons/hints/hint_iconsPKG0.png differ diff --git a/data/icons/hints/hint_iconsPKG1.png b/data/icons/hints/hint_iconsPKG1.png index 20cc1f47d..95df0209b 100644 Binary files a/data/icons/hints/hint_iconsPKG1.png and b/data/icons/hints/hint_iconsPKG1.png differ diff --git a/data/icons/hints/hint_iconsPKG2.png b/data/icons/hints/hint_iconsPKG2.png index b5ab380d6..c6489aee2 100644 Binary files a/data/icons/hints/hint_iconsPKG2.png and b/data/icons/hints/hint_iconsPKG2.png differ diff --git a/data/icons/hints/hint_iconsPKG3.png b/data/icons/hints/hint_iconsPKG3.png index 00fbe822f..84b14f2a9 100644 Binary files a/data/icons/hints/hint_iconsPKG3.png and b/data/icons/hints/hint_iconsPKG3.png differ diff --git a/data/icons/hints/hint_imageinfo.png b/data/icons/hints/hint_imageinfo.png index 1c0e1ada2..c571b2e3e 100644 Binary files a/data/icons/hints/hint_imageinfo.png and b/data/icons/hints/hint_imageinfo.png differ diff --git a/data/icons/hints/hint_imagelogo.png b/data/icons/hints/hint_imagelogo.png index 1c61637a1..4783d7de1 100644 Binary files a/data/icons/hints/hint_imagelogo.png and b/data/icons/hints/hint_imagelogo.png differ diff --git a/data/icons/hints/hint_inetradio.png b/data/icons/hints/hint_inetradio.png index 8d1d8561e..1d5680bbd 100644 Binary files a/data/icons/hints/hint_inetradio.png and b/data/icons/hints/hint_inetradio.png differ diff --git a/data/icons/hints/hint_info.png b/data/icons/hints/hint_info.png index 3e1777aab..c571b2e3e 100644 Binary files a/data/icons/hints/hint_info.png and b/data/icons/hints/hint_info.png differ diff --git a/data/icons/hints/hint_keys.png b/data/icons/hints/hint_keys.png index fd7b14fc8..becdb051a 100644 Binary files a/data/icons/hints/hint_keys.png and b/data/icons/hints/hint_keys.png differ diff --git a/data/icons/hints/hint_language.png b/data/icons/hints/hint_language.png index 1585e8237..eeaab46c0 100644 Binary files a/data/icons/hints/hint_language.png and b/data/icons/hints/hint_language.png differ diff --git a/data/icons/hints/hint_lcd4linux.png b/data/icons/hints/hint_lcd4linux.png index d2f502768..38afaf543 100644 Binary files a/data/icons/hints/hint_lcd4linux.png and b/data/icons/hints/hint_lcd4linux.png differ diff --git a/data/icons/hints/hint_manage.png b/data/icons/hints/hint_manage.png index f40a4d3c5..d1aad0bd1 100644 Binary files a/data/icons/hints/hint_manage.png and b/data/icons/hints/hint_manage.png differ diff --git a/data/icons/hints/hint_mb.png b/data/icons/hints/hint_mb.png index 1bb508a8b..3ffdeb7cc 100644 Binary files a/data/icons/hints/hint_mb.png and b/data/icons/hints/hint_mb.png differ diff --git a/data/icons/hints/hint_media.png b/data/icons/hints/hint_media.png index 8216861a7..4e03270fe 100644 Binary files a/data/icons/hints/hint_media.png and b/data/icons/hints/hint_media.png differ diff --git a/data/icons/hints/hint_movie.png b/data/icons/hints/hint_movie.png index 7c075a0b5..6a8458172 100644 Binary files a/data/icons/hints/hint_movie.png and b/data/icons/hints/hint_movie.png differ diff --git a/data/icons/hints/hint_network.png b/data/icons/hints/hint_network.png index e45cbceb2..b68e29233 100644 Binary files a/data/icons/hints/hint_network.png and b/data/icons/hints/hint_network.png differ diff --git a/data/icons/hints/hint_next.png b/data/icons/hints/hint_next.png index a33703c27..878b6e5e8 100644 Binary files a/data/icons/hints/hint_next.png and b/data/icons/hints/hint_next.png differ diff --git a/data/icons/hints/hint_nkplay.png b/data/icons/hints/hint_nkplay.png index 4ea007091..23ea9d322 100644 Binary files a/data/icons/hints/hint_nkplay.png and b/data/icons/hints/hint_nkplay.png differ diff --git a/data/icons/hints/hint_osd.png b/data/icons/hints/hint_osd.png index cc22a0ebc..297d43fcd 100644 Binary files a/data/icons/hints/hint_osd.png and b/data/icons/hints/hint_osd.png differ diff --git a/data/icons/hints/hint_personalize.png b/data/icons/hints/hint_personalize.png index 10a6da125..aea15f0be 100644 Binary files a/data/icons/hints/hint_personalize.png and b/data/icons/hints/hint_personalize.png differ diff --git a/data/icons/hints/hint_picview.png b/data/icons/hints/hint_picview.png index c397432e7..2642b9e09 100644 Binary files a/data/icons/hints/hint_picview.png and b/data/icons/hints/hint_picview.png differ diff --git a/data/icons/hints/hint_plugin.png b/data/icons/hints/hint_plugin.png index 4e53b6426..69e265a0c 100644 Binary files a/data/icons/hints/hint_plugin.png and b/data/icons/hints/hint_plugin.png differ diff --git a/data/icons/hints/hint_protection.png b/data/icons/hints/hint_protection.png index 45b14fe1f..ad8d91a99 100644 Binary files a/data/icons/hints/hint_protection.png and b/data/icons/hints/hint_protection.png differ diff --git a/data/icons/hints/hint_radiomode.png b/data/icons/hints/hint_radiomode.png index e69d52330..e7e7fa4f2 100644 Binary files a/data/icons/hints/hint_radiomode.png and b/data/icons/hints/hint_radiomode.png differ diff --git a/data/icons/hints/hint_rass.png b/data/icons/hints/hint_rass.png index e9f5462da..004a7f1e5 100644 Binary files a/data/icons/hints/hint_rass.png and b/data/icons/hints/hint_rass.png differ diff --git a/data/icons/hints/hint_reboot.png b/data/icons/hints/hint_reboot.png index 530d6b2ed..abc5ad7c2 100644 Binary files a/data/icons/hints/hint_reboot.png and b/data/icons/hints/hint_reboot.png differ diff --git a/data/icons/hints/hint_recording.png b/data/icons/hints/hint_recording.png index 06caf3dda..0fa16b016 100644 Binary files a/data/icons/hints/hint_recording.png and b/data/icons/hints/hint_recording.png differ diff --git a/data/icons/hints/hint_reload.png b/data/icons/hints/hint_reload.png index 28c4be4b7..7a7a771e2 100644 Binary files a/data/icons/hints/hint_reload.png and b/data/icons/hints/hint_reload.png differ diff --git a/data/icons/hints/hint_restart.png b/data/icons/hints/hint_restart.png index 2ac75bd1b..1989184b1 100644 Binary files a/data/icons/hints/hint_restart.png and b/data/icons/hints/hint_restart.png differ diff --git a/data/icons/hints/hint_save.png b/data/icons/hints/hint_save.png index a87f1bd3d..adda09575 100644 Binary files a/data/icons/hints/hint_save.png and b/data/icons/hints/hint_save.png differ diff --git a/data/icons/hints/hint_scan.png b/data/icons/hints/hint_scan.png index 36f158538..de970a48e 100644 Binary files a/data/icons/hints/hint_scan.png and b/data/icons/hints/hint_scan.png differ diff --git a/data/icons/hints/hint_scripts.png b/data/icons/hints/hint_scripts.png index 73f9d07ff..e954a6417 100644 Binary files a/data/icons/hints/hint_scripts.png and b/data/icons/hints/hint_scripts.png differ diff --git a/data/icons/hints/hint_service.png b/data/icons/hints/hint_service.png index 019e0c622..1a03220e8 100644 Binary files a/data/icons/hints/hint_service.png and b/data/icons/hints/hint_service.png differ diff --git a/data/icons/hints/hint_settings.png b/data/icons/hints/hint_settings.png index 08c127fd0..5caedc8e5 100644 Binary files a/data/icons/hints/hint_settings.png and b/data/icons/hints/hint_settings.png differ diff --git a/data/icons/hints/hint_shutdown.png b/data/icons/hints/hint_shutdown.png index 85beb4d9a..6ea9162ab 100644 Binary files a/data/icons/hints/hint_shutdown.png and b/data/icons/hints/hint_shutdown.png differ diff --git a/data/icons/hints/hint_sleeptimer.png b/data/icons/hints/hint_sleeptimer.png index fa8827d9b..b0475de2b 100644 Binary files a/data/icons/hints/hint_sleeptimer.png and b/data/icons/hints/hint_sleeptimer.png differ diff --git a/data/icons/hints/hint_spark.png b/data/icons/hints/hint_spark.png index f10fca62e..9bdc48611 100644 Binary files a/data/icons/hints/hint_spark.png and b/data/icons/hints/hint_spark.png differ diff --git a/data/icons/hints/hint_streaminfo.png b/data/icons/hints/hint_streaminfo.png index 7176488ed..2dec43197 100644 Binary files a/data/icons/hints/hint_streaminfo.png and b/data/icons/hints/hint_streaminfo.png differ diff --git a/data/icons/hints/hint_swupdate.png b/data/icons/hints/hint_swupdate.png index 0a44a44ec..54c08fbda 100644 Binary files a/data/icons/hints/hint_swupdate.png and b/data/icons/hints/hint_swupdate.png differ diff --git a/data/icons/hints/hint_timers.png b/data/icons/hints/hint_timers.png index 83263547b..9d239966f 100644 Binary files a/data/icons/hints/hint_timers.png and b/data/icons/hints/hint_timers.png differ diff --git a/data/icons/hints/hint_tvmode.png b/data/icons/hints/hint_tvmode.png index 1af243c4e..cef8ac5a8 100644 Binary files a/data/icons/hints/hint_tvmode.png and b/data/icons/hints/hint_tvmode.png differ diff --git a/data/icons/hints/hint_tvradio_switch.png b/data/icons/hints/hint_tvradio_switch.png index df84f62e2..af15aab19 100644 Binary files a/data/icons/hints/hint_tvradio_switch.png and b/data/icons/hints/hint_tvradio_switch.png differ diff --git a/data/icons/hints/hint_vfd.png b/data/icons/hints/hint_vfd.png index 36d251fe7..ee10d32e6 100644 Binary files a/data/icons/hints/hint_vfd.png and b/data/icons/hints/hint_vfd.png differ diff --git a/data/icons/hints/hint_video.png b/data/icons/hints/hint_video.png index 2bf44c01b..1deb16638 100644 Binary files a/data/icons/hints/hint_video.png and b/data/icons/hints/hint_video.png differ diff --git a/data/icons/hints/hint_vtxt.png b/data/icons/hints/hint_vtxt.png index 2a852bc0d..4ddb0c420 100644 Binary files a/data/icons/hints/hint_vtxt.png and b/data/icons/hints/hint_vtxt.png differ diff --git a/data/icons/hints/hint_ytplay.png b/data/icons/hints/hint_ytplay.png index 0d687cca0..73055eedc 100644 Binary files a/data/icons/hints/hint_ytplay.png and b/data/icons/hints/hint_ytplay.png differ diff --git a/data/icons/movieplayer/mp_b-skip.png b/data/icons/movieplayer/mp_b-skip.png index 09d44b0cd..af0512506 100644 Binary files a/data/icons/movieplayer/mp_b-skip.png and b/data/icons/movieplayer/mp_b-skip.png differ diff --git a/data/icons/movieplayer/mp_f-skip.png b/data/icons/movieplayer/mp_f-skip.png index 483707bbb..ec53881d9 100644 Binary files a/data/icons/movieplayer/mp_f-skip.png and b/data/icons/movieplayer/mp_f-skip.png differ diff --git a/data/icons/movieplayer/mp_pause.png b/data/icons/movieplayer/mp_pause.png index 7b41ef227..92e6431fd 100644 Binary files a/data/icons/movieplayer/mp_pause.png and b/data/icons/movieplayer/mp_pause.png differ diff --git a/data/icons/movieplayer/mp_play.png b/data/icons/movieplayer/mp_play.png index 87f16bce6..a3c80e73d 100644 Binary files a/data/icons/movieplayer/mp_play.png and b/data/icons/movieplayer/mp_play.png differ diff --git a/data/icons/movieplayer/mp_play_repeat_all.png b/data/icons/movieplayer/mp_play_repeat_all.png index 415c530b9..ad8b8c0df 100644 Binary files a/data/icons/movieplayer/mp_play_repeat_all.png and b/data/icons/movieplayer/mp_play_repeat_all.png differ diff --git a/data/icons/movieplayer/mp_play_repeat_track.png b/data/icons/movieplayer/mp_play_repeat_track.png index 04a8f71bd..33f8d84c3 100644 Binary files a/data/icons/movieplayer/mp_play_repeat_track.png and b/data/icons/movieplayer/mp_play_repeat_track.png differ diff --git a/data/icons/status/ca/biss_green.png b/data/icons/status/ca/biss_green.png index c2a638b11..577f4f51d 100644 Binary files a/data/icons/status/ca/biss_green.png and b/data/icons/status/ca/biss_green.png differ diff --git a/data/icons/status/ca/biss_white.png b/data/icons/status/ca/biss_white.png index 5aa76092e..cb66aad10 100644 Binary files a/data/icons/status/ca/biss_white.png and b/data/icons/status/ca/biss_white.png differ diff --git a/data/icons/status/ca/biss_yellow.png b/data/icons/status/ca/biss_yellow.png index 5da432e9d..9fce34b5b 100644 Binary files a/data/icons/status/ca/biss_yellow.png and b/data/icons/status/ca/biss_yellow.png differ diff --git a/data/icons/status/ca/conax_green.png b/data/icons/status/ca/conax_green.png index 174d39f76..7e0895eff 100644 Binary files a/data/icons/status/ca/conax_green.png and b/data/icons/status/ca/conax_green.png differ diff --git a/data/icons/status/ca/conax_white.png b/data/icons/status/ca/conax_white.png index cb0d2f5b5..757661def 100644 Binary files a/data/icons/status/ca/conax_white.png and b/data/icons/status/ca/conax_white.png differ diff --git a/data/icons/status/ca/conax_yellow.png b/data/icons/status/ca/conax_yellow.png index 96c438bde..6989d7ce4 100644 Binary files a/data/icons/status/ca/conax_yellow.png and b/data/icons/status/ca/conax_yellow.png differ diff --git a/data/icons/status/ca/cw_green.png b/data/icons/status/ca/cw_green.png index fa51f0b54..cdf4e5cb0 100644 Binary files a/data/icons/status/ca/cw_green.png and b/data/icons/status/ca/cw_green.png differ diff --git a/data/icons/status/ca/cw_white.png b/data/icons/status/ca/cw_white.png index 8fdaf67ec..de9fd09f2 100644 Binary files a/data/icons/status/ca/cw_white.png and b/data/icons/status/ca/cw_white.png differ diff --git a/data/icons/status/ca/cw_yellow.png b/data/icons/status/ca/cw_yellow.png index b994a058c..a8bd6286a 100644 Binary files a/data/icons/status/ca/cw_yellow.png and b/data/icons/status/ca/cw_yellow.png differ diff --git a/data/icons/status/ca/d_green.png b/data/icons/status/ca/d_green.png index 65a22d430..2a4d1c600 100644 Binary files a/data/icons/status/ca/d_green.png and b/data/icons/status/ca/d_green.png differ diff --git a/data/icons/status/ca/d_white.png b/data/icons/status/ca/d_white.png index c08707692..14322deca 100644 Binary files a/data/icons/status/ca/d_white.png and b/data/icons/status/ca/d_white.png differ diff --git a/data/icons/status/ca/d_yellow.png b/data/icons/status/ca/d_yellow.png index a2ff6a70e..18f7c3430 100644 Binary files a/data/icons/status/ca/d_yellow.png and b/data/icons/status/ca/d_yellow.png differ diff --git a/data/icons/status/ca/ird_green.png b/data/icons/status/ca/ird_green.png index 27840a614..ac26895fd 100644 Binary files a/data/icons/status/ca/ird_green.png and b/data/icons/status/ca/ird_green.png differ diff --git a/data/icons/status/ca/ird_white.png b/data/icons/status/ca/ird_white.png index ff5e521ae..50d102aa3 100644 Binary files a/data/icons/status/ca/ird_white.png and b/data/icons/status/ca/ird_white.png differ diff --git a/data/icons/status/ca/ird_yellow.png b/data/icons/status/ca/ird_yellow.png index cc81a215a..47017d75c 100644 Binary files a/data/icons/status/ca/ird_yellow.png and b/data/icons/status/ca/ird_yellow.png differ diff --git a/data/icons/status/ca/nagra_green.png b/data/icons/status/ca/nagra_green.png index 7682759cb..b43bf98f4 100644 Binary files a/data/icons/status/ca/nagra_green.png and b/data/icons/status/ca/nagra_green.png differ diff --git a/data/icons/status/ca/nagra_white.png b/data/icons/status/ca/nagra_white.png index 917896a75..afafbbbde 100644 Binary files a/data/icons/status/ca/nagra_white.png and b/data/icons/status/ca/nagra_white.png differ diff --git a/data/icons/status/ca/nagra_yellow.png b/data/icons/status/ca/nagra_yellow.png index 4fc908a32..260665c63 100644 Binary files a/data/icons/status/ca/nagra_yellow.png and b/data/icons/status/ca/nagra_yellow.png differ diff --git a/data/icons/status/ca/nds_green.png b/data/icons/status/ca/nds_green.png index 703c47bcc..758758d20 100644 Binary files a/data/icons/status/ca/nds_green.png and b/data/icons/status/ca/nds_green.png differ diff --git a/data/icons/status/ca/nds_white.png b/data/icons/status/ca/nds_white.png index b763ad4d0..4adf2aeb9 100644 Binary files a/data/icons/status/ca/nds_white.png and b/data/icons/status/ca/nds_white.png differ diff --git a/data/icons/status/ca/nds_yellow.png b/data/icons/status/ca/nds_yellow.png index 12d6dbda2..1dc699a39 100644 Binary files a/data/icons/status/ca/nds_yellow.png and b/data/icons/status/ca/nds_yellow.png differ diff --git a/data/icons/status/ca/powervu_green.png b/data/icons/status/ca/powervu_green.png index 9380eea95..b1b6b1626 100644 Binary files a/data/icons/status/ca/powervu_green.png and b/data/icons/status/ca/powervu_green.png differ diff --git a/data/icons/status/ca/powervu_white.png b/data/icons/status/ca/powervu_white.png index 07c4c8d5a..5e8aa00c1 100644 Binary files a/data/icons/status/ca/powervu_white.png and b/data/icons/status/ca/powervu_white.png differ diff --git a/data/icons/status/ca/powervu_yellow.png b/data/icons/status/ca/powervu_yellow.png index 6e95a8d9c..5027a07de 100644 Binary files a/data/icons/status/ca/powervu_yellow.png and b/data/icons/status/ca/powervu_yellow.png differ diff --git a/data/icons/status/ca/seca_green.png b/data/icons/status/ca/seca_green.png index b71a9254b..0645fd1c1 100644 Binary files a/data/icons/status/ca/seca_green.png and b/data/icons/status/ca/seca_green.png differ diff --git a/data/icons/status/ca/seca_white.png b/data/icons/status/ca/seca_white.png index 2ba599d03..46b07a14d 100644 Binary files a/data/icons/status/ca/seca_white.png and b/data/icons/status/ca/seca_white.png differ diff --git a/data/icons/status/ca/seca_yellow.png b/data/icons/status/ca/seca_yellow.png index 365111aa9..0f864b2ba 100644 Binary files a/data/icons/status/ca/seca_yellow.png and b/data/icons/status/ca/seca_yellow.png differ diff --git a/data/icons/status/ca/via_green.png b/data/icons/status/ca/via_green.png index 96423c79b..4480eca1a 100644 Binary files a/data/icons/status/ca/via_green.png and b/data/icons/status/ca/via_green.png differ diff --git a/data/icons/status/ca/via_white.png b/data/icons/status/ca/via_white.png index c0b0a7d2b..604461f82 100644 Binary files a/data/icons/status/ca/via_white.png and b/data/icons/status/ca/via_white.png differ diff --git a/data/icons/status/ca/via_yellow.png b/data/icons/status/ca/via_yellow.png index 7234c6ee6..87dc5f93e 100644 Binary files a/data/icons/status/ca/via_yellow.png and b/data/icons/status/ca/via_yellow.png differ diff --git a/data/icons/status/ca/x_green.png b/data/icons/status/ca/x_green.png index 6eff02b8c..6212d7865 100644 Binary files a/data/icons/status/ca/x_green.png and b/data/icons/status/ca/x_green.png differ diff --git a/data/icons/status/ca/x_white.png b/data/icons/status/ca/x_white.png index ab3bbdd74..3e48ee0b4 100644 Binary files a/data/icons/status/ca/x_white.png and b/data/icons/status/ca/x_white.png differ diff --git a/data/icons/status/ca/x_yellow.png b/data/icons/status/ca/x_yellow.png index 39843e345..4a57a232a 100644 Binary files a/data/icons/status/ca/x_yellow.png and b/data/icons/status/ca/x_yellow.png differ diff --git a/data/icons/status/channel/16_9.png b/data/icons/status/channel/16_9.png index 024bfc455..6c4873bdc 100644 Binary files a/data/icons/status/channel/16_9.png and b/data/icons/status/channel/16_9.png differ diff --git a/data/icons/status/channel/16_9_gray.png b/data/icons/status/channel/16_9_gray.png index b7a9bc16c..21f7fb7c8 100644 Binary files a/data/icons/status/channel/16_9_gray.png and b/data/icons/status/channel/16_9_gray.png differ diff --git a/data/icons/status/channel/ca2.png b/data/icons/status/channel/ca2.png index eb6b3ab86..6582f4b9a 100644 Binary files a/data/icons/status/channel/ca2.png and b/data/icons/status/channel/ca2.png differ diff --git a/data/icons/status/channel/ca2_gray.png b/data/icons/status/channel/ca2_gray.png index 32ee51233..bf5f60566 100644 Binary files a/data/icons/status/channel/ca2_gray.png and b/data/icons/status/channel/ca2_gray.png differ diff --git a/data/icons/status/channel/dd.png b/data/icons/status/channel/dd.png index fdbe8a184..af801a1c4 100644 Binary files a/data/icons/status/channel/dd.png and b/data/icons/status/channel/dd.png differ diff --git a/data/icons/status/channel/dd_avail.png b/data/icons/status/channel/dd_avail.png index ccef9ab69..79af185af 100644 Binary files a/data/icons/status/channel/dd_avail.png and b/data/icons/status/channel/dd_avail.png differ diff --git a/data/icons/status/channel/dd_gray.png b/data/icons/status/channel/dd_gray.png index 57453ccc5..276823e42 100644 Binary files a/data/icons/status/channel/dd_gray.png and b/data/icons/status/channel/dd_gray.png differ diff --git a/data/icons/status/channel/radiotextget.png b/data/icons/status/channel/radiotextget.png index 7948c469d..5af40d936 100644 Binary files a/data/icons/status/channel/radiotextget.png and b/data/icons/status/channel/radiotextget.png differ diff --git a/data/icons/status/channel/radiotextoff.png b/data/icons/status/channel/radiotextoff.png index e59953da0..c78523601 100644 Binary files a/data/icons/status/channel/radiotextoff.png and b/data/icons/status/channel/radiotextoff.png differ diff --git a/data/icons/status/channel/radiotextwait.png b/data/icons/status/channel/radiotextwait.png index 5bf8d6076..a96b7124c 100644 Binary files a/data/icons/status/channel/radiotextwait.png and b/data/icons/status/channel/radiotextwait.png differ diff --git a/data/icons/status/channel/res_000.png b/data/icons/status/channel/res_000.png index 0c69fd74a..58f3785a2 100644 Binary files a/data/icons/status/channel/res_000.png and b/data/icons/status/channel/res_000.png differ diff --git a/data/icons/status/channel/res_1080.png b/data/icons/status/channel/res_1080.png index 072c55929..044397cb9 100644 Binary files a/data/icons/status/channel/res_1080.png and b/data/icons/status/channel/res_1080.png differ diff --git a/data/icons/status/channel/res_1280.png b/data/icons/status/channel/res_1280.png index c75519a8d..d13a8d1ca 100644 Binary files a/data/icons/status/channel/res_1280.png and b/data/icons/status/channel/res_1280.png differ diff --git a/data/icons/status/channel/res_1440.png b/data/icons/status/channel/res_1440.png index cbddf2ea0..253d6ade4 100644 Binary files a/data/icons/status/channel/res_1440.png and b/data/icons/status/channel/res_1440.png differ diff --git a/data/icons/status/channel/res_1920.png b/data/icons/status/channel/res_1920.png index 34c4f819a..c9994dc1e 100644 Binary files a/data/icons/status/channel/res_1920.png and b/data/icons/status/channel/res_1920.png differ diff --git a/data/icons/status/channel/res_288.png b/data/icons/status/channel/res_288.png index 48adf4762..2e7b1dab8 100644 Binary files a/data/icons/status/channel/res_288.png and b/data/icons/status/channel/res_288.png differ diff --git a/data/icons/status/channel/res_352.png b/data/icons/status/channel/res_352.png index e4950b81e..0bc8d412f 100644 Binary files a/data/icons/status/channel/res_352.png and b/data/icons/status/channel/res_352.png differ diff --git a/data/icons/status/channel/res_382.png b/data/icons/status/channel/res_382.png index 4e546e7ca..71ac724e7 100644 Binary files a/data/icons/status/channel/res_382.png and b/data/icons/status/channel/res_382.png differ diff --git a/data/icons/status/channel/res_480.png b/data/icons/status/channel/res_480.png index 7cb2c1bbc..ce78e7cbe 100644 Binary files a/data/icons/status/channel/res_480.png and b/data/icons/status/channel/res_480.png differ diff --git a/data/icons/status/channel/res_528.png b/data/icons/status/channel/res_528.png index 2efc99547..5f6914b78 100644 Binary files a/data/icons/status/channel/res_528.png and b/data/icons/status/channel/res_528.png differ diff --git a/data/icons/status/channel/res_544.png b/data/icons/status/channel/res_544.png index 75c5338c0..0489b9664 100644 Binary files a/data/icons/status/channel/res_544.png and b/data/icons/status/channel/res_544.png differ diff --git a/data/icons/status/channel/res_576.png b/data/icons/status/channel/res_576.png index 4e68aa9fd..f171387ef 100644 Binary files a/data/icons/status/channel/res_576.png and b/data/icons/status/channel/res_576.png differ diff --git a/data/icons/status/channel/res_704.png b/data/icons/status/channel/res_704.png index 8d0069e86..4086c8c73 100644 Binary files a/data/icons/status/channel/res_704.png and b/data/icons/status/channel/res_704.png differ diff --git a/data/icons/status/channel/res_720.png b/data/icons/status/channel/res_720.png index e806d1d74..694a7a790 100644 Binary files a/data/icons/status/channel/res_720.png and b/data/icons/status/channel/res_720.png differ diff --git a/data/icons/status/channel/res_hd.png b/data/icons/status/channel/res_hd.png index 6be2c48c7..c70fe0c54 100644 Binary files a/data/icons/status/channel/res_hd.png and b/data/icons/status/channel/res_hd.png differ diff --git a/data/icons/status/channel/res_sd.png b/data/icons/status/channel/res_sd.png index 3f0848993..67ffccf53 100644 Binary files a/data/icons/status/channel/res_sd.png and b/data/icons/status/channel/res_sd.png differ diff --git a/data/icons/status/channel/subt.png b/data/icons/status/channel/subt.png index cf2cec1ab..7cc7d8395 100644 Binary files a/data/icons/status/channel/subt.png and b/data/icons/status/channel/subt.png differ diff --git a/data/icons/status/channel/subt_gray.png b/data/icons/status/channel/subt_gray.png index 71edc56c3..c3745be2a 100644 Binary files a/data/icons/status/channel/subt_gray.png and b/data/icons/status/channel/subt_gray.png differ diff --git a/data/icons/status/channel/tuner_1.png b/data/icons/status/channel/tuner_1.png index 27f599886..659a16bae 100644 Binary files a/data/icons/status/channel/tuner_1.png and b/data/icons/status/channel/tuner_1.png differ diff --git a/data/icons/status/channel/tuner_2.png b/data/icons/status/channel/tuner_2.png index af38d4ad8..a0b2f2640 100644 Binary files a/data/icons/status/channel/tuner_2.png and b/data/icons/status/channel/tuner_2.png differ diff --git a/data/icons/status/channel/tuner_3.png b/data/icons/status/channel/tuner_3.png index 04bc57c03..b2d5db40d 100644 Binary files a/data/icons/status/channel/tuner_3.png and b/data/icons/status/channel/tuner_3.png differ diff --git a/data/icons/status/channel/tuner_4.png b/data/icons/status/channel/tuner_4.png index e7b9ed8cc..6e77ef1e9 100644 Binary files a/data/icons/status/channel/tuner_4.png and b/data/icons/status/channel/tuner_4.png differ diff --git a/data/icons/status/channel/vtxt.png b/data/icons/status/channel/vtxt.png index 30902f56a..911544425 100644 Binary files a/data/icons/status/channel/vtxt.png and b/data/icons/status/channel/vtxt.png differ diff --git a/data/icons/status/channel/vtxt_gray.png b/data/icons/status/channel/vtxt_gray.png index 11e12e1e6..411234025 100644 Binary files a/data/icons/status/channel/vtxt_gray.png and b/data/icons/status/channel/vtxt_gray.png differ diff --git a/data/icons/status/info/info0_off.png b/data/icons/status/info/info0_off.png index 326bf85ce..7c64b5dd5 100644 Binary files a/data/icons/status/info/info0_off.png and b/data/icons/status/info/info0_off.png differ diff --git a/data/icons/status/info/info0_on.png b/data/icons/status/info/info0_on.png index 8eafea85b..7b65a3d52 100644 Binary files a/data/icons/status/info/info0_on.png and b/data/icons/status/info/info0_on.png differ diff --git a/data/icons/status/info/info1_off.png b/data/icons/status/info/info1_off.png index b982ad56d..76616a7c3 100644 Binary files a/data/icons/status/info/info1_off.png and b/data/icons/status/info/info1_off.png differ diff --git a/data/icons/status/info/info1_on.png b/data/icons/status/info/info1_on.png index 1686c4cdf..4aa0d4c93 100644 Binary files a/data/icons/status/info/info1_on.png and b/data/icons/status/info/info1_on.png differ diff --git a/data/icons/status/info/info2_off.png b/data/icons/status/info/info2_off.png index 9495ca8cc..82238c7b9 100644 Binary files a/data/icons/status/info/info2_off.png and b/data/icons/status/info/info2_off.png differ diff --git a/data/icons/status/info/info2_on.png b/data/icons/status/info/info2_on.png index 9f785c142..e1a9ea85e 100644 Binary files a/data/icons/status/info/info2_on.png and b/data/icons/status/info/info2_on.png differ diff --git a/data/icons/status/info/info3_off.png b/data/icons/status/info/info3_off.png index d862ba8b4..a4e4e7298 100644 Binary files a/data/icons/status/info/info3_off.png and b/data/icons/status/info/info3_off.png differ diff --git a/data/icons/status/info/info3_on.png b/data/icons/status/info/info3_on.png index 7b84b8c30..fdba93485 100644 Binary files a/data/icons/status/info/info3_on.png and b/data/icons/status/info/info3_on.png differ diff --git a/data/icons/status/markers/checkmark.png b/data/icons/status/markers/checkmark.png index 59495a665..ad1484767 100644 Binary files a/data/icons/status/markers/checkmark.png and b/data/icons/status/markers/checkmark.png differ diff --git a/data/icons/status/markers/important.png b/data/icons/status/markers/important.png index 2b3d4f05b..9732d27f4 100644 Binary files a/data/icons/status/markers/important.png and b/data/icons/status/markers/important.png differ diff --git a/data/icons/status/markers/warning.png b/data/icons/status/markers/warning.png index 374193eec..9732d27f4 100644 Binary files a/data/icons/status/markers/warning.png and b/data/icons/status/markers/warning.png differ diff --git a/data/icons/status/progress/progressbar.png b/data/icons/status/progress/progressbar.png index 5b622a695..6cace64c5 100644 Binary files a/data/icons/status/progress/progressbar.png and b/data/icons/status/progress/progressbar.png differ diff --git a/data/icons/status/progress/progressbar_inactive_passive.png b/data/icons/status/progress/progressbar_inactive_passive.png index 2c983a0ee..c3db36e7d 100644 Binary files a/data/icons/status/progress/progressbar_inactive_passive.png and b/data/icons/status/progress/progressbar_inactive_passive.png differ diff --git a/data/icons/status/progress/progressbar_passive.png b/data/icons/status/progress/progressbar_passive.png index 5a576095e..4d6986914 100644 Binary files a/data/icons/status/progress/progressbar_passive.png and b/data/icons/status/progress/progressbar_passive.png differ diff --git a/data/icons/status/progress/volumebar.png b/data/icons/status/progress/volumebar.png index 5b622a695..6cace64c5 100644 Binary files a/data/icons/status/progress/volumebar.png and b/data/icons/status/progress/volumebar.png differ diff --git a/data/icons/status/progress/volumebar_passive.png b/data/icons/status/progress/volumebar_passive.png index 5a576095e..4d6986914 100644 Binary files a/data/icons/status/progress/volumebar_passive.png and b/data/icons/status/progress/volumebar_passive.png differ diff --git a/data/icons/status/various/ats.png b/data/icons/status/various/ats.png index deff86f74..debacf5b8 100644 Binary files a/data/icons/status/various/ats.png and b/data/icons/status/various/ats.png differ diff --git a/data/icons/status/various/ats_gray.png b/data/icons/status/various/ats_gray.png index 7262cd2f8..904dd83b6 100644 Binary files a/data/icons/status/various/ats_gray.png and b/data/icons/status/various/ats_gray.png differ diff --git a/data/icons/status/various/ca.png b/data/icons/status/various/ca.png index 39e64d26f..21ba92179 100644 Binary files a/data/icons/status/various/ca.png and b/data/icons/status/various/ca.png differ diff --git a/data/icons/status/various/epg.png b/data/icons/status/various/epg.png index 0dea572be..3fc0af2fc 100644 Binary files a/data/icons/status/various/epg.png and b/data/icons/status/various/epg.png differ diff --git a/data/icons/status/various/hidden.png b/data/icons/status/various/hidden.png index 6b812b4e2..f228b94cf 100644 Binary files a/data/icons/status/various/hidden.png and b/data/icons/status/various/hidden.png differ diff --git a/data/icons/status/various/lock.png b/data/icons/status/various/lock.png index 318dd599d..1127f87f7 100644 Binary files a/data/icons/status/various/lock.png and b/data/icons/status/various/lock.png differ diff --git a/data/icons/status/various/lock_passive.png b/data/icons/status/various/lock_passive.png index 7622dd82e..3f47b54cf 100644 Binary files a/data/icons/status/various/lock_passive.png and b/data/icons/status/various/lock_passive.png differ diff --git a/data/icons/status/various/mounted.png b/data/icons/status/various/mounted.png index c730d0f54..6d84e1431 100644 Binary files a/data/icons/status/various/mounted.png and b/data/icons/status/various/mounted.png differ diff --git a/data/icons/status/various/mute.png b/data/icons/status/various/mute.png index e4fc76925..732a1c0f4 100644 Binary files a/data/icons/status/various/mute.png and b/data/icons/status/various/mute.png differ diff --git a/data/icons/status/various/not_mounted.png b/data/icons/status/various/not_mounted.png index 30f909884..af7f8288d 100644 Binary files a/data/icons/status/various/not_mounted.png and b/data/icons/status/various/not_mounted.png differ diff --git a/data/icons/status/various/pip.png b/data/icons/status/various/pip.png index 101a2b254..96b5ed3f4 100644 Binary files a/data/icons/status/various/pip.png and b/data/icons/status/various/pip.png differ diff --git a/data/icons/status/various/rclock.png b/data/icons/status/various/rclock.png index 1736df521..ad8d91a99 100644 Binary files a/data/icons/status/various/rclock.png and b/data/icons/status/various/rclock.png differ diff --git a/data/icons/status/various/rec.png b/data/icons/status/various/rec.png index 7581979a5..fa1d7fb13 100644 Binary files a/data/icons/status/various/rec.png and b/data/icons/status/various/rec.png differ diff --git a/data/icons/status/various/rec_event_marker.png b/data/icons/status/various/rec_event_marker.png index b2d10d404..de892814b 100644 Binary files a/data/icons/status/various/rec_event_marker.png and b/data/icons/status/various/rec_event_marker.png differ diff --git a/data/icons/status/various/rec_gray.png b/data/icons/status/various/rec_gray.png index 265b0621d..0b0d6fd7f 100644 Binary files a/data/icons/status/various/rec_gray.png and b/data/icons/status/various/rec_gray.png differ diff --git a/data/icons/status/various/zap.png b/data/icons/status/various/zap.png index e82e6f6c6..4c39afd0c 100644 Binary files a/data/icons/status/various/zap.png and b/data/icons/status/various/zap.png differ diff --git a/data/icons/various/imdb.png b/data/icons/various/imdb.png index 2476cf7f6..49bcc4c47 100644 Binary files a/data/icons/various/imdb.png and b/data/icons/various/imdb.png differ diff --git a/data/icons/various/star-off.png b/data/icons/various/star-off.png index d40be7f27..9b6f44ec5 100644 Binary files a/data/icons/various/star-off.png and b/data/icons/various/star-off.png differ diff --git a/data/icons/various/star-on.png b/data/icons/various/star-on.png index dec690428..06c15185f 100644 Binary files a/data/icons/various/star-on.png and b/data/icons/various/star-on.png differ diff --git a/data/icons/various/stars.png b/data/icons/various/stars.png index b6189f1db..affa178b9 100644 Binary files a/data/icons/various/stars.png and b/data/icons/various/stars.png differ diff --git a/data/icons/various/stars_bg.png b/data/icons/various/stars_bg.png index be87f9d2c..ee4b28c02 100644 Binary files a/data/icons/various/stars_bg.png and b/data/icons/various/stars_bg.png differ diff --git a/data/icons/various/tmdb.png b/data/icons/various/tmdb.png index a38816732..d1c6bba04 100644 Binary files a/data/icons/various/tmdb.png and b/data/icons/various/tmdb.png differ diff --git a/data/icons/various/volume.png b/data/icons/various/volume.png index 985a013ea..2c6624668 100644 Binary files a/data/icons/various/volume.png and b/data/icons/various/volume.png differ diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index feae0a203..cc4a0e127 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -888,7 +888,7 @@ infoicons_switch_on Infoicons einblenden infoviewer.epgnotload Informationen noch nicht geladen ... infoviewer.epgwait Warte auf EPG-Informationen ... infoviewer.iconset Iconset -infoviewer.iconset_pkg0 Original +infoviewer.iconset_pkg0 NI-Material-Design infoviewer.iconset_pkg1 NI-Dark infoviewer.iconset_pkg2 NI-Bright infoviewer.iconset_pkg3 NI-Flat @@ -2560,6 +2560,7 @@ subtitles.head Untertitel subtitles.stop Untertitel aus terrestrialsetup.area Region terrestrialsetup.provider DVB-T Versorgungsbereich +testmenu Testmenü timer.eventrecord.msg Die Sendung wurde zur Aufnahme vorgemerkt. timer.eventrecord.title Aufnahme vormerken timer.eventtimed.msg Die Sendung wurde vorgemerkt. diff --git a/data/locale/english.locale b/data/locale/english.locale index dc0a4377a..87b3211b0 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -888,7 +888,7 @@ infoicons_switch_on Infoicons on infoviewer.epgnotload EPG not loaded ... infoviewer.epgwait waiting for EPG ... infoviewer.iconset Iconset -infoviewer.iconset_pkg0 Original +infoviewer.iconset_pkg0 NI-Material-Design infoviewer.iconset_pkg1 NI-Dark infoviewer.iconset_pkg2 NI-Bright infoviewer.iconset_pkg3 NI-Flat @@ -2559,6 +2559,7 @@ subtitles.head Subtitles subtitles.stop Stop subtitles terrestrialsetup.area Area terrestrialsetup.provider Terrestrial Provider +testmenu Testmenu timer.eventrecord.msg The event is scheduled for recording.\nTo edit the schedule open the timer list. timer.eventrecord.title Schedule Record timer.eventtimed.msg The event is scheduled.\nThe box will power on and \nswitch to this channel at the given time. diff --git a/src/driver/record.cpp b/src/driver/record.cpp index 9e06bcee2..4479999ef 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -1453,7 +1453,7 @@ int CRecordManager::exec(CMenuTarget* parent, const std::string & actionKey ) inst->GetRecordString(title, duration); title += duration; tostart = (ShowMsg(LOCALE_RECORDING_IS_RUNNING, title.c_str(), - CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, 30) == CMsgBox::mbrYes); + CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, DEFAULT_TIMEOUT) == CMsgBox::mbrYes); } //NI if (g_settings.recording_startstop_msg) { diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 36302e921..d5efec809 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -122,10 +122,10 @@ libneutrino_gui_a_SOURCES += \ update_ext.cpp endif -if ENABLE_TESTING +#NI if ENABLE_TESTING libneutrino_gui_a_SOURCES += \ test_menu.cpp -endif +#NI endif libneutrino_gui2_a_SOURCES = \ cam_menu.cpp \ diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 8f0a3beb5..db3800c6d 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1541,24 +1541,23 @@ void CChannelList::paintDetails(int index) int ypos = y + height + OFFSET_INTER; int ypos_a = ypos + OFFSET_INNER_SMALL; - CChannelEvent *p_event = NULL; - - //colored_events init - bool colored_event_C = (g_settings.theme.colored_events_channellist == 1); - bool colored_event_N = (g_settings.theme.colored_events_channellist == 2); - frameBuffer->paintBoxRel(x, ypos, full_width, info_height, COL_MENUCONTENTDARK_PLUS_0, RADIUS_LARGE); frameBuffer->paintBoxFrame(x, ypos, full_width, info_height, 1, COL_FRAME_PLUS_0, RADIUS_LARGE); //NI if ((*chanlist).empty()) return; + //colored_events init + bool colored_event_C = (g_settings.theme.colored_events_channellist == 1); + bool colored_event_N = (g_settings.theme.colored_events_channellist == 2); + + CChannelEvent *p_event = NULL; if (displayNext) p_event = &(*chanlist)[index]->nextEvent; else p_event = &(*chanlist)[index]->currentEvent; - if (/* !IS_WEBTV((*chanlist)[index]->getChannelID()) && */ !p_event->description.empty()) { + if (/* !IS_WEBTV((*chanlist)[index]->getChannelID()) && */ p_event && !p_event->description.empty()) { char cNoch[50] = {0}; // UTF-8 char cSeit[50] = {0}; // UTF-8 @@ -1625,7 +1624,7 @@ void CChannelList::paintDetails(int index) else if (IS_WEBTV((*chanlist)[index]->getChannelID())) { g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, ypos_a + fheight, full_width - 30, (*chanlist)[index]->getDesc(), colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_MENUCONTENTDARK_TEXT, 0, true); } - if (IS_WEBTV((*chanlist)[index]->getChannelID())) { + if (g_settings.channellist_foot == 0 && IS_WEBTV((*chanlist)[index]->getChannelID())) { g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, ypos_a + 2*fheight + fdescrheight, full_width - 30, (*chanlist)[index]->getUrl(), COL_MENUCONTENTDARK_TEXT, 0, true); } else if(g_settings.channellist_foot == 0) { transponder t; @@ -1642,7 +1641,7 @@ void CChannelList::paintDetails(int index) else if( !displayNext && g_settings.channellist_foot == 1) { // next Event CSectionsdClient::CurrentNextInfo CurrentNext; - CEitManager::getInstance()->getCurrentNextServiceKey((*chanlist)[index]->getChannelID(), CurrentNext); + CEitManager::getInstance()->getCurrentNextServiceKey((*chanlist)[index]->getEpgID(), CurrentNext); if (!CurrentNext.next_name.empty()) { char buf[128] = {0}; char cFrom[50] = {0}; // UTF-8 diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp index 0261daf54..bc2b1be35 100644 --- a/src/gui/components/cc_frm_header.cpp +++ b/src/gui/components/cc_frm_header.cpp @@ -93,12 +93,10 @@ void CComponentsHeader::initVarHeader( const int& x_pos, const int& y_pos, const //init header width width = width_old = w == 0 ? frameBuffer->getScreenWidth(true) : w; + height = height_old = h; - //init header default height - height = height_old = max(h, g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight()); - - cch_size_mode = CC_HEADER_SIZE_LARGE; - initCaptionFont(); //sets cch_font and calculate height if required; + cch_font = NULL; + cch_size_mode = CC_HEADER_SIZE_LARGE; shadow = shadow_mode; col_frame = col_frame_old = color_frame; @@ -160,15 +158,15 @@ void CComponentsHeader::setCaption(neutrino_locale_t caption_locale, const int& void CComponentsHeader::setCaptionFont(Font* font) { - initCaptionFont(font); //cch_font = font + cch_font = font; } -void CComponentsHeader::initCaptionFont(Font* font) +void CComponentsHeader::initCaptionFont() { Font *l_font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]; Font *s_font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]; - if (font == NULL){ + if (cch_font == NULL){ cch_font = (cch_size_mode == CC_HEADER_SIZE_LARGE? l_font : s_font); //select matching height @@ -177,10 +175,8 @@ void CComponentsHeader::initCaptionFont(Font* font) else height = std::min(height, s_font->getHeight()); } - else{ - cch_font = font; + else height = std::max(height, cch_font->getHeight()); - } } void CComponentsHeader::setIcon(const char* icon_name) @@ -513,12 +509,12 @@ void CComponentsHeader::initCaption() void CComponentsHeader::initCCItems() { - //set basic properties - Init(x, y, width, height, col_frame, col_body, col_shadow); - //set size initCaptionFont(); + //set basic properties + Init(x, y, width, height, col_frame, col_body, col_shadow); + //init icon initIcon(); diff --git a/src/gui/components/cc_frm_header.h b/src/gui/components/cc_frm_header.h index b3f185e68..d091e800f 100644 --- a/src/gui/components/cc_frm_header.h +++ b/src/gui/components/cc_frm_header.h @@ -99,7 +99,7 @@ class CComponentsHeader : public CComponentsForm, public CCTextScreen bool cch_cl_enable_run; ///init font object and recalculates height if required - void initCaptionFont(Font* font = NULL); + void initCaptionFont(); ///sub: init icon object void initIcon(); ///sub: init caption object @@ -136,13 +136,44 @@ class CComponentsHeader : public CComponentsForm, public CCTextScreen virtual void setCaption(neutrino_locale_t caption_locale, const int& align_mode = CTextBox::NO_AUTO_LINEBREAK, const fb_pixel_t& text_color = COL_MENUHEAD_TEXT); ///set alignment of caption within header, possible paramters are CTextBox::CENTER, CTextBox::NO_AUTO_LINEBREAK - virtual void setCaptionAlignment(const int& align_mode){cch_caption_align = align_mode;}; - ///set text font object for caption + virtual void setCaptionAlignment(const int& align_mode){cch_caption_align = align_mode;} + + /**Set text font for title. + * Internal default font is g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE] and + * default height of header object is calculated from this font type. + * Height can be changed with modes by setSizeMode(), setHeight() or constructor. + * @return void + * + * @param[in] font exepts font object, type Font* + * @see getCaptionFont(), setSizeMode(), + * setCaptionColor(), + * setCaptionAlignment(), + * setCaption() + */ virtual void setCaptionFont(Font* font); ///returns font object of title caption - virtual Font* getCaptionFont(){return cch_font;}; + virtual Font* getCaptionFont(){return cch_font;} ///set text color for caption - virtual void setCaptionColor(fb_pixel_t text_color){cch_col_text = text_color;}; + virtual void setCaptionColor(fb_pixel_t text_color){cch_col_text = text_color;} + + enum + { + CC_HEADER_SIZE_LARGE = 0, + CC_HEADER_SIZE_SMALL = 1 + }; + /**Set size mode of header. + * These modes are using fonts SNeutrinoSettings::FONT_TYPE_MENU_TITLE for large mode (default) + * and SNeutrinoSettings::FONT_TYPE_MENU for small mode to set required height. + * If other size wanted then use set setCaptionFont() and setHeight() + * @return void + * + * @param[in] size_mode exepts type int (enums) + * possible modes are: + * CC_HEADER_SIZE_LARGE + * CC_HEADER_SIZE_SMALL + * @see setCaption(), setHeight() + */ + virtual void setSizeMode(const int& size_mode){cch_size_mode = size_mode; initCCItems();} ///set offset between items virtual void setOffset(const int offset){cch_offset = offset;}; @@ -198,14 +229,6 @@ class CComponentsHeader : public CComponentsForm, public CCTextScreen ///set offset between icons within context button object virtual void setButtonsSpace(const int buttons_space){cch_buttons_space = buttons_space;} - enum - { - CC_HEADER_SIZE_LARGE = 0, - CC_HEADER_SIZE_SMALL = 1 - }; - ///set size of header, possible values are CC_HEADER_SIZE_LARGE, CC_HEADER_SIZE_SMALL - virtual void setSizeMode(const int& size_mode){cch_size_mode = size_mode; initCCItems();} - ///init all items within header object virtual void initCCItems(); ///returns the text object diff --git a/src/gui/infoicons.cpp b/src/gui/infoicons.cpp index c378c7b77..a8191b1d3 100644 --- a/src/gui/infoicons.cpp +++ b/src/gui/infoicons.cpp @@ -112,14 +112,10 @@ void CInfoIcons::Init() { int icon_sizeW = 0; int icon_sizeH = 0; - buf.str(""); - buf << ICONSDIR << "/" << icon[i].name << "_on.png"; // we assume the _off-partner exist and has same dimensions - if (access(buf.str().c_str(), F_OK) == 0) { - buf.str(""); - buf << icon[i].name << "_on"; - frameBuffer->getIconSize(buf.str().c_str(), &icon_sizeW, &icon_sizeH); - } + buf.str(""); + buf << icon[i].name << "_on"; + frameBuffer->getIconSize(buf.str().c_str(), &icon_sizeW, &icon_sizeH); if (icon_sizeW && icon_sizeH) { diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index c5c4e5a18..895154b58 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -89,7 +89,8 @@ CInfoViewerBB::CInfoViewerBB() bbIconInfo[0].h = 0; BBarY = 0; BBarFontY = 0; - foot = cabar = NULL; + foot = NULL; + ca_bar = NULL; Init(); } @@ -482,7 +483,7 @@ void CInfoViewerBB::paintshowButtonBar() g_InfoViewer->sec_timer_id = g_RCInput->addTimer(1*1000*1000, false); if (g_settings.infobar_casystem_display < 2) - paintCA_bar(0,0); + paint_ca_bar(); paintFoot(); @@ -862,13 +863,6 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst) } if(!notfirst) { -#if 0 - static int icon_space_offset = 0; - if ((g_settings.infobar_casystem_display == 1) && (icon_space_offset)) { - paintCA_bar(0,icon_space_offset); - icon_space_offset = 0; - } -#endif //NI - check ecm.info acaid = check_ecmInfo(); if(acaid == 0){ @@ -916,52 +910,37 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst) } } -void CInfoViewerBB::paintCA_bar(int left, int right) +void CInfoViewerBB::paint_ca_bar() { initBBOffset(); - int xcnt = (g_InfoViewer->BoxEndX - g_InfoViewer->ChanInfoX - (g_settings.infobar_casystem_frame ? 24 : 0)) / 4; - int ycnt = (bottom_bar_offset - (g_settings.infobar_casystem_frame ? 14 : 0)) / 4; int ca_width = g_InfoViewer->BoxEndX - g_InfoViewer->ChanInfoX; - if (right) - right = xcnt - ((right/4)+1); - if (left) - left = xcnt - ((left/4)-1); - - if (g_settings.infobar_casystem_frame) { // with highlighted frame - if (!right || !left) { // paint full bar - // framed ca bar - if (cabar == NULL) - cabar = new CComponentsShapeSquare(g_InfoViewer->ChanInfoX+11, g_InfoViewer->BoxEndY+1, ca_width-22 , bottom_bar_offset-11 , NULL, CC_SHADOW_ON, COL_INFOBAR_CASYSTEM_PLUS_2, COL_INFOBAR_CASYSTEM_PLUS_0); - //cabar->setCorner(RADIUS_SMALL, CORNER_ALL); - cabar->enableShadow(CC_SHADOW_ON, 3, true); - cabar->setFrameThickness(2); - -// cabar->paint(CC_SAVE_SCREEN_NO); - }else{ //TODO: remove this part, cabar object can do this - if (cabar == NULL) - cabar = new CComponentsShapeSquare(g_InfoViewer->ChanInfoX, g_InfoViewer->BoxEndY, ca_width , bottom_bar_offset-11, NULL, CC_SHADOW_OFF, COL_INFOBAR_CASYSTEM_PLUS_2); - //cabar->setCorner(RADIUS_SMALL, CORNER_ALL); - cabar->disableShadow(); - cabar->setFrameThickness(2); - cabar->setColorBody(COL_INFOBAR_CASYSTEM_PLUS_0); - } - cabar->setFrameThickness(2); - cabar->setCorner(RADIUS_SMALL, CORNER_ALL); - cabar->paint(CC_SAVE_SCREEN_NO); + if (g_settings.infobar_casystem_frame) + { + if (ca_bar == NULL) + ca_bar = new CComponentsShapeSquare(g_InfoViewer->ChanInfoX + OFFSET_INNER_MID, g_InfoViewer->BoxEndY, ca_width - 2*OFFSET_INNER_MID, bottom_bar_offset - OFFSET_INNER_MID, NULL, CC_SHADOW_ON, COL_INFOBAR_CASYSTEM_PLUS_2, COL_INFOBAR_CASYSTEM_PLUS_0); + ca_bar->enableShadow(CC_SHADOW_ON, OFFSET_SHADOW/2, true); + ca_bar->setFrameThickness(1); //NI + ca_bar->setCorner(RADIUS_SMALL, CORNER_ALL); + ca_bar->paint(CC_SAVE_SCREEN_NO); } else + { paintBoxRel(g_InfoViewer->ChanInfoX, g_InfoViewer->BoxEndY, ca_width , bottom_bar_offset, COL_INFOBAR_CASYSTEM_PLUS_0); -#if 1 - if (!g_settings.infobar_casystem_dotmatrix) //don't show dotmatrix - return; + } +//NI +#if 0 + if (g_settings.infobar_casystem_dotmatrix) + { + int xcnt = (g_InfoViewer->BoxEndX - g_InfoViewer->ChanInfoX - (g_settings.infobar_casystem_frame ? 24 : 0)) / 4; + int ycnt = (bottom_bar_offset - (g_settings.infobar_casystem_frame ? 14 : 0)) / 4; - if (left) - left -= 1; - - for (int i = 0 + right; i < xcnt - left; i++) { - for (int j = 0; j < ycnt; j++) { - frameBuffer->paintBoxRel((g_InfoViewer->ChanInfoX + (g_settings.infobar_casystem_frame ? 14 : 2)) + i*4, g_InfoViewer->BoxEndY + (g_settings.infobar_casystem_frame ? 4 : 2) + j*4, 2, 2, COL_INFOBAR_PLUS_1); + for (int i = 0; i < xcnt; i++) + { + for (int j = 0; j < ycnt; j++) + { + frameBuffer->paintBoxRel((g_InfoViewer->ChanInfoX + (g_settings.infobar_casystem_frame ? 14 : 2)) + i*4, g_InfoViewer->BoxEndY + (g_settings.infobar_casystem_frame ? 4 : 2) + j*4, 2, 2, COL_INFOBAR_PLUS_1); + } } } #endif @@ -999,14 +978,14 @@ void CInfoViewerBB::ResetModules() if (foot){ delete foot; foot = NULL; } - if (cabar){ - delete cabar; cabar = NULL; + if (ca_bar){ + delete ca_bar; ca_bar = NULL; } } void CInfoViewerBB::initBBOffset() { - bottom_bar_offset = (g_settings.infobar_casystem_display < 2) ? (g_settings.infobar_casystem_frame ? 36 : 22) : 0; + bottom_bar_offset = (g_settings.infobar_casystem_display < 2) ? (g_settings.infobar_casystem_frame ? 38 : 24) : 0; //NI } void* CInfoViewerBB::scrambledThread(void *arg) diff --git a/src/gui/infoviewer_bb.h b/src/gui/infoviewer_bb.h index d7645291f..202296d38 100644 --- a/src/gui/infoviewer_bb.h +++ b/src/gui/infoviewer_bb.h @@ -117,14 +117,14 @@ class CInfoViewerBB pthread_t scrambledT; CProgressBar *hddscale, *sysscale; - CComponentsShapeSquare *foot, *cabar; + CComponentsShapeSquare *foot, *ca_bar; void paintFoot(int w = 0); void showBBIcons(const int modus, const std::string & icon); void getBBIconInfo(void); bool checkBBIcon(const char * const icon, int *w, int *h); void paint_ca_icons(int, const char*, int&); - void paintCA_bar(int,int); + void paint_ca_bar(); void showOne_CAIcon(); static void* scrambledThread(void *arg); @@ -159,7 +159,7 @@ class CInfoViewerBB void initBBOffset(void); // modules CComponentsShapeSquare* getFooter(void){return foot;} - CComponentsShapeSquare* getCABar(void){return cabar;} + CComponentsShapeSquare* getCABar(void){return ca_bar;} void ResetModules(void); void changePB(void); }; diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index f3f8cbefb..d2e094f49 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -1215,7 +1215,8 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar) mc->OnAfterChangeOption.connect(slot_ibar); mc->setHint("", LOCALE_MENU_HINT_INFOBAR_CASYS); menu_infobar->addItem(mc); -#if 1 +//NI +#if 0 // CA system dotmatrix mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DOTMATRIX, &g_settings.infobar_casystem_dotmatrix, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.infobar_casystem_display < 2); mc->setHint("", LOCALE_MENU_HINT_INFOBAR_CASYS_DOTMATRIX); diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp index 39ec9c4d8..4c7df9c1c 100644 --- a/src/gui/themes.cpp +++ b/src/gui/themes.cpp @@ -325,93 +325,93 @@ void CThemes::setTheme(CConfigFile &configfile) void CThemes::getTheme(CConfigFile &configfile) { - t.menu_Head_alpha = configfile.getInt32( "menu_Head_alpha", 0x08 ); - t.menu_Head_red = configfile.getInt32( "menu_Head_red", 0x00 ); - t.menu_Head_green = configfile.getInt32( "menu_Head_green", 0x00 ); - t.menu_Head_blue = configfile.getInt32( "menu_Head_blue", 0x00 ); - t.menu_Head_Text_alpha = configfile.getInt32( "menu_Head_Text_alpha", 0x00 ); - t.menu_Head_Text_red = configfile.getInt32( "menu_Head_Text_red", 0x5f ); - t.menu_Head_Text_green = configfile.getInt32( "menu_Head_Text_green", 0x46 ); - t.menu_Head_Text_blue = configfile.getInt32( "menu_Head_Text_blue", 0x00 ); + t.menu_Head_alpha = configfile.getInt32( "menu_Head_alpha", 10 ); + t.menu_Head_red = configfile.getInt32( "menu_Head_red", 0 ); + t.menu_Head_green = configfile.getInt32( "menu_Head_green", 0 ); + t.menu_Head_blue = configfile.getInt32( "menu_Head_blue", 0 ); + t.menu_Head_Text_alpha = configfile.getInt32( "menu_Head_Text_alpha", 0 ); + t.menu_Head_Text_red = configfile.getInt32( "menu_Head_Text_red", 99 ); + t.menu_Head_Text_green = configfile.getInt32( "menu_Head_Text_green", 43 ); + t.menu_Head_Text_blue = configfile.getInt32( "menu_Head_Text_blue", 7 ); - t.menu_Head_gradient = configfile.getInt32( "menu_Head_gradient", CC_COLGRAD_COL_B_2_COL_A); + t.menu_Head_gradient = configfile.getInt32( "menu_Head_gradient", CC_COLGRAD_OFF); t.menu_Head_gradient_direction = configfile.getInt32( "menu_Head_gradient_direction", CFrameBuffer::gradientVertical); t.menu_Separator_gradient_enable = configfile.getInt32( "menu_Separator_gradient_enable", 0); - t.menu_Content_alpha = configfile.getInt32( "menu_Content_alpha", 0x08 ); - t.menu_Content_red = configfile.getInt32( "menu_Content_red", 0x0c ); - t.menu_Content_green = configfile.getInt32( "menu_Content_green", 0x0c ); - t.menu_Content_blue = configfile.getInt32( "menu_Content_blue", 0x0c ); - t.menu_Content_Text_alpha = configfile.getInt32( "menu_Content_Text_alpha", 0x00 ); - t.menu_Content_Text_red = configfile.getInt32( "menu_Content_Text_red", 0x64 ); - t.menu_Content_Text_green = configfile.getInt32( "menu_Content_Text_green", 0x64 ); - t.menu_Content_Text_blue = configfile.getInt32( "menu_Content_Text_blue", 0x64 ); - t.menu_Content_Selected_alpha = configfile.getInt32( "menu_Content_Selected_alpha", 0x08 ); - t.menu_Content_Selected_red = configfile.getInt32( "menu_Content_Selected_red", 0x5f ); - t.menu_Content_Selected_green = configfile.getInt32( "menu_Content_Selected_green", 0x46 ); - t.menu_Content_Selected_blue = configfile.getInt32( "menu_Content_Selected_blue", 0x00 ); - t.menu_Content_Selected_Text_alpha = configfile.getInt32( "menu_Content_Selected_Text_alpha", 0x00 ); - t.menu_Content_Selected_Text_red = configfile.getInt32( "menu_Content_Selected_Text_red", 0x00 ); - t.menu_Content_Selected_Text_green = configfile.getInt32( "menu_Content_Selected_Text_green", 0x00 ); - t.menu_Content_Selected_Text_blue = configfile.getInt32( "menu_Content_Selected_Text_blue", 0x00 ); - t.menu_Content_inactive_alpha = configfile.getInt32( "menu_Content_inactive_alpha", 0x08 ); - t.menu_Content_inactive_red = configfile.getInt32( "menu_Content_inactive_red", 0x0c ); - t.menu_Content_inactive_green = configfile.getInt32( "menu_Content_inactive_green", 0x0c ); - t.menu_Content_inactive_blue = configfile.getInt32( "menu_Content_inactive_blue", 0x0c ); - t.menu_Content_inactive_Text_alpha = configfile.getInt32( "menu_Content_inactive_Text_alpha", 0x00 ); - t.menu_Content_inactive_Text_red = configfile.getInt32( "menu_Content_inactive_Text_red", 50 ); - t.menu_Content_inactive_Text_green = configfile.getInt32( "menu_Content_inactive_Text_green", 50 ); - t.menu_Content_inactive_Text_blue = configfile.getInt32( "menu_Content_inactive_Text_blue", 50 ); + t.menu_Content_alpha = configfile.getInt32( "menu_Content_alpha", 10 ); + t.menu_Content_red = configfile.getInt32( "menu_Content_red", 13 ); + t.menu_Content_green = configfile.getInt32( "menu_Content_green", 13 ); + t.menu_Content_blue = configfile.getInt32( "menu_Content_blue", 13 ); + t.menu_Content_Text_alpha = configfile.getInt32( "menu_Content_Text_alpha", 0 ); + t.menu_Content_Text_red = configfile.getInt32( "menu_Content_Text_red", 98 ); + t.menu_Content_Text_green = configfile.getInt32( "menu_Content_Text_green", 98 ); + t.menu_Content_Text_blue = configfile.getInt32( "menu_Content_Text_blue", 98 ); + t.menu_Content_Selected_alpha = configfile.getInt32( "menu_Content_Selected_alpha", 10 ); + t.menu_Content_Selected_red = configfile.getInt32( "menu_Content_Selected_red", 99 ); + t.menu_Content_Selected_green = configfile.getInt32( "menu_Content_Selected_green", 43 ); + t.menu_Content_Selected_blue = configfile.getInt32( "menu_Content_Selected_blue", 7 ); + t.menu_Content_Selected_Text_alpha = configfile.getInt32( "menu_Content_Selected_Text_alpha", 0 ); + t.menu_Content_Selected_Text_red = configfile.getInt32( "menu_Content_Selected_Text_red", 13 ); + t.menu_Content_Selected_Text_green = configfile.getInt32( "menu_Content_Selected_Text_green", 13 ); + t.menu_Content_Selected_Text_blue = configfile.getInt32( "menu_Content_Selected_Text_blue", 13 ); + t.menu_Content_inactive_alpha = configfile.getInt32( "menu_Content_inactive_alpha", 10 ); + t.menu_Content_inactive_red = configfile.getInt32( "menu_Content_inactive_red", 13 ); + t.menu_Content_inactive_green = configfile.getInt32( "menu_Content_inactive_green", 13 ); + t.menu_Content_inactive_blue = configfile.getInt32( "menu_Content_inactive_blue", 13 ); + t.menu_Content_inactive_Text_alpha = configfile.getInt32( "menu_Content_inactive_Text_alpha", 0 ); + t.menu_Content_inactive_Text_red = configfile.getInt32( "menu_Content_inactive_Text_red", 62 ); + t.menu_Content_inactive_Text_green = configfile.getInt32( "menu_Content_inactive_Text_green", 62 ); + t.menu_Content_inactive_Text_blue = configfile.getInt32( "menu_Content_inactive_Text_blue", 62 ); - t.menu_Hint_gradient = configfile.getInt32( "menu_Hint_gradient", CC_COLGRAD_COL_B_2_COL_A); + t.menu_Hint_gradient = configfile.getInt32( "menu_Hint_gradient", CC_COLGRAD_OFF); t.menu_Hint_gradient_direction = configfile.getInt32( "menu_Hint_gradient_direction", CFrameBuffer::gradientVertical); - t.menu_ButtonBar_gradient = configfile.getInt32( "menu_ButtonBar_gradient", CC_COLGRAD_COL_A_2_COL_B); + t.menu_ButtonBar_gradient = configfile.getInt32( "menu_ButtonBar_gradient", CC_COLGRAD_OFF); t.menu_ButtonBar_gradient_direction = configfile.getInt32( "menu_ButtonBar_gradient_direction", CFrameBuffer::gradientVertical); - t.infobar_alpha = configfile.getInt32( "infobar_alpha", 0x08 ); - t.infobar_red = configfile.getInt32( "infobar_red", 0x0c ); - t.infobar_green = configfile.getInt32( "infobar_green", 0x0c ); - t.infobar_blue = configfile.getInt32( "infobar_blue", 0x0c ); + t.infobar_alpha = configfile.getInt32( "infobar_alpha", 10 ); + t.infobar_red = configfile.getInt32( "infobar_red", 13 ); + t.infobar_green = configfile.getInt32( "infobar_green", 13 ); + t.infobar_blue = configfile.getInt32( "infobar_blue", 13 ); //t.menu_Foot default historically depends on t.infobar - t.menu_Foot_alpha = configfile.getInt32( "menu_Foot_alpha", t.infobar_alpha ); - t.menu_Foot_red = configfile.getInt32( "menu_Foot_red", int(t.infobar_red*0.4)+14 ); - t.menu_Foot_green = configfile.getInt32( "menu_Foot_green", int(t.infobar_green*0.4)+14 ); - t.menu_Foot_blue = configfile.getInt32( "menu_Foot_blue", int(t.infobar_blue*0.4)+14 ); + t.menu_Foot_alpha = configfile.getInt32( "menu_Foot_alpha", 10 ); + t.menu_Foot_red = configfile.getInt32( "menu_Foot_red", 0 ); + t.menu_Foot_green = configfile.getInt32( "menu_Foot_green", 0 ); + t.menu_Foot_blue = configfile.getInt32( "menu_Foot_blue", 0 ); - t.infobar_gradient_top = configfile.getInt32( "infobar_gradient_top", CC_COLGRAD_COL_B_2_COL_A ); + t.infobar_gradient_top = configfile.getInt32( "infobar_gradient_top", CC_COLGRAD_OFF ); t.infobar_gradient_top_direction = configfile.getInt32( "infobar_gradient_top_direction", CFrameBuffer::gradientVertical ); t.infobar_gradient_body = configfile.getInt32( "infobar_gradient_body", CC_COLGRAD_OFF); t.infobar_gradient_body_direction = configfile.getInt32( "infobar_gradient_body_direction", CFrameBuffer::gradientVertical ); - t.infobar_gradient_bottom = configfile.getInt32( "infobar_gradient_bottom", CC_COLGRAD_COL_A_2_COL_B ); + t.infobar_gradient_bottom = configfile.getInt32( "infobar_gradient_bottom", CC_COLGRAD_OFF ); t.infobar_gradient_bottom_direction = configfile.getInt32( "infobar_gradient_bottom_direction", CFrameBuffer::gradientVertical ); - t.infobar_casystem_alpha = configfile.getInt32( "infobar_casystem_alpha", 0x08 ); - t.infobar_casystem_red = configfile.getInt32( "infobar_casystem_red", 0x0c ); - t.infobar_casystem_green = configfile.getInt32( "infobar_casystem_green", 0x0c ); - t.infobar_casystem_blue = configfile.getInt32( "infobar_casystem_blue", 0x0c ); - t.infobar_Text_alpha = configfile.getInt32( "infobar_Text_alpha", 0x00 ); - t.infobar_Text_red = configfile.getInt32( "infobar_Text_red", 0x64 ); - t.infobar_Text_green = configfile.getInt32( "infobar_Text_green", 0x64 ); - t.infobar_Text_blue = configfile.getInt32( "infobar_Text_blue", 0x64 ); + t.infobar_casystem_alpha = configfile.getInt32( "infobar_casystem_alpha", 10 ); + t.infobar_casystem_red = configfile.getInt32( "infobar_casystem_red", 13 ); + t.infobar_casystem_green = configfile.getInt32( "infobar_casystem_green", 13 ); + t.infobar_casystem_blue = configfile.getInt32( "infobar_casystem_blue", 13 ); + t.infobar_Text_alpha = configfile.getInt32( "infobar_Text_alpha", 0 ); + t.infobar_Text_red = configfile.getInt32( "infobar_Text_red", 98 ); + t.infobar_Text_green = configfile.getInt32( "infobar_Text_green", 98 ); + t.infobar_Text_blue = configfile.getInt32( "infobar_Text_blue", 98 ); //t.menu_Foot_Text default historically depends on t.infobar_Text - t.menu_Foot_Text_alpha = configfile.getInt32( "menu_Foot_Text_alpha", 0x00 ); - t.menu_Foot_Text_red = configfile.getInt32( "menu_Foot_Text_red", int(t.infobar_Text_red*0.6) ); - t.menu_Foot_Text_green = configfile.getInt32( "menu_Foot_Text_green", int(t.infobar_Text_green*0.6) ); - t.menu_Foot_Text_blue = configfile.getInt32( "menu_Foot_Text_blue", int(t.infobar_Text_blue*0.6) ); + t.menu_Foot_Text_alpha = configfile.getInt32( "menu_Foot_Text_alpha", 0 ); + t.menu_Foot_Text_red = configfile.getInt32( "menu_Foot_Text_red", 98 ); + t.menu_Foot_Text_green = configfile.getInt32( "menu_Foot_Text_green", 98 ); + t.menu_Foot_Text_blue = configfile.getInt32( "menu_Foot_Text_blue", 98 ); - t.colored_events_alpha = configfile.getInt32( "colored_events_alpha", 0x00 ); - t.colored_events_red = configfile.getInt32( "colored_events_red", 95 ); - t.colored_events_green = configfile.getInt32( "colored_events_green", 70 ); - t.colored_events_blue = configfile.getInt32( "colored_events_blue", 0 ); + t.colored_events_alpha = configfile.getInt32( "colored_events_alpha", 0 ); + t.colored_events_red = configfile.getInt32( "colored_events_red", 99 ); + t.colored_events_green = configfile.getInt32( "colored_events_green", 43 ); + t.colored_events_blue = configfile.getInt32( "colored_events_blue", 7 ); t.colored_events_channellist = configfile.getInt32( "colored_events_channellist", 1 ); t.colored_events_infobar = configfile.getInt32( "colored_events_infobar", 1 ); - t.clock_Digit_alpha = configfile.getInt32( "clock_Digit_alpha", t.menu_Content_Text_alpha ); - t.clock_Digit_red = configfile.getInt32( "clock_Digit_red", t.menu_Content_Text_red ); - t.clock_Digit_green = configfile.getInt32( "clock_Digit_green", t.menu_Content_Text_green ); - t.clock_Digit_blue = configfile.getInt32( "clock_Digit_blue", t.menu_Content_Text_blue ); + t.clock_Digit_alpha = configfile.getInt32( "clock_Digit_alpha", 0 ); + t.clock_Digit_red = configfile.getInt32( "clock_Digit_red", 62 ); + t.clock_Digit_green = configfile.getInt32( "clock_Digit_green", 62 ); + t.clock_Digit_blue = configfile.getInt32( "clock_Digit_blue", 62 ); } void CThemes::move_userDir() diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index f35c37f89..549182fc2 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -73,6 +73,7 @@ #include #include #include +#include //NI #include #include @@ -210,62 +211,44 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) if (it->find_first_not_of("0123456789") == std::string::npos) item = atoi(*it); menu_item = NULL; - switch (item) { + switch (item) + { case SNeutrinoSettings::ITEM_NONE: + { continue; + } case SNeutrinoSettings::ITEM_BAR: + { menu->addItem(GenericMenuSeparatorLine); break; - case SNeutrinoSettings::ITEM_FAVORITS: - keyhelper.get(&key,&icon,feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_FAVORIT]].key); //CRCInput::RC_green - menu_item = new CMenuDForwarder(LOCALE_FAVORITES_MENUEADD, true, NULL, new CFavorites, "-1", key, icon); - // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); - break; - case SNeutrinoSettings::ITEM_RECORD: - if (g_settings.recording_type == RECORDING_OFF) - break; - keyhelper.get(&key,&icon,CRCInput::RC_red); - menu_item = new CMenuForwarder(LOCALE_MAINMENU_RECORDING, true, NULL, CRecordManager::getInstance(), "-1", key, icon); - // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); - break; - case SNeutrinoSettings::ITEM_MOVIEPLAYER_MB: - if (g_settings.recording_type == RECORDING_OFF) - break; - keyhelper.get(&key,&icon,CRCInput::RC_green); - menu_item = new CMenuForwarder(LOCALE_MOVIEBROWSER_HEAD, !_mode_ts, NULL, neutrino, "tsmoviebrowser", key, icon); - menu_item->setHint(NEUTRINO_ICON_HINT_MB, LOCALE_MENU_HINT_MB); - break; - case SNeutrinoSettings::ITEM_TIMERLIST: - keyhelper.get(&key,&icon,feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_TIMERLIST]].key); //CRCInput::RC_yellow - menu_item = new CMenuDForwarder(LOCALE_TIMERLIST_NAME, true, NULL, new CTimerList, "-1", key, icon); - menu_item->setHint(NEUTRINO_ICON_HINT_TIMERS, LOCALE_MENU_HINT_TIMERS); - break; - case SNeutrinoSettings::ITEM_REMOTE: - keyhelper.get(&key,&icon,feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_RC_LOCK]].key); //CRCInput::RC_nokey); - menu_item = new CMenuForwarder(LOCALE_RCLOCK_TITLE, true, NULL, CRCLock::getInstance(), "-1" , key, icon ); - // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); - break; - case SNeutrinoSettings::ITEM_EPG_SUPER: - keyhelper.get(&key,&icon,CRCInput::RC_green); - menu_item = new CMenuDForwarder(LOCALE_EPGMENU_EPGPLUS, !_mode_ts, NULL, new CEPGplusHandler, "-1", key, icon); - // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); - break; + } case SNeutrinoSettings::ITEM_EPG_LIST: + { keyhelper.get(&key,&icon,CRCInput::RC_red); menu_item = new CMenuDForwarder(LOCALE_EPGMENU_EVENTLIST, !_mode_ts, NULL, new CEventListHandler, "-1", key, icon); // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; + } + case SNeutrinoSettings::ITEM_EPG_SUPER: + { + keyhelper.get(&key,&icon,CRCInput::RC_green); + menu_item = new CMenuDForwarder(LOCALE_EPGMENU_EPGPLUS, !_mode_ts, NULL, new CEPGplusHandler, "-1", key, icon); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); + break; + } case SNeutrinoSettings::ITEM_EPG_INFO: + { keyhelper.get(&key,&icon,CRCInput::RC_yellow); menu_item = new CMenuDForwarder(LOCALE_EPGMENU_EVENTINFO, !_mode_ts, NULL, new CEPGDataHandler, "-1", key, icon); // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; + } case SNeutrinoSettings::ITEM_EPG_MISC: { dummy = g_Sectionsd->getIsScanningActive(); keyhelper.get(&key,&icon); - // new CMenuOptionChooser(LOCALE_VIDEOMENU_VIDEOMODE, &g_settings.video_Mode, VIDEOMENU_VIDEOMODE_OPTIONS, VIDEOMENU_VIDEOMODE_OPTION_COUNT, true, this, CRCInput::RC_nokey, "", true); menu_item = new CMenuOptionChooser(LOCALE_MAINMENU_PAUSESECTIONSD, &dummy, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this , key, icon ); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); menu->addItem(menu_item, false); keyhelper.get(&key,&icon); @@ -274,10 +257,12 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) break; } case SNeutrinoSettings::ITEM_AUDIO_SELECT: + { keyhelper.get(&key,&icon); menu_item = new CMenuDForwarder(LOCALE_AUDIOSELECTMENUE_HEAD, !_mode_ts, NULL, new CAudioSelectMenuHandler, "-1", key,icon); // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; + } case SNeutrinoSettings::ITEM_SUBCHANNEL: { if (g_RemoteControl->subChannels.empty()) @@ -286,41 +271,69 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) break; // NVOD/SubService- Kanal! CMenuWidget *tmpNVODSelector = new CMenuWidget(g_RemoteControl->are_subchannels ? LOCALE_NVODSELECTOR_SUBSERVICE : LOCALE_NVODSELECTOR_STARTTIME, NEUTRINO_ICON_VIDEO); - if (!subchanselect.getNVODMenu(tmpNVODSelector)) { + if (!subchanselect.getNVODMenu(tmpNVODSelector)) + { delete tmpNVODSelector; break; } keyhelper.get(&key,&icon); menu_item = new CMenuDForwarder(g_RemoteControl->are_subchannels ? LOCALE_NVODSELECTOR_SUBSERVICE : LOCALE_NVODSELECTOR_STARTTIME, true, NULL, tmpNVODSelector, "-1", key,icon); // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); - + break; + } + case SNeutrinoSettings::ITEM_RECORD: + { + if (g_settings.recording_type == RECORDING_OFF) + break; + keyhelper.get(&key,&icon,CRCInput::RC_red); + menu_item = new CMenuForwarder(LOCALE_MAINMENU_RECORDING, true, NULL, CRecordManager::getInstance(), "-1", key, icon); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); + break; + } + case SNeutrinoSettings::ITEM_MOVIEPLAYER_MB: + { + if (g_settings.recording_type == RECORDING_OFF) + break; + keyhelper.get(&key,&icon,CRCInput::RC_green); + menu_item = new CMenuForwarder(LOCALE_MOVIEBROWSER_HEAD, !_mode_ts, NULL, neutrino, "tsmoviebrowser", key, icon); + menu_item->setHint(NEUTRINO_ICON_HINT_MB, LOCALE_MENU_HINT_MB); + break; + } + case SNeutrinoSettings::ITEM_TIMERLIST: + { + keyhelper.get(&key,&icon,feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_TIMERLIST]].key); //CRCInput::RC_yellow + menu_item = new CMenuDForwarder(LOCALE_TIMERLIST_NAME, true, NULL, new CTimerList, "-1", key, icon); + menu_item->setHint(NEUTRINO_ICON_HINT_TIMERS, LOCALE_MENU_HINT_TIMERS); + break; + } + case SNeutrinoSettings::ITEM_VTXT: + { + keyhelper.get(&key,&icon, feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_VTXT]].key); //CRCInput::RC_blue + menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_VTXT, true, NULL, CPluginsExec::getInstance(), "teletext", key, icon); + menu_item->setHint(NEUTRINO_ICON_HINT_VTXT, LOCALE_USERMENU_ITEM_VTXT); //NI + break; + } + case SNeutrinoSettings::ITEM_FAVORITS: + { + keyhelper.get(&key,&icon,feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_FAVORIT]].key); //CRCInput::RC_green + menu_item = new CMenuDForwarder(LOCALE_FAVORITES_MENUEADD, true, NULL, new CFavorites, "-1", key, icon); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; } case SNeutrinoSettings::ITEM_TECHINFO: + { keyhelper.get(&key,&icon,CRCInput::RC_blue); menu_item = new CMenuDForwarder(LOCALE_EPGMENU_STREAMINFO, !neutrino->channelList->isEmpty(), NULL, new CStreamInfo2, "-1", key, icon ); menu_item->setHint(NEUTRINO_ICON_HINT_STREAMINFO, LOCALE_MENU_HINT_STREAMINFO); break; - case SNeutrinoSettings::ITEM_GAMES: - keyhelper.get(&key,&icon); - menu_item = new CMenuDForwarder(LOCALE_MAINMENU_GAMES, g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME), NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME), "-1", key, icon ); - menu_item->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES); - break; - case SNeutrinoSettings::ITEM_TOOLS: - keyhelper.get(&key,&icon); - menu_item = new CMenuDForwarder(LOCALE_MAINMENU_TOOLS, g_PluginList->hasPlugin(CPlugins::P_TYPE_TOOL), NULL, new CPluginList(LOCALE_MAINMENU_TOOLS,CPlugins::P_TYPE_TOOL), "-1", key, icon ); - // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); - break; - case SNeutrinoSettings::ITEM_SCRIPTS: - keyhelper.get(&key,&icon); - menu_item = new CMenuDForwarder(LOCALE_MAINMENU_SCRIPTS, g_PluginList->hasPlugin(CPlugins::P_TYPE_SCRIPT), NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT), "-1", key, icon ); - menu_item->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS); - break; - case SNeutrinoSettings::ITEM_LUA: - keyhelper.get(&key,&icon); - menu_item = new CMenuDForwarder(LOCALE_MAINMENU_LUA, g_PluginList->hasPlugin(CPlugins::P_TYPE_LUA), NULL, new CPluginList(LOCALE_MAINMENU_LUA,CPlugins::P_TYPE_LUA), "-1", key, icon ); + } + case SNeutrinoSettings::ITEM_REMOTE: + { + keyhelper.get(&key,&icon,feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_RC_LOCK]].key); //CRCInput::RC_nokey); + menu_item = new CMenuForwarder(LOCALE_RCLOCK_TITLE, true, NULL, CRCLock::getInstance(), "-1" , key, icon ); // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; + } case SNeutrinoSettings::ITEM_PLUGIN_TYPES: { unsigned int number_of_plugins = (unsigned int) g_PluginList->getNumberOfPlugins(); @@ -357,126 +370,171 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) menu_item = NULL; break; } - case SNeutrinoSettings::ITEM_VTXT: - keyhelper.get(&key,&icon, feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_VTXT]].key); //CRCInput::RC_blue - menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_VTXT, true, NULL, CPluginsExec::getInstance(), "teletext", key, icon); - menu_item->setHint(NEUTRINO_ICON_HINT_VTXT, LOCALE_USERMENU_ITEM_VTXT); //NI - break; case SNeutrinoSettings::ITEM_IMAGEINFO: + { keyhelper.get(&key,&icon); menu_item = new CMenuDForwarder(LOCALE_SERVICEMENU_IMAGEINFO, true, NULL, new CImageInfoNI, NULL, key, icon); //NI menu_item->setHint(NEUTRINO_ICON_HINT_IMAGEINFO, LOCALE_MENU_HINT_IMAGEINFO); break; + } case SNeutrinoSettings::ITEM_BOXINFO: + { keyhelper.get(&key,&icon); menu_item = new CMenuDForwarder(LOCALE_EXTRA_DBOXINFO, true, NULL, new CDBoxInfoWidget, NULL, key, icon); menu_item->setHint(NEUTRINO_ICON_HINT_DBOXINFO, LOCALE_MENU_HINT_DBOXINFO); break; + } #if !HAVE_SPARK_HARDWARE case SNeutrinoSettings::ITEM_CAM: - //if(cs_get_revision() == 10) continue; + { keyhelper.get(&key,&icon); menu_item = new CMenuForwarder(LOCALE_CI_SETTINGS, true, NULL, g_CamHandler, NULL, key, icon); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; + } #endif case SNeutrinoSettings::ITEM_CLOCK: + { keyhelper.get(&key,&icon); menu_item = new CMenuForwarder(!g_settings.mode_clock ? LOCALE_CLOCK_SWITCH_ON:LOCALE_CLOCK_SWITCH_OFF, true, NULL, neutrino, "clock_switch", key, icon); menu_item->setHint("", LOCALE_MENU_HINT_CLOCK_MODE); break; - case SNeutrinoSettings::ITEM_ADZAP: - keyhelper.get(&key,&icon,CRCInput::RC_blue); - menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_ADZAP, true, adzap_active ? g_Locale->getText(LOCALE_OPTIONS_OFF) : NULL, CAdZapMenu::getInstance(), "adzap", key, icon); - menu_item->setHint(NEUTRINO_ICON_HINT_ADZAP, adzap_active ? LOCALE_MENU_HINT_ADZAP_ACTIVE : LOCALE_MENU_HINT_ADZAP); - break; -#if 0 - case SNeutrinoSettings::ITEM_TUNER_RESTART: + } + case SNeutrinoSettings::ITEM_GAMES: + { keyhelper.get(&key,&icon); - menu_item = new CMenuForwarder(LOCALE_SERVICEMENU_RESTART_TUNER, true, NULL, neutrino, "restarttuner", key, icon); - menu_item->setHint(NEUTRINO_ICON_HINT_RELOAD_CHANNELS, LOCALE_MENU_HINT_RESTART_TUNER); + menu_item = new CMenuDForwarder(LOCALE_MAINMENU_GAMES, g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME), NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME), "-1", key, icon ); + menu_item->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES); break; - case SNeutrinoSettings::ITEM_RASS: - if (!(neutrino->getMode() == CNeutrinoApp::mode_radio && g_Radiotext && g_Radiotext->haveRASS())) - continue; + } + case SNeutrinoSettings::ITEM_SCRIPTS: + { keyhelper.get(&key,&icon); - menu_item = new CMenuForwarder(LOCALE_RASS_HEAD, true, NULL, neutrino, "rass", key, icon); - menu_item->setHint(NEUTRINO_ICON_HINT_RASS, LOCALE_MENU_HINT_RASS); + menu_item = new CMenuDForwarder(LOCALE_MAINMENU_SCRIPTS, g_PluginList->hasPlugin(CPlugins::P_TYPE_SCRIPT), NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT), "-1", key, icon ); + menu_item->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS); break; - case SNeutrinoSettings::ITEM_NETZKINO: + } + //NI + case SNeutrinoSettings::ITEM_ECMINFO: + { keyhelper.get(&key,&icon); - menu_item = new CMenuForwarder(LOCALE_MOVIEPLAYER_NKPLAYBACK, true, NULL, neutrino, "nkplayback", key, icon); - menu_item->setHint(NEUTRINO_ICON_HINT_NKPLAY, LOCALE_MENU_HINT_NKPLAY); + menu_item = new CMenuForwarder(LOCALE_ECMINFO_SHOW, file_size("/tmp/ecm.info"), NULL, ni_menu, "ecmInfo", key, icon); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; -#endif -#if 0 - case SNeutrinoSettings::ITEM_THREE_D_MODE: + } + //NI + case SNeutrinoSettings::ITEM_CAMD_RESET: + { keyhelper.get(&key,&icon); - menu_item = new CMenuForwarder(LOCALE_THREE_D_SETTINGS, true, NULL, neutrino, "3dmode", key, icon); - menu_item->setHint("", LOCALE_MENU_HINT_VIDEO_THREE_D); + menu_item = new CMenuForwarder(LOCALE_CAMD_RESET, true, NULL, ni_menu, "camd_reset", key, icon); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; -#endif + } + //NI + case SNeutrinoSettings::ITEM_INFOICONS: + { + keyhelper.get(&key,&icon); + menu_item = new CMenuForwarder(!g_settings.mode_icons ? LOCALE_INFOICONS_SWITCH_ON : LOCALE_INFOICONS_SWITCH_OFF, g_settings.mode_icons_skin != INFOICONS_INFOVIEWER, NULL, new CInfoIconsSetup, "infoicons_switch", key, icon); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); + break; + } case SNeutrinoSettings::ITEM_YOUTUBE: + { keyhelper.get(&key,&icon); menu_item = new CMenuForwarder(LOCALE_MOVIEPLAYER_YTPLAYBACK, !_mode_ts, NULL, neutrino, "ytplayback", key, icon); menu_item->setHint(NEUTRINO_ICON_HINT_YTPLAY, LOCALE_MENU_HINT_YTPLAY); break; + } case SNeutrinoSettings::ITEM_FILEPLAY: + { keyhelper.get(&key,&icon); menu_item = new CMenuForwarder(LOCALE_MOVIEPLAYER_FILEPLAYBACK, !_mode_ts, NULL, neutrino, "fileplayback", key, icon); menu_item->setHint(NEUTRINO_ICON_HINT_FILEPLAY, LOCALE_MENU_HINT_FILEPLAY); break; - case SNeutrinoSettings::ITEM_AUDIOPLAY: + } + case SNeutrinoSettings::ITEM_TOOLS: + { keyhelper.get(&key,&icon); - menu_item = new CMenuForwarder(LOCALE_AUDIOPLAYER_NAME, true, NULL, neutrino, "audioplayer", key, icon); - menu_item->setHint(NEUTRINO_ICON_HINT_APLAY, LOCALE_MENU_HINT_APLAY); + menu_item = new CMenuDForwarder(LOCALE_MAINMENU_TOOLS, g_PluginList->hasPlugin(CPlugins::P_TYPE_TOOL), NULL, new CPluginList(LOCALE_MAINMENU_TOOLS,CPlugins::P_TYPE_TOOL), "-1", key, icon ); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; - case SNeutrinoSettings::ITEM_INETPLAY: + } + case SNeutrinoSettings::ITEM_LUA: + { keyhelper.get(&key,&icon); - menu_item = new CMenuForwarder(LOCALE_INETRADIO_NAME, true, NULL, neutrino, "inetplayer", key, icon); - menu_item->setHint(NEUTRINO_ICON_HINT_INET_RADIO, LOCALE_MENU_HINT_INET_RADIO); - break; - case SNeutrinoSettings::ITEM_HDDMENU: - keyhelper.get(&key,&icon); - menu_item = new CMenuForwarder(LOCALE_HDD_SETTINGS, true, NULL, CHDDMenuHandler::getInstance(), NULL, key, icon); - menu_item->setHint(NEUTRINO_ICON_HINT_HDD, LOCALE_MENU_HINT_HDD); - break; - case SNeutrinoSettings::ITEM_NETSETTINGS: - keyhelper.get(&key,&icon); - menu_item = new CMenuForwarder(LOCALE_MAINSETTINGS_NETWORK, true, NULL, CNetworkSetup::getInstance(), NULL, key, icon); - menu_item->setHint(NEUTRINO_ICON_HINT_NETWORK, LOCALE_MENU_HINT_NETWORK); - break; - case SNeutrinoSettings::ITEM_SWUPDATE: - keyhelper.get(&key,&icon); - menu_item = new CMenuDForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, new CSoftwareUpdate(), NULL, key, icon); - menu_item->setHint(NEUTRINO_ICON_HINT_SW_UPDATE, LOCALE_MENU_HINT_SW_UPDATE); - break; - case SNeutrinoSettings::ITEM_LIVESTREAM_RESOLUTION: - if (!_mode_webtv) - break; - keyhelper.get(&key,&icon); - menu_item = new CMenuDForwarder(LOCALE_LIVESTREAM_RESOLUTION, true, NULL, new CWebTVResolution(), NULL, key, icon); - //menu_item->setHint(xx, yy); + menu_item = new CMenuDForwarder(LOCALE_MAINMENU_LUA, g_PluginList->hasPlugin(CPlugins::P_TYPE_LUA), NULL, new CPluginList(LOCALE_MAINMENU_LUA,CPlugins::P_TYPE_LUA), "-1", key, icon ); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; + } //NI - case SNeutrinoSettings::ITEM_CAMD_RESET: - keyhelper.get(&key,&icon); - menu_item = new CMenuForwarder(LOCALE_CAMD_RESET, true, NULL, ni_menu, "camd_reset", key, icon); - break; - case SNeutrinoSettings::ITEM_ECMINFO: - keyhelper.get(&key,&icon); - menu_item = new CMenuForwarder(LOCALE_ECMINFO_SHOW, file_size("/tmp/ecm.info"), NULL, ni_menu, "ecmInfo", key, icon); - break; - case SNeutrinoSettings::ITEM_INFOICONS: - keyhelper.get(&key,&icon); - menu_item = new CMenuForwarder(!g_settings.mode_icons ? LOCALE_INFOICONS_SWITCH_ON : LOCALE_INFOICONS_SWITCH_OFF, g_settings.mode_icons_skin != INFOICONS_INFOVIEWER, NULL, new CInfoIconsSetup, "infoicons_switch", key, icon); - break; case SNeutrinoSettings::ITEM_TUNER_RESTART: + { keyhelper.get(&key,&icon); menu_item = new CMenuForwarder(LOCALE_SERVICEMENU_RESTART_TUNER, true, NULL, neutrino, "restarttuner", key, icon); menu_item->setHint(NEUTRINO_ICON_HINT_RELOAD_CHANNELS, LOCALE_MENU_HINT_RESTART_TUNER); break; + } + case SNeutrinoSettings::ITEM_HDDMENU: + { + keyhelper.get(&key,&icon); + menu_item = new CMenuForwarder(LOCALE_HDD_SETTINGS, true, NULL, CHDDMenuHandler::getInstance(), NULL, key, icon); + menu_item->setHint(NEUTRINO_ICON_HINT_HDD, LOCALE_MENU_HINT_HDD); + break; + } + case SNeutrinoSettings::ITEM_AUDIOPLAY: + { + keyhelper.get(&key,&icon); + menu_item = new CMenuForwarder(LOCALE_AUDIOPLAYER_NAME, true, NULL, neutrino, "audioplayer", key, icon); + menu_item->setHint(NEUTRINO_ICON_HINT_APLAY, LOCALE_MENU_HINT_APLAY); + break; + } + case SNeutrinoSettings::ITEM_INETPLAY: + { + keyhelper.get(&key,&icon); + menu_item = new CMenuForwarder(LOCALE_INETRADIO_NAME, true, NULL, neutrino, "inetplayer", key, icon); + menu_item->setHint(NEUTRINO_ICON_HINT_INET_RADIO, LOCALE_MENU_HINT_INET_RADIO); + break; + } + case SNeutrinoSettings::ITEM_NETSETTINGS: + { + keyhelper.get(&key,&icon); + menu_item = new CMenuForwarder(LOCALE_MAINSETTINGS_NETWORK, true, NULL, CNetworkSetup::getInstance(), NULL, key, icon); + menu_item->setHint(NEUTRINO_ICON_HINT_NETWORK, LOCALE_MENU_HINT_NETWORK); + break; + } + case SNeutrinoSettings::ITEM_SWUPDATE: + { + keyhelper.get(&key,&icon); + menu_item = new CMenuDForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, new CSoftwareUpdate(), NULL, key, icon); + menu_item->setHint(NEUTRINO_ICON_HINT_SW_UPDATE, LOCALE_MENU_HINT_SW_UPDATE); + break; + } + case SNeutrinoSettings::ITEM_LIVESTREAM_RESOLUTION: + { + if (!_mode_webtv) + break; + keyhelper.get(&key,&icon); + menu_item = new CMenuDForwarder(LOCALE_LIVESTREAM_RESOLUTION, true, NULL, new CWebTVResolution(), NULL, key, icon); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); + break; + } + case SNeutrinoSettings::ITEM_ADZAP: + { + keyhelper.get(&key,&icon,CRCInput::RC_blue); + menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_ADZAP, true, adzap_active ? g_Locale->getText(LOCALE_OPTIONS_OFF) : NULL, CAdZapMenu::getInstance(), "adzap", key, icon); + menu_item->setHint(NEUTRINO_ICON_HINT_ADZAP, adzap_active ? LOCALE_MENU_HINT_ADZAP_ACTIVE : LOCALE_MENU_HINT_ADZAP); + break; + } + //NI + case SNeutrinoSettings::ITEM_TESTMENU: + { + keyhelper.get(&key,&icon); + menu_item = new CMenuDForwarder(LOCALE_TESTMENU, true, NULL, new CTestMenu(), NULL, key, icon); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); + break; + } case -1: // plugin - { + { int number_of_plugins = g_PluginList->getNumberOfPlugins(); if (!number_of_plugins) continue; @@ -493,8 +551,9 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) } if (count == number_of_plugins) continue; - } } + + } // switch end itemstr_last = *it; if (menu_item) { diff --git a/src/gui/user_menue_setup.cpp b/src/gui/user_menue_setup.cpp index b41d04c86..a4d9c5cb7 100644 --- a/src/gui/user_menue_setup.cpp +++ b/src/gui/user_menue_setup.cpp @@ -53,13 +53,6 @@ #include static bool usermenu_show = true; -#if 0 -#if HAVE_SPARK_HARDWARE -static bool usermenu_show_three_d_mode = true; -#else -static bool usermenu_show_three_d_mode = false; -#endif -#endif #if HAVE_SPARK_HARDWARE static bool usermenu_show_cam = false; // FIXME -- use hwcaps? #else @@ -82,42 +75,36 @@ static keyvals usermenu_items[] = { SNeutrinoSettings::ITEM_EPG_MISC, LOCALE_USERMENU_ITEM_EPG_MISC, usermenu_show }, { SNeutrinoSettings::ITEM_AUDIO_SELECT, LOCALE_AUDIOSELECTMENUE_HEAD, usermenu_show }, { SNeutrinoSettings::ITEM_SUBCHANNEL, LOCALE_NVODSELECTOR_HEAD, usermenu_show }, - { SNeutrinoSettings::ITEM_FILEPLAY, LOCALE_MOVIEPLAYER_FILEPLAYBACK, usermenu_show }, - { SNeutrinoSettings::ITEM_AUDIOPLAY, LOCALE_AUDIOPLAYER_NAME, usermenu_show }, - { SNeutrinoSettings::ITEM_INETPLAY, LOCALE_INETRADIO_NAME, usermenu_show }, + { SNeutrinoSettings::ITEM_RECORD, LOCALE_TIMERLIST_TYPE_RECORD, usermenu_show }, { SNeutrinoSettings::ITEM_MOVIEPLAYER_MB, LOCALE_MOVIEBROWSER_HEAD, usermenu_show }, { SNeutrinoSettings::ITEM_TIMERLIST, LOCALE_TIMERLIST_NAME, usermenu_show }, - { SNeutrinoSettings::ITEM_REMOTE, LOCALE_RCLOCK_TITLE, usermenu_show }, + { SNeutrinoSettings::ITEM_VTXT, LOCALE_USERMENU_ITEM_VTXT, usermenu_show }, { SNeutrinoSettings::ITEM_FAVORITS, LOCALE_FAVORITES_MENUEADD, usermenu_show }, { SNeutrinoSettings::ITEM_TECHINFO, LOCALE_EPGMENU_STREAMINFO, usermenu_show }, + { SNeutrinoSettings::ITEM_REMOTE, LOCALE_RCLOCK_TITLE, usermenu_show }, { SNeutrinoSettings::ITEM_PLUGIN_TYPES, LOCALE_USERMENU_ITEM_PLUGIN_TYPES, usermenu_show }, - { SNeutrinoSettings::ITEM_VTXT, LOCALE_USERMENU_ITEM_VTXT, usermenu_show }, { SNeutrinoSettings::ITEM_IMAGEINFO, LOCALE_SERVICEMENU_IMAGEINFO, usermenu_show }, { SNeutrinoSettings::ITEM_BOXINFO, LOCALE_EXTRA_DBOXINFO, usermenu_show }, { SNeutrinoSettings::ITEM_CAM, LOCALE_CI_SETTINGS, usermenu_show_cam }, { SNeutrinoSettings::ITEM_CLOCK, LOCALE_CLOCK_SWITCH_ON, usermenu_show }, { SNeutrinoSettings::ITEM_GAMES, LOCALE_MAINMENU_GAMES, usermenu_show }, - { SNeutrinoSettings::ITEM_TOOLS, LOCALE_MAINMENU_TOOLS, usermenu_show }, { SNeutrinoSettings::ITEM_SCRIPTS, LOCALE_MAINMENU_SCRIPTS, usermenu_show }, - { SNeutrinoSettings::ITEM_LUA, LOCALE_MAINMENU_LUA, usermenu_show }, -#if 0 - { SNeutrinoSettings::ITEM_TUNER_RESTART, LOCALE_SERVICEMENU_RESTART_TUNER, usermenu_show }, - { SNeutrinoSettings::ITEM_THREE_D_MODE, LOCALE_THREE_D_SETTINGS, usermenu_show_three_d_mode }, - { SNeutrinoSettings::ITEM_RASS, LOCALE_RASS_HEAD, usermenu_show }, - { SNeutrinoSettings::ITEM_NETZKINO, LOCALE_MOVIEPLAYER_NKPLAYBACK, usermenu_show }, -#endif + { SNeutrinoSettings::ITEM_ECMINFO, LOCALE_ECMINFO_SHOW, usermenu_show }, //NI + { SNeutrinoSettings::ITEM_CAMD_RESET, LOCALE_CAMD_RESET, usermenu_show }, //NI + { SNeutrinoSettings::ITEM_INFOICONS, LOCALE_INFOICONS_SWITCH_ON, usermenu_show }, //NI { SNeutrinoSettings::ITEM_YOUTUBE, LOCALE_MOVIEPLAYER_YTPLAYBACK, usermenu_show }, - { SNeutrinoSettings::ITEM_RECORD, LOCALE_TIMERLIST_TYPE_RECORD, usermenu_show }, + { SNeutrinoSettings::ITEM_FILEPLAY, LOCALE_MOVIEPLAYER_FILEPLAYBACK, usermenu_show }, + { SNeutrinoSettings::ITEM_TOOLS, LOCALE_MAINMENU_TOOLS, usermenu_show }, + { SNeutrinoSettings::ITEM_LUA, LOCALE_MAINMENU_LUA, usermenu_show }, + { SNeutrinoSettings::ITEM_TUNER_RESTART, LOCALE_SERVICEMENU_RESTART_TUNER, usermenu_show }, //NI { SNeutrinoSettings::ITEM_HDDMENU, LOCALE_HDD_SETTINGS, usermenu_show }, + { SNeutrinoSettings::ITEM_AUDIOPLAY, LOCALE_AUDIOPLAYER_NAME, usermenu_show }, + { SNeutrinoSettings::ITEM_INETPLAY, LOCALE_INETRADIO_NAME, usermenu_show }, { SNeutrinoSettings::ITEM_NETSETTINGS, LOCALE_MAINSETTINGS_NETWORK, usermenu_show }, { SNeutrinoSettings::ITEM_SWUPDATE, LOCALE_SERVICEMENU_UPDATE, usermenu_show }, { SNeutrinoSettings::ITEM_LIVESTREAM_RESOLUTION,LOCALE_LIVESTREAM_RESOLUTION, usermenu_show }, { SNeutrinoSettings::ITEM_ADZAP, LOCALE_USERMENU_ITEM_ADZAP, usermenu_show }, - //NI - { SNeutrinoSettings::ITEM_CAMD_RESET, LOCALE_CAMD_RESET, usermenu_show }, - { SNeutrinoSettings::ITEM_ECMINFO, LOCALE_ECMINFO_SHOW, usermenu_show }, - { SNeutrinoSettings::ITEM_INFOICONS, LOCALE_INFOICONS_SWITCH_ON, usermenu_show }, - { SNeutrinoSettings::ITEM_TUNER_RESTART, LOCALE_SERVICEMENU_RESTART_TUNER, usermenu_show }, + { SNeutrinoSettings::ITEM_TESTMENU, LOCALE_TESTMENU, usermenu_show }, //NI { SNeutrinoSettings::ITEM_MAX, NONEXISTANT_LOCALE, usermenu_show } }; @@ -272,7 +259,6 @@ int CUserMenuSetup::showSetup() return res; } - //check button name for details like empty string and show an user message on issue void CUserMenuSetup::checkButtonName() { diff --git a/src/gui/user_menue_setup.h b/src/gui/user_menue_setup.h index f622eadf5..0bdeebf47 100644 --- a/src/gui/user_menue_setup.h +++ b/src/gui/user_menue_setup.h @@ -59,7 +59,6 @@ const struct usermenu_props_t usermenu[USERMENU_ITEMS_COUNT] = {LOCALE_USERMENU_BUTTON_BLUE , SNeutrinoSettings::BUTTON_BLUE , CRCInput::RC_blue ,NEUTRINO_ICON_BUTTON_BLUE ,LOCALE_USERMENU_TITLE_BLUE } }; - class CUserMenuSetup : public CMenuTarget { private: @@ -87,5 +86,4 @@ class CUserMenuSetup : public CMenuTarget static neutrino_locale_t getLocale(unsigned int i); }; - #endif diff --git a/src/gui/widget/hintbox.cpp b/src/gui/widget/hintbox.cpp index 52728f3c1..2439f57ed 100644 --- a/src/gui/widget/hintbox.cpp +++ b/src/gui/widget/hintbox.cpp @@ -197,7 +197,7 @@ int CHintBox::exec() neutrino_msg_data_t data; int res = messages_return::none; - if (timeout == NO_TIMEOUT || timeout == 0) + if (timeout == NO_TIMEOUT || timeout == DEFAULT_TIMEOUT) timeout = HINTBOX_DEFAULT_TIMEOUT; uint64_t timeoutEnd = CRCInput::calcTimeoutEnd( timeout ); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index db436cc83..79bfc83ee 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -570,7 +570,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.infobar_progressbar = configfile.getInt32("infobar_progressbar" , 2 ); //NI g_settings.infobar_casystem_display = configfile.getInt32("infobar_casystem_display", 0 ); //NI g_settings.infobar_casystem_dotmatrix = configfile.getInt32("infobar_casystem_dotmatrix", 0 ); - g_settings.infobar_casystem_frame = configfile.getInt32("infobar_casystem_frame", 1 ); + g_settings.infobar_casystem_frame = configfile.getInt32("infobar_casystem_frame", 0 ); //NI g_settings.scrambled_message = configfile.getBool("scrambled_message", false ); //NI g_settings.volume_pos = configfile.getInt32("volume_pos", CVolumeBar::VOLUMEBAR_POS_BOTTOM_CENTER ); //NI g_settings.volume_digits = configfile.getBool("volume_digits", true); @@ -3552,9 +3552,9 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) } else if( msg == NeutrinoMessages::SLEEPTIMER) { if(data) {//INACTIVITY SLEEPTIMER - skipShutdownTimer = - (ShowMsg(LOCALE_MESSAGEBOX_INFO, g_settings.shutdown_real ? LOCALE_SHUTDOWNTIMER_ANNOUNCE:LOCALE_SLEEPTIMERBOX_ANNOUNCE, - CMsgBox::mbrNo, CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, 30, true) == CMsgBox::mbrYes);//FIXME + int msgbox = ShowMsg(LOCALE_MESSAGEBOX_INFO, g_settings.shutdown_real ? LOCALE_SHUTDOWNTIMER_ANNOUNCE:LOCALE_SLEEPTIMERBOX_ANNOUNCE, + CMsgBox::mbrCancel, CMsgBox::mbCancel, NULL, 450, 60); + skipShutdownTimer = !(msgbox & CMsgBox::mbrTimeout); if(skipShutdownTimer) { printf("NeutrinoMessages::INACTIVITY SLEEPTIMER: skiping\n"); skipShutdownTimer = false; @@ -3794,7 +3794,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode) if(CRecordManager::getInstance()->RecordingStatus() || cYTCache::getInstance()->isActive()) { do_shutdown = (ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_SHUTDOWN_RECORDING_QUERY, CMsgBox::mbrNo, - CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, 30, true) == CMsgBox::mbrYes); + CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, DEFAULT_TIMEOUT, true) == CMsgBox::mbrYes); } if(do_shutdown) { diff --git a/src/nhttpd/web/extentions.txt b/src/nhttpd/web/extentions.txt index c0eb6dcae..9df0559ef 100644 --- a/src/nhttpd/web/extentions.txt +++ b/src/nhttpd/web/extentions.txt @@ -1 +1 @@ -type:u,site:CST-git,desc:yWeb extentions,url:http://git.coolstreamtech.de/?p=cst-public-gui-yweb.git;a=blob_plain;hb=refs/heads/master;f=Y_Extentions.txt +type:u,site:Tuxbox-Neutrino,desc:yWeb extentions,url:https://raw.githubusercontent.com/tuxbox-neutrino/gui-yweb/master/Y_Extentions.txt diff --git a/src/system/locals.h b/src/system/locals.h index ad1f3d555..3666ad04b 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -2586,6 +2586,7 @@ typedef enum LOCALE_SUBTITLES_STOP, LOCALE_TERRESTRIALSETUP_AREA, LOCALE_TERRESTRIALSETUP_PROVIDER, + LOCALE_TESTMENU, LOCALE_TIMER_EVENTRECORD_MSG, LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTTIMED_MSG, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 546745a13..b0e387f6b 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -2586,6 +2586,7 @@ const char * locale_real_names[] = "subtitles.stop", "terrestrialsetup.area", "terrestrialsetup.provider", + "testmenu", "timer.eventrecord.msg", "timer.eventrecord.title", "timer.eventtimed.msg", diff --git a/src/system/settings.h b/src/system/settings.h index 4acd6889d..7db215638 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -842,15 +842,18 @@ struct SNeutrinoSettings // USERMENU typedef enum { - BUTTON_RED = 0, // Do not change ordering of members, add new item just before BUTTON_MAX!!! + // Do not change ordering of members, add new item just before BUTTON_MAX!!! + BUTTON_RED = 0, BUTTON_GREEN = 1, BUTTON_YELLOW = 2, BUTTON_BLUE = 3, - BUTTON_MAX // MUST be always the last in the list + BUTTON_MAX // MUST be always the last in the list } USER_BUTTON; + typedef enum { - ITEM_NONE = 0, // Do not change ordering of members, add new item just before ITEM_MAX!!! + // Do not change ordering of members, add new item just before ITEM_MAX!!! + ITEM_NONE = 0, ITEM_BAR = 1, ITEM_EPG_LIST = 2, ITEM_EPG_SUPER = 3, @@ -879,19 +882,18 @@ struct SNeutrinoSettings ITEM_FILEPLAY = 26, ITEM_TOOLS = 27, ITEM_LUA = 28, - ITEM_TUNER_RESTART = 29, //NI - + ITEM_TUNER_RESTART = 29, //NI ITEM_HDDMENU = 30, ITEM_AUDIOPLAY = 31, ITEM_INETPLAY = 32, ITEM_NETSETTINGS = 33, ITEM_SWUPDATE = 34, - ITEM_LIVESTREAM_RESOLUTION = 35, ITEM_ADZAP = 36, - - ITEM_MAX // MUST be always the last in the list + ITEM_TESTMENU = 37, //NI + ITEM_MAX // MUST be always the last in the list } USER_ITEM; + typedef struct { unsigned int key; std::string items;