diff options
-rw-r--r-- | HISTORY | 4 | ||||
-rw-r--r-- | MV_Themes.INFO | 2 | ||||
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | baserender.c | 6 | ||||
-rw-r--r-- | baserender.h | 4 | ||||
-rw-r--r-- | config.c | 9 | ||||
-rw-r--r-- | config.h | 6 | ||||
-rw-r--r-- | displaychannel.c | 76 | ||||
-rw-r--r-- | icons/MVBerry/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVBerry/forward_sel.png | bin | 3015 -> 3015 bytes | |||
-rw-r--r-- | icons/MVBerry/pause_sel.png | bin | 2739 -> 2739 bytes | |||
-rw-r--r-- | icons/MVBerry/play_sel.png | bin | 3585 -> 3585 bytes | |||
-rw-r--r-- | icons/MVBerry/prev_sel.png | bin | 4141 -> 4141 bytes | |||
-rw-r--r-- | icons/MVBerry/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVBerry/recording_new.png | bin | 10339 -> 10339 bytes | |||
-rw-r--r-- | icons/MVBerry/rewind_sel.png | bin | 3082 -> 3082 bytes | |||
-rw-r--r-- | icons/MVBerry/skip_sel.png | bin | 4158 -> 4158 bytes | |||
-rw-r--r-- | icons/MVBerry/timer_full.png | bin | 10336 -> 10336 bytes | |||
-rw-r--r-- | icons/MVBerry/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVBerry/vps.png | bin | 12012 -> 12012 bytes | |||
-rw-r--r-- | icons/MVBlood/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVBlood/forward_sel.png | bin | 2302 -> 2302 bytes | |||
-rw-r--r-- | icons/MVBlood/pause_sel.png | bin | 2865 -> 2865 bytes | |||
-rw-r--r-- | icons/MVBlood/play_sel.png | bin | 3333 -> 3333 bytes | |||
-rw-r--r-- | icons/MVBlood/prev_sel.png | bin | 3724 -> 3724 bytes | |||
-rw-r--r-- | icons/MVBlood/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVBlood/recording_new.png | bin | 9577 -> 9577 bytes | |||
-rw-r--r-- | icons/MVBlood/rewind_sel.png | bin | 2320 -> 2320 bytes | |||
-rw-r--r-- | icons/MVBlood/skip_sel.png | bin | 3326 -> 3326 bytes | |||
-rw-r--r-- | icons/MVBlood/timer_full.png | bin | 9837 -> 9837 bytes | |||
-rw-r--r-- | icons/MVBlood/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVBlood/vps.png | bin | 11671 -> 11671 bytes | |||
-rw-r--r-- | icons/MVBlue/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVBlue/forward_sel.png | bin | 2916 -> 2916 bytes | |||
-rw-r--r-- | icons/MVBlue/pause_sel.png | bin | 2720 -> 2720 bytes | |||
-rw-r--r-- | icons/MVBlue/play_sel.png | bin | 3450 -> 3450 bytes | |||
-rw-r--r-- | icons/MVBlue/prev_sel.png | bin | 4049 -> 4049 bytes | |||
-rw-r--r-- | icons/MVBlue/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVBlue/recording_new.png | bin | 10101 -> 10101 bytes | |||
-rw-r--r-- | icons/MVBlue/rewind_sel.png | bin | 2950 -> 2950 bytes | |||
-rw-r--r-- | icons/MVBlue/skip_sel.png | bin | 3994 -> 3994 bytes | |||
-rw-r--r-- | icons/MVBlue/timer_full.png | bin | 9721 -> 9721 bytes | |||
-rw-r--r-- | icons/MVBlue/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVBlue/vps.png | bin | 11398 -> 11398 bytes | |||
-rw-r--r-- | icons/MVCappuchino/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVCappuchino/forward_sel.png | bin | 3147 -> 3147 bytes | |||
-rw-r--r-- | icons/MVCappuchino/pause_sel.png | bin | 2911 -> 2911 bytes | |||
-rw-r--r-- | icons/MVCappuchino/play_sel.png | bin | 3805 -> 3805 bytes | |||
-rw-r--r-- | icons/MVCappuchino/prev_sel.png | bin | 4469 -> 4469 bytes | |||
-rw-r--r-- | icons/MVCappuchino/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVCappuchino/recording_new.png | bin | 10749 -> 10749 bytes | |||
-rw-r--r-- | icons/MVCappuchino/rewind_sel.png | bin | 3217 -> 3217 bytes | |||
-rw-r--r-- | icons/MVCappuchino/skip_sel.png | bin | 4401 -> 4401 bytes | |||
-rw-r--r-- | icons/MVCappuchino/timer_full.png | bin | 10609 -> 10609 bytes | |||
-rw-r--r-- | icons/MVCappuchino/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVCappuchino/vps.png | bin | 12231 -> 12231 bytes | |||
-rw-r--r-- | icons/MVChocolate/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVChocolate/forward_sel.png | bin | 2456 -> 2456 bytes | |||
-rw-r--r-- | icons/MVChocolate/pause_sel.png | bin | 2700 -> 2700 bytes | |||
-rw-r--r-- | icons/MVChocolate/play_sel.png | bin | 3608 -> 3608 bytes | |||
-rw-r--r-- | icons/MVChocolate/prev_sel.png | bin | 4156 -> 4156 bytes | |||
-rw-r--r-- | icons/MVChocolate/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVChocolate/recording_new.png | bin | 10256 -> 10256 bytes | |||
-rw-r--r-- | icons/MVChocolate/rewind_sel.png | bin | 2473 -> 2473 bytes | |||
-rw-r--r-- | icons/MVChocolate/skip_sel.png | bin | 4127 -> 4127 bytes | |||
-rw-r--r-- | icons/MVChocolate/timer_full.png | bin | 10375 -> 10375 bytes | |||
-rw-r--r-- | icons/MVChocolate/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVChocolate/vps.png | bin | 12053 -> 12053 bytes | |||
-rw-r--r-- | icons/MVCyan/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVCyan/forward_sel.png | bin | 3116 -> 3116 bytes | |||
-rw-r--r-- | icons/MVCyan/pause_sel.png | bin | 2912 -> 2912 bytes | |||
-rw-r--r-- | icons/MVCyan/play_sel.png | bin | 3777 -> 3777 bytes | |||
-rw-r--r-- | icons/MVCyan/prev_sel.png | bin | 4369 -> 4369 bytes | |||
-rw-r--r-- | icons/MVCyan/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVCyan/recording_new.png | bin | 10712 -> 10712 bytes | |||
-rw-r--r-- | icons/MVCyan/rewind_sel.png | bin | 3220 -> 3220 bytes | |||
-rw-r--r-- | icons/MVCyan/skip_sel.png | bin | 4382 -> 4382 bytes | |||
-rw-r--r-- | icons/MVCyan/timer_full.png | bin | 10395 -> 10395 bytes | |||
-rw-r--r-- | icons/MVCyan/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVCyan/vps.png | bin | 12110 -> 12110 bytes | |||
-rw-r--r-- | icons/MVDeepBlue/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVDeepBlue/forward_sel.png | bin | 2923 -> 2923 bytes | |||
-rw-r--r-- | icons/MVDeepBlue/pause_sel.png | bin | 2685 -> 2685 bytes | |||
-rw-r--r-- | icons/MVDeepBlue/play_sel.png | bin | 3534 -> 3534 bytes | |||
-rw-r--r-- | icons/MVDeepBlue/prev_sel.png | bin | 4047 -> 4047 bytes | |||
-rw-r--r-- | icons/MVDeepBlue/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVDeepBlue/recording_new.png | bin | 10179 -> 10179 bytes | |||
-rw-r--r-- | icons/MVDeepBlue/rewind_sel.png | bin | 3032 -> 3032 bytes | |||
-rw-r--r-- | icons/MVDeepBlue/skip_sel.png | bin | 4012 -> 4012 bytes | |||
-rw-r--r-- | icons/MVDeepBlue/timer_full.png | bin | 9938 -> 9938 bytes | |||
-rw-r--r-- | icons/MVDeepBlue/timer_partial.png | bin | 1490 -> 1490 bytes | |||
-rw-r--r-- | icons/MVDeepBlue/vps.png | bin | 11725 -> 11725 bytes | |||
-rw-r--r-- | icons/MVFog/changroup.png | bin | 1913 -> 1913 bytes | |||
-rw-r--r-- | icons/MVFog/forward_sel.png | bin | 1842 -> 1842 bytes | |||
-rw-r--r-- | icons/MVFog/pause_sel.png | bin | 1999 -> 1999 bytes | |||
-rw-r--r-- | icons/MVFog/play_sel.png | bin | 2147 -> 2147 bytes | |||
-rw-r--r-- | icons/MVFog/prev_sel.png | bin | 2504 -> 2504 bytes | |||
-rw-r--r-- | icons/MVFog/recording_cutted_extra.png | bin | 1540 -> 1540 bytes | |||
-rw-r--r-- | icons/MVFog/recording_new.png | bin | 4459 -> 4459 bytes | |||
-rw-r--r-- | icons/MVFog/rewind_sel.png | bin | 1879 -> 1879 bytes | |||
-rw-r--r-- | icons/MVFog/skip_sel.png | bin | 2469 -> 2469 bytes | |||
-rw-r--r-- | icons/MVFog/timer_full.png | bin | 5740 -> 5740 bytes | |||
-rw-r--r-- | icons/MVFog/timer_partial.png | bin | 1337 -> 1337 bytes | |||
-rw-r--r-- | icons/MVFog/vps.png | bin | 7712 -> 7712 bytes | |||
-rw-r--r-- | icons/MVGrapefruit/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVGrapefruit/forward_sel.png | bin | 2446 -> 2446 bytes | |||
-rw-r--r-- | icons/MVGrapefruit/pause_sel.png | bin | 2758 -> 2758 bytes | |||
-rw-r--r-- | icons/MVGrapefruit/play_sel.png | bin | 3665 -> 3665 bytes | |||
-rw-r--r-- | icons/MVGrapefruit/prev_sel.png | bin | 4187 -> 4187 bytes | |||
-rw-r--r-- | icons/MVGrapefruit/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVGrapefruit/recording_new.png | bin | 10389 -> 10389 bytes | |||
-rw-r--r-- | icons/MVGrapefruit/rewind_sel.png | bin | 2464 -> 2464 bytes | |||
-rw-r--r-- | icons/MVGrapefruit/skip_sel.png | bin | 4140 -> 4140 bytes | |||
-rw-r--r-- | icons/MVGrapefruit/timer_full.png | bin | 10306 -> 10306 bytes | |||
-rw-r--r-- | icons/MVGrapefruit/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVGrapefruit/vps.png | bin | 11992 -> 11992 bytes | |||
-rw-r--r-- | icons/MVGreen/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVGreen/forward_sel.png | bin | 2196 -> 2196 bytes | |||
-rw-r--r-- | icons/MVGreen/pause_sel.png | bin | 2656 -> 2656 bytes | |||
-rw-r--r-- | icons/MVGreen/play_sel.png | bin | 2564 -> 2564 bytes | |||
-rw-r--r-- | icons/MVGreen/prev_sel.png | bin | 3125 -> 3125 bytes | |||
-rw-r--r-- | icons/MVGreen/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVGreen/recording_new.png | bin | 8177 -> 8177 bytes | |||
-rw-r--r-- | icons/MVGreen/rewind_sel.png | bin | 2207 -> 2207 bytes | |||
-rw-r--r-- | icons/MVGreen/skip_sel.png | bin | 3143 -> 3143 bytes | |||
-rw-r--r-- | icons/MVGreen/timer_full.png | bin | 8577 -> 8577 bytes | |||
-rw-r--r-- | icons/MVGreen/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVGreen/vps.png | bin | 10467 -> 10467 bytes | |||
-rw-r--r-- | icons/MVGreen2/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVGreen2/forward_sel.png | bin | 2196 -> 2196 bytes | |||
-rw-r--r-- | icons/MVGreen2/pause_sel.png | bin | 2656 -> 2656 bytes | |||
-rw-r--r-- | icons/MVGreen2/play_sel.png | bin | 2564 -> 2564 bytes | |||
-rw-r--r-- | icons/MVGreen2/prev_sel.png | bin | 3125 -> 3125 bytes | |||
-rw-r--r-- | icons/MVGreen2/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVGreen2/recording_new.png | bin | 8177 -> 8177 bytes | |||
-rw-r--r-- | icons/MVGreen2/rewind_sel.png | bin | 2207 -> 2207 bytes | |||
-rw-r--r-- | icons/MVGreen2/skip_sel.png | bin | 3143 -> 3143 bytes | |||
-rw-r--r-- | icons/MVGreen2/timer_full.png | bin | 8577 -> 8577 bytes | |||
-rw-r--r-- | icons/MVGreen2/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVGreen2/vps.png | bin | 10467 -> 10467 bytes | |||
-rw-r--r-- | icons/MVGrey/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVGrey/forward_sel.png | bin | 3180 -> 3180 bytes | |||
-rw-r--r-- | icons/MVGrey/pause_sel.png | bin | 2901 -> 2901 bytes | |||
-rw-r--r-- | icons/MVGrey/play_sel.png | bin | 3847 -> 3847 bytes | |||
-rw-r--r-- | icons/MVGrey/prev_sel.png | bin | 4513 -> 4513 bytes | |||
-rw-r--r-- | icons/MVGrey/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVGrey/recording_new.png | bin | 10744 -> 10744 bytes | |||
-rw-r--r-- | icons/MVGrey/rewind_sel.png | bin | 3254 -> 3254 bytes | |||
-rw-r--r-- | icons/MVGrey/skip_sel.png | bin | 4454 -> 4454 bytes | |||
-rw-r--r-- | icons/MVGrey/timer_full.png | bin | 10624 -> 10624 bytes | |||
-rw-r--r-- | icons/MVGrey/timer_partial.png | bin | 1490 -> 1490 bytes | |||
-rw-r--r-- | icons/MVGrey/vps.png | bin | 12270 -> 12270 bytes | |||
-rw-r--r-- | icons/MVHelloKitty/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVHelloKitty/forward_sel.png | bin | 3392 -> 3392 bytes | |||
-rw-r--r-- | icons/MVHelloKitty/pause_sel.png | bin | 3332 -> 3332 bytes | |||
-rw-r--r-- | icons/MVHelloKitty/play_sel.png | bin | 4204 -> 4204 bytes | |||
-rw-r--r-- | icons/MVHelloKitty/prev_sel.png | bin | 5088 -> 5088 bytes | |||
-rw-r--r-- | icons/MVHelloKitty/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVHelloKitty/recording_new.png | bin | 11816 -> 11816 bytes | |||
-rw-r--r-- | icons/MVHelloKitty/rewind_sel.png | bin | 3551 -> 3551 bytes | |||
-rw-r--r-- | icons/MVHelloKitty/skip_sel.png | bin | 4983 -> 4983 bytes | |||
-rw-r--r-- | icons/MVHelloKitty/timer_full.png | bin | 10951 -> 10951 bytes | |||
-rw-r--r-- | icons/MVHelloKitty/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVHelloKitty/vps.png | bin | 12440 -> 12440 bytes | |||
-rw-r--r-- | icons/MVHelloKitty2/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVHelloKitty2/forward_sel.png | bin | 3392 -> 3392 bytes | |||
-rw-r--r-- | icons/MVHelloKitty2/pause_sel.png | bin | 3332 -> 3332 bytes | |||
-rw-r--r-- | icons/MVHelloKitty2/play_sel.png | bin | 4204 -> 4204 bytes | |||
-rw-r--r-- | icons/MVHelloKitty2/prev_sel.png | bin | 5088 -> 5088 bytes | |||
-rw-r--r-- | icons/MVHelloKitty2/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVHelloKitty2/recording_new.png | bin | 11816 -> 11816 bytes | |||
-rw-r--r-- | icons/MVHelloKitty2/rewind_sel.png | bin | 3551 -> 3551 bytes | |||
-rw-r--r-- | icons/MVHelloKitty2/skip_sel.png | bin | 4983 -> 4983 bytes | |||
-rw-r--r-- | icons/MVHelloKitty2/timer_full.png | bin | 10951 -> 10951 bytes | |||
-rw-r--r-- | icons/MVHelloKitty2/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVHelloKitty2/vps.png | bin | 12440 -> 12440 bytes | |||
-rw-r--r-- | icons/MVLightBlue/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVLightBlue/forward_sel.png | bin | 3165 -> 3165 bytes | |||
-rw-r--r-- | icons/MVLightBlue/pause_sel.png | bin | 3028 -> 3028 bytes | |||
-rw-r--r-- | icons/MVLightBlue/play_sel.png | bin | 3900 -> 3900 bytes | |||
-rw-r--r-- | icons/MVLightBlue/prev_sel.png | bin | 4538 -> 4538 bytes | |||
-rw-r--r-- | icons/MVLightBlue/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVLightBlue/recording_new.png | bin | 11069 -> 11069 bytes | |||
-rw-r--r-- | icons/MVLightBlue/rewind_sel.png | bin | 3299 -> 3299 bytes | |||
-rw-r--r-- | icons/MVLightBlue/skip_sel.png | bin | 4551 -> 4551 bytes | |||
-rw-r--r-- | icons/MVLightBlue/timer_full.png | bin | 10534 -> 10534 bytes | |||
-rw-r--r-- | icons/MVLightBlue/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVLightBlue/vps.png | bin | 12188 -> 12188 bytes | |||
-rw-r--r-- | icons/MVLightGreen/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVLightGreen/forward_sel.png | bin | 2456 -> 2456 bytes | |||
-rw-r--r-- | icons/MVLightGreen/pause_sel.png | bin | 2792 -> 2792 bytes | |||
-rw-r--r-- | icons/MVLightGreen/play_sel.png | bin | 3694 -> 3694 bytes | |||
-rw-r--r-- | icons/MVLightGreen/prev_sel.png | bin | 4258 -> 4258 bytes | |||
-rw-r--r-- | icons/MVLightGreen/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVLightGreen/recording_new.png | bin | 10508 -> 10508 bytes | |||
-rw-r--r-- | icons/MVLightGreen/rewind_sel.png | bin | 2469 -> 2469 bytes | |||
-rw-r--r-- | icons/MVLightGreen/skip_sel.png | bin | 4206 -> 4206 bytes | |||
-rw-r--r-- | icons/MVLightGreen/timer_full.png | bin | 10304 -> 10304 bytes | |||
-rw-r--r-- | icons/MVLightGreen/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVLightGreen/vps.png | bin | 12010 -> 12010 bytes | |||
-rw-r--r-- | icons/MVMint/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVMint/forward_sel.png | bin | 2579 -> 2579 bytes | |||
-rw-r--r-- | icons/MVMint/pause_sel.png | bin | 2883 -> 2883 bytes | |||
-rw-r--r-- | icons/MVMint/play_sel.png | bin | 3619 -> 3619 bytes | |||
-rw-r--r-- | icons/MVMint/prev_sel.png | bin | 4321 -> 4321 bytes | |||
-rw-r--r-- | icons/MVMint/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVMint/recording_new.png | bin | 10335 -> 10335 bytes | |||
-rw-r--r-- | icons/MVMint/rewind_sel.png | bin | 2584 -> 2584 bytes | |||
-rw-r--r-- | icons/MVMint/skip_sel.png | bin | 4251 -> 4251 bytes | |||
-rw-r--r-- | icons/MVMint/timer_full.png | bin | 9982 -> 9982 bytes | |||
-rw-r--r-- | icons/MVMint/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVMint/vps.png | bin | 11613 -> 11613 bytes | |||
-rw-r--r-- | icons/MVNuts/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVNuts/forward_sel.png | bin | 3114 -> 3114 bytes | |||
-rw-r--r-- | icons/MVNuts/pause_sel.png | bin | 2947 -> 2947 bytes | |||
-rw-r--r-- | icons/MVNuts/play_sel.png | bin | 3773 -> 3773 bytes | |||
-rw-r--r-- | icons/MVNuts/prev_sel.png | bin | 4446 -> 4446 bytes | |||
-rw-r--r-- | icons/MVNuts/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVNuts/recording_new.png | bin | 10769 -> 10769 bytes | |||
-rw-r--r-- | icons/MVNuts/rewind_sel.png | bin | 3211 -> 3211 bytes | |||
-rw-r--r-- | icons/MVNuts/skip_sel.png | bin | 4426 -> 4426 bytes | |||
-rw-r--r-- | icons/MVNuts/timer_full.png | bin | 10452 -> 10452 bytes | |||
-rw-r--r-- | icons/MVNuts/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVNuts/vps.png | bin | 12103 -> 12103 bytes | |||
-rw-r--r-- | icons/MVOlive/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVOlive/forward_sel.png | bin | 3163 -> 3163 bytes | |||
-rw-r--r-- | icons/MVOlive/pause_sel.png | bin | 2900 -> 2900 bytes | |||
-rw-r--r-- | icons/MVOlive/play_sel.png | bin | 3833 -> 3833 bytes | |||
-rw-r--r-- | icons/MVOlive/prev_sel.png | bin | 4493 -> 4493 bytes | |||
-rw-r--r-- | icons/MVOlive/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVOlive/recording_new.png | bin | 10682 -> 10682 bytes | |||
-rw-r--r-- | icons/MVOlive/rewind_sel.png | bin | 3265 -> 3265 bytes | |||
-rw-r--r-- | icons/MVOlive/skip_sel.png | bin | 4405 -> 4405 bytes | |||
-rw-r--r-- | icons/MVOlive/timer_full.png | bin | 10644 -> 10644 bytes | |||
-rw-r--r-- | icons/MVOlive/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVOlive/vps.png | bin | 12264 -> 12264 bytes | |||
-rw-r--r-- | icons/MVPflaume/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVPflaume/forward_sel.png | bin | 2953 -> 2953 bytes | |||
-rw-r--r-- | icons/MVPflaume/pause_sel.png | bin | 2779 -> 2779 bytes | |||
-rw-r--r-- | icons/MVPflaume/play_sel.png | bin | 3561 -> 3561 bytes | |||
-rw-r--r-- | icons/MVPflaume/prev_sel.png | bin | 4119 -> 4119 bytes | |||
-rw-r--r-- | icons/MVPflaume/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVPflaume/recording_new.png | bin | 10311 -> 10311 bytes | |||
-rw-r--r-- | icons/MVPflaume/rewind_sel.png | bin | 3044 -> 3044 bytes | |||
-rw-r--r-- | icons/MVPflaume/skip_sel.png | bin | 4115 -> 4115 bytes | |||
-rw-r--r-- | icons/MVPflaume/timer_full.png | bin | 9842 -> 9842 bytes | |||
-rw-r--r-- | icons/MVPflaume/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVPflaume/vps.png | bin | 11587 -> 11587 bytes | |||
-rw-r--r-- | icons/MVPumpkin/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVPumpkin/forward_sel.png | bin | 3165 -> 3165 bytes | |||
-rw-r--r-- | icons/MVPumpkin/pause_sel.png | bin | 3013 -> 3013 bytes | |||
-rw-r--r-- | icons/MVPumpkin/play_sel.png | bin | 3829 -> 3829 bytes | |||
-rw-r--r-- | icons/MVPumpkin/prev_sel.png | bin | 4530 -> 4530 bytes | |||
-rw-r--r-- | icons/MVPumpkin/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVPumpkin/recording_new.png | bin | 10921 -> 10921 bytes | |||
-rw-r--r-- | icons/MVPumpkin/rewind_sel.png | bin | 3224 -> 3224 bytes | |||
-rw-r--r-- | icons/MVPumpkin/skip_sel.png | bin | 4521 -> 4521 bytes | |||
-rw-r--r-- | icons/MVPumpkin/timer_full.png | bin | 10369 -> 10369 bytes | |||
-rw-r--r-- | icons/MVPumpkin/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVPumpkin/vps.png | bin | 12019 -> 12019 bytes | |||
-rw-r--r-- | icons/MVPurple/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVPurple/forward_sel.png | bin | 2980 -> 2980 bytes | |||
-rw-r--r-- | icons/MVPurple/pause_sel.png | bin | 2676 -> 2676 bytes | |||
-rw-r--r-- | icons/MVPurple/play_sel.png | bin | 3595 -> 3595 bytes | |||
-rw-r--r-- | icons/MVPurple/prev_sel.png | bin | 4133 -> 4133 bytes | |||
-rw-r--r-- | icons/MVPurple/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVPurple/recording_new.png | bin | 10314 -> 10314 bytes | |||
-rw-r--r-- | icons/MVPurple/rewind_sel.png | bin | 3088 -> 3088 bytes | |||
-rw-r--r-- | icons/MVPurple/skip_sel.png | bin | 4083 -> 4083 bytes | |||
-rw-r--r-- | icons/MVPurple/timer_full.png | bin | 10225 -> 10225 bytes | |||
-rw-r--r-- | icons/MVPurple/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVPurple/vps.png | bin | 11944 -> 11944 bytes | |||
-rw-r--r-- | icons/MVPurpleGrey/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVPurpleGrey/forward_sel.png | bin | 3155 -> 3155 bytes | |||
-rw-r--r-- | icons/MVPurpleGrey/pause_sel.png | bin | 2948 -> 2948 bytes | |||
-rw-r--r-- | icons/MVPurpleGrey/play_sel.png | bin | 3853 -> 3853 bytes | |||
-rw-r--r-- | icons/MVPurpleGrey/prev_sel.png | bin | 4531 -> 4531 bytes | |||
-rw-r--r-- | icons/MVPurpleGrey/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVPurpleGrey/recording_new.png | bin | 10908 -> 10908 bytes | |||
-rw-r--r-- | icons/MVPurpleGrey/rewind_sel.png | bin | 3281 -> 3281 bytes | |||
-rw-r--r-- | icons/MVPurpleGrey/skip_sel.png | bin | 4460 -> 4460 bytes | |||
-rw-r--r-- | icons/MVPurpleGrey/timer_full.png | bin | 10660 -> 10660 bytes | |||
-rw-r--r-- | icons/MVPurpleGrey/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVPurpleGrey/vps.png | bin | 12277 -> 12277 bytes | |||
-rw-r--r-- | icons/MVRauchglas/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVRauchglas/forward_sel.png | bin | 2456 -> 2456 bytes | |||
-rw-r--r-- | icons/MVRauchglas/pause_sel.png | bin | 2700 -> 2700 bytes | |||
-rw-r--r-- | icons/MVRauchglas/play_sel.png | bin | 3608 -> 3608 bytes | |||
-rw-r--r-- | icons/MVRauchglas/prev_sel.png | bin | 4156 -> 4156 bytes | |||
-rw-r--r-- | icons/MVRauchglas/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVRauchglas/recording_new.png | bin | 10256 -> 10256 bytes | |||
-rw-r--r-- | icons/MVRauchglas/rewind_sel.png | bin | 2473 -> 2473 bytes | |||
-rw-r--r-- | icons/MVRauchglas/skip_sel.png | bin | 4127 -> 4127 bytes | |||
-rw-r--r-- | icons/MVRauchglas/timer_full.png | bin | 10375 -> 10375 bytes | |||
-rw-r--r-- | icons/MVRauchglas/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVRauchglas/vps.png | bin | 12053 -> 12053 bytes | |||
-rw-r--r-- | icons/MVRed/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVRed/forward_sel.png | bin | 2407 -> 2407 bytes | |||
-rw-r--r-- | icons/MVRed/pause_sel.png | bin | 2978 -> 2978 bytes | |||
-rw-r--r-- | icons/MVRed/play_sel.png | bin | 3268 -> 3268 bytes | |||
-rw-r--r-- | icons/MVRed/prev_sel.png | bin | 3760 -> 3760 bytes | |||
-rw-r--r-- | icons/MVRed/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVRed/recording_new.png | bin | 9468 -> 9468 bytes | |||
-rw-r--r-- | icons/MVRed/rewind_sel.png | bin | 2420 -> 2420 bytes | |||
-rw-r--r-- | icons/MVRed/skip_sel.png | bin | 3718 -> 3718 bytes | |||
-rw-r--r-- | icons/MVRed/timer_full.png | bin | 9381 -> 9381 bytes | |||
-rw-r--r-- | icons/MVRed/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVRed/vps.png | bin | 11237 -> 11237 bytes | |||
-rw-r--r-- | icons/MVXMAS/changroup.png | bin | 2062 -> 2062 bytes | |||
-rw-r--r-- | icons/MVXMAS/forward_sel.png | bin | 2403 -> 2403 bytes | |||
-rw-r--r-- | icons/MVXMAS/pause_sel.png | bin | 2580 -> 2580 bytes | |||
-rw-r--r-- | icons/MVXMAS/play_sel.png | bin | 3391 -> 3391 bytes | |||
-rw-r--r-- | icons/MVXMAS/prev_sel.png | bin | 3884 -> 3884 bytes | |||
-rw-r--r-- | icons/MVXMAS/recording_cutted_extra.png | bin | 1973 -> 1973 bytes | |||
-rw-r--r-- | icons/MVXMAS/recording_new.png | bin | 9640 -> 9640 bytes | |||
-rw-r--r-- | icons/MVXMAS/rewind_sel.png | bin | 2421 -> 2421 bytes | |||
-rw-r--r-- | icons/MVXMAS/skip_sel.png | bin | 3889 -> 3889 bytes | |||
-rw-r--r-- | icons/MVXMAS/timer_full.png | bin | 9798 -> 9798 bytes | |||
-rw-r--r-- | icons/MVXMAS/timer_partial.png | bin | 1495 -> 1495 bytes | |||
-rw-r--r-- | icons/MVXMAS/vps.png | bin | 11603 -> 11603 bytes | |||
-rw-r--r-- | icons/MVdefault/169.png | bin | 1269 -> 1269 bytes | |||
-rw-r--r-- | icons/MVdefault/221.png | bin | 920 -> 920 bytes | |||
-rw-r--r-- | icons/MVdefault/43.png | bin | 1042 -> 1042 bytes | |||
-rw-r--r-- | icons/MVdefault/crypted.png | bin | 462 -> 462 bytes | |||
-rw-r--r-- | icons/MVdefault/forward.png | bin | 2122 -> 2122 bytes | |||
-rw-r--r-- | icons/MVdefault/hd.png | bin | 1313 -> 1313 bytes | |||
-rw-r--r-- | icons/MVdefault/pause.png | bin | 2463 -> 2463 bytes | |||
-rw-r--r-- | icons/MVdefault/play.png | bin | 2393 -> 2393 bytes | |||
-rw-r--r-- | icons/MVdefault/prev.png | bin | 3161 -> 3161 bytes | |||
-rw-r--r-- | icons/MVdefault/rewind.png | bin | 2137 -> 2137 bytes | |||
-rw-r--r-- | icons/MVdefault/sd.png | bin | 1624 -> 1624 bytes | |||
-rw-r--r-- | icons/MVdefault/skip.png | bin | 3119 -> 3119 bytes | |||
-rw-r--r-- | icons/MVdefault/uncrypted.png | bin | 3392 -> 3392 bytes | |||
-rw-r--r-- | po/de_DE.po | 20 | ||||
-rw-r--r-- | setup.c | 24 | ||||
-rw-r--r-- | textscroller.c | 143 | ||||
-rw-r--r-- | textscroller.h | 87 | ||||
-rw-r--r-- | textscroller.o | bin | 0 -> 216632 bytes |
338 files changed, 358 insertions, 25 deletions
@@ -1,6 +1,10 @@ VDR Plugin 'skinflatplus' Revision History --------------------------------------- +2014-MM-DD: Version 0.4.0 +- [add] Textscroller support + new options in general settings + 2014-06-19: Version 0.3.1 - [fix] epg image position on channel info - [fix] Bug #1847 - SetRecording border with deleteresume.patch diff --git a/MV_Themes.INFO b/MV_Themes.INFO index a61c354c..393186b6 100644 --- a/MV_Themes.INFO +++ b/MV_Themes.INFO @@ -1,4 +1,4 @@ -flatPlus-MV_Themen erstellt am 18.06.2014 07:05 +flatPlus-MV_Themen erstellt am 19.06.2014 19:19 Basisthema: flatPlus-MVGreen.theme, Basisicons: MVdefault => Installationshimnweise am Ende der Datei! <= @@ -74,7 +74,7 @@ LIBS += $(shell pkg-config --libs Magick++) ### The object files (add further files here): -OBJS = config.o setup.o imagecache.o imagescaler.o imagemagickwrapper.o imageloader.o baserender.o complexcontent.o displaychannel.o displaymenu.o displaymessage.o \ +OBJS = config.o setup.o imagecache.o imagescaler.o imagemagickwrapper.o imageloader.o baserender.o complexcontent.o textscroller.o displaychannel.o displaymenu.o displaymessage.o \ displayreplay.o displaytracks.o displayvolume.o flat.o $(PLUGIN).o ### The main target: diff --git a/baserender.c b/baserender.c index 0e2be8a2..bbe48975 100644 --- a/baserender.c +++ b/baserender.c @@ -43,6 +43,10 @@ cFlatBaseRender::cFlatBaseRender(void) { Config.ThemeCheckAndInit(); Config.DecorCheckAndInit(); + + scrollers.SetScrollStep( Config.ScrollerStep ); + scrollers.SetScrollDelay( Config.ScrollerDelay ); + scrollers.SetScrollType( Config.ScrollerType ); } cFlatBaseRender::~cFlatBaseRender(void) { @@ -51,6 +55,8 @@ cFlatBaseRender::~cFlatBaseRender(void) { delete fontFixed; if( osd ) { + scrollers.Clear(); + if( topBarPixmap ) osd->DestroyPixmap(topBarPixmap); if( buttonsPixmap ) diff --git a/baserender.h b/baserender.h index 7d373de1..3117f64e 100644 --- a/baserender.h +++ b/baserender.h @@ -3,6 +3,7 @@ #include "imageloader.h" #include <list> #include "flat.h" +#include "textscroller.h" enum eBorder { BorderMenuItem, @@ -102,6 +103,9 @@ class cFlatBaseRender cPixmap *decorPixmap; std::list<sDecorBorder> Borders; // for clear specific Borders (clear only MenuItems and not TopBar) + // TextScroller + cTextScrollers scrollers; + void contentDraw(void); void contentEventDraw(void); double ScrollbarSize(void); @@ -57,6 +57,11 @@ cFlatConfig::cFlatConfig(void) { MenuItemRecordingShowFolderDate = 1; MenuItemParseTilde = 1; + ScrollerEnable = 1; + ScrollerStep = 2; + ScrollerDelay = 40; + ScrollerType = 0; + TVScraperChanInfoShowPoster = 1; TVScraperChanInfoPosterSize = 0.01; @@ -226,6 +231,10 @@ bool cFlatConfig::SetupParse(const char *Name, const char *Value) { else if (strcmp(Name, "TVScraperEPGInfoShowActors") == 0) TVScraperEPGInfoShowActors = atoi(Value); else if (strcmp(Name, "TVScraperRecInfoShowActors") == 0) TVScraperRecInfoShowActors = atoi(Value); else if (strcmp(Name, "MessageColorPosition") == 0) MessageColorPosition = atoi(Value); + else if (strcmp(Name, "ScrollerEnable") == 0) ScrollerEnable = atoi(Value); + else if (strcmp(Name, "ScrollerStep") == 0) ScrollerStep = atoi(Value); + else if (strcmp(Name, "ScrollerDelay") == 0) ScrollerDelay = atoi(Value); + else if (strcmp(Name, "ScrollerType") == 0) ScrollerType = atoi(Value); else return false; @@ -203,6 +203,12 @@ class cFlatConfig int MenuItemParseTilde; /* hidden configs (only in setup.conf, no osd menu) */ + // Text Scroller + int ScrollerEnable; + int ScrollerStep; + int ScrollerDelay; + int ScrollerType; + // TVScraper int TVScraperChanInfoShowPoster; double TVScraperChanInfoPosterSize; diff --git a/displaychannel.c b/displaychannel.c index c55077c2..2969474e 100644 --- a/displaychannel.c +++ b/displaychannel.c @@ -82,6 +82,8 @@ cFlatDisplayChannel::cFlatDisplayChannel(bool WithInfo) { Config.decorBorderChannelSize+channelHeight - height, channelWidth, heightTop)); chanInfoTopPixmap->Fill( clrTransparent ); + scrollers.SetOsd(osd); + DecorBorderDraw(Config.decorBorderChannelSize, Config.decorBorderChannelSize+channelHeight - height, channelWidth, heightTop + heightBottom + Config.decorProgressChannelSize+marginItem*2, Config.decorBorderChannelSize, Config.decorBorderChannelType, Config.decorBorderChannelFg, Config.decorBorderChannelBg); @@ -307,6 +309,11 @@ void cFlatDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Followi cString epgShort(""); cString epg(""); + scrollers.Clear(); + //scrollers.AddScroller("very long, stupid Text to scroll and other", cRect(20, 500, 300, fontHeight), Theme.Color(clrChannelFontEpg), Theme.Color(clrChannelBg), font); + //scrollers.AddScroller("second very long", cRect(20, 600, 400, fontHeight), Theme.Color(clrChannelFontEpg), Theme.Color(clrChannelBg), font); + //scrollers.AddScroller("third very long, stupid Text to scroll and other", cRect(20, 700, 500, fontHeight), Theme.Color(clrChannelFontEpg), Theme.Color(clrChannelBg), font); + chanInfoBottomPixmap->Fill(Theme.Color(clrChannelBg)); chanIconsPixmap->Fill( clrTransparent ); @@ -320,10 +327,10 @@ void cFlatDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Followi cString endTime = Present->GetEndTimeString(); cString timeString = cString::sprintf("%s - %s", *startTime, *endTime); - int timeStringWidth = fontSml->Width(*timeString); + int timeStringWidth = fontSml->Width(*timeString) + fontSml->Width(" "); - int epgWidth = font->Width(Present->Title()) + marginItem+2; - int epgShortWidth = fontSml->Width(Present->ShortText()) + marginItem+2; + int epgWidth = font->Width(Present->Title()) + marginItem*2; + int epgShortWidth = fontSml->Width(Present->ShortText()) + marginItem*2; if( Present->HasTimer() ) { isRec = true; @@ -334,8 +341,11 @@ void cFlatDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Followi int sleft = (Present->Duration() / 60) - s; cString seen = cString::sprintf("%d-/%d+ %d min", s, sleft, Present->Duration() / 60); - int seenWidth = fontSml->Width(*seen); + int seenWidth = fontSml->Width(*seen) + fontSml->Width(" "); + epg = Present->Title(); + epgShort = Present->ShortText(); + /* if( epgWidth > channelWidth - left - timeStringWidth) { int dotsWidth = font->Width("... "); cTextWrapper epgInfoWrapper(Present->Title(), font, channelWidth - left - timeStringWidth - dotsWidth); @@ -350,7 +360,7 @@ void cFlatDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Followi epg = Present->Title(); } - if( epgShortWidth > channelWidth - left - timeStringWidth) { + if( epgShortWidth > channelWidth - left - seenWidth) { int dotsWidth = fontSml->Width("... "); cTextWrapper epgInfoWrapper(Present->ShortText(), fontSml, channelWidth - left - timeStringWidth - dotsWidth); epgShort = epgInfoWrapper.GetLine(0); @@ -358,14 +368,23 @@ void cFlatDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Followi } else { epgShort = Present->ShortText(); } - + */ chanInfoBottomPixmap->DrawText(cPoint(channelWidth - timeStringWidth - marginItem * 2, 0), *timeString, - Theme.Color(clrChannelFontEpg), Theme.Color(clrChannelBg), fontSml); + Theme.Color(clrChannelFontEpg), Theme.Color(clrChannelBg), fontSml, timeStringWidth, 0, taRight); chanInfoBottomPixmap->DrawText(cPoint(channelWidth - seenWidth - marginItem * 2, fontSmlHeight), *seen, - Theme.Color(clrChannelFontEpg), Theme.Color(clrChannelBg), fontSml); + Theme.Color(clrChannelFontEpg), Theme.Color(clrChannelBg), fontSml, seenWidth, 0, taRight); - chanInfoBottomPixmap->DrawText(cPoint(left, 0), *epg, Theme.Color(clrChannelFontEpg), Theme.Color(clrChannelBg), font); - chanInfoBottomPixmap->DrawText(cPoint(left, fontHeight), *epgShort, Theme.Color(clrChannelFontEpg), Theme.Color(clrChannelBg), fontSml); + if( (epgWidth > channelWidth - left - timeStringWidth) && Config.ScrollerEnable ) { + scrollers.AddScroller(*epg, cRect(Config.decorBorderChannelSize + left, Config.decorBorderChannelSize+channelHeight - heightBottom, channelWidth - left - timeStringWidth, fontHeight), Theme.Color(clrChannelFontEpg), clrTransparent, font); + } else { + chanInfoBottomPixmap->DrawText(cPoint(left, 0), *epg, Theme.Color(clrChannelFontEpg), Theme.Color(clrChannelBg), font, channelWidth - left - timeStringWidth); + } + + if( (epgShortWidth > channelWidth - left - seenWidth) && Config.ScrollerEnable ) { + scrollers.AddScroller(*epgShort, cRect(Config.decorBorderChannelSize + left, Config.decorBorderChannelSize+channelHeight - heightBottom + fontHeight, channelWidth - left - seenWidth, fontSmlHeight), Theme.Color(clrChannelFontEpg), clrTransparent, fontSml); + } else { + chanInfoBottomPixmap->DrawText(cPoint(left, fontHeight), *epgShort, Theme.Color(clrChannelFontEpg), Theme.Color(clrChannelBg), fontSml, channelWidth - left - seenWidth); + } if( isRec ) { chanInfoBottomPixmap->DrawText(cPoint(left + epgWidth + marginItem - RecWidth, 0), "REC", @@ -379,10 +398,10 @@ void cFlatDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Followi cString endTime = Following->GetEndTimeString(); cString timeString = cString::sprintf("%s - %s", *startTime, *endTime); - int timeStringWidth = fontSml->Width(*timeString); + int timeStringWidth = fontSml->Width(*timeString) + fontSml->Width(" "); - int epgWidth = font->Width(Following->Title()) + marginItem+2; - int epgShortWidth = fontSml->Width(Following->ShortText()) + marginItem+2; + int epgWidth = font->Width(Following->Title()) + marginItem*2; + int epgShortWidth = fontSml->Width("1234567890 asdf asdf lkjdf nv.x,cvfgnjĂśawketu 2934785zjghk ldu3") + marginItem*2; if( Following->HasTimer() ) { epgWidth += marginItem + RecWidth; @@ -390,8 +409,12 @@ void cFlatDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Followi } cString dur = cString::sprintf("%d min", Following->Duration() / 60); - int durWidth = fontSml->Width(*dur); + int durWidth = fontSml->Width(*dur) + fontSml->Width(" "); + epg = Following->Title(); + epgShort = Following->ShortText(); + epgShort = "1234567890 asdf asdf lkjdf nv.x,cvfgnjĂśawketu 2934785zjghk ldu3"; +/* if( epgWidth > channelWidth - left - timeStringWidth ) { int dotsWidth = font->Width("... "); cTextWrapper epgInfoWrapper(Following->Title(), font, channelWidth - left - timeStringWidth - dotsWidth); @@ -405,7 +428,7 @@ void cFlatDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Followi } else { epg = Following->Title(); } - if (epgShortWidth > channelWidth - left - timeStringWidth ) { + if (epgShortWidth > channelWidth - left - durWidth ) { int dotsWidth = fontSml->Width("... "); cTextWrapper epgInfoWrapper(Following->ShortText(), fontSml, channelWidth - left - timeStringWidth - dotsWidth); epgShort = epgInfoWrapper.GetLine(0); @@ -413,16 +436,25 @@ void cFlatDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Followi } else { epgShort = Following->ShortText(); } - +*/ chanInfoBottomPixmap->DrawText(cPoint(channelWidth - timeStringWidth - marginItem * 2, fontHeight + fontSmlHeight), *timeString, - Theme.Color(clrChannelFontEpgFollow), Theme.Color(clrChannelBg), fontSml); + Theme.Color(clrChannelFontEpgFollow), Theme.Color(clrChannelBg), fontSml, timeStringWidth, 0, taRight); chanInfoBottomPixmap->DrawText(cPoint(channelWidth - durWidth - marginItem * 2, fontHeight + fontSmlHeight*2), *dur, - Theme.Color(clrChannelFontEpgFollow), Theme.Color(clrChannelBg), fontSml); + Theme.Color(clrChannelFontEpgFollow), Theme.Color(clrChannelBg), fontSml, durWidth, 0, taRight); - chanInfoBottomPixmap->DrawText(cPoint(left, fontHeight + fontSmlHeight), *epg, - Theme.Color(clrChannelFontEpgFollow), Theme.Color(clrChannelBg), font); - chanInfoBottomPixmap->DrawText(cPoint(left, fontHeight*2 + fontSmlHeight), *epgShort, - Theme.Color(clrChannelFontEpgFollow), Theme.Color(clrChannelBg), fontSml); + if( (epgWidth > channelWidth - left - timeStringWidth) && Config.ScrollerEnable ) { + scrollers.AddScroller(*epg, cRect(Config.decorBorderChannelSize + left, Config.decorBorderChannelSize+channelHeight - heightBottom + fontHeight + fontSmlHeight, channelWidth - left - timeStringWidth, fontHeight), Theme.Color(clrChannelFontEpg), clrTransparent, font); + } else { + chanInfoBottomPixmap->DrawText(cPoint(left, fontHeight + fontSmlHeight), *epg, + Theme.Color(clrChannelFontEpgFollow), Theme.Color(clrChannelBg), font, channelWidth - left - timeStringWidth); + } + + if( (epgShortWidth > channelWidth - left - durWidth) && Config.ScrollerEnable ) { + scrollers.AddScroller(*epgShort, cRect(Config.decorBorderChannelSize + left, Config.decorBorderChannelSize+channelHeight - heightBottom + fontHeight*2 + fontSmlHeight, channelWidth - left - durWidth, fontSmlHeight), Theme.Color(clrChannelFontEpg), clrTransparent, fontSml); + } else { + chanInfoBottomPixmap->DrawText(cPoint(left, fontHeight*2 + fontSmlHeight), *epgShort, + Theme.Color(clrChannelFontEpgFollow), Theme.Color(clrChannelBg), fontSml, channelWidth - left - durWidth); + } if( isRec ) { chanInfoBottomPixmap->DrawText(cPoint(left + epgWidth + marginItem - RecWidth, fontHeight + fontSmlHeight), "REC", diff --git a/icons/MVBerry/changroup.png b/icons/MVBerry/changroup.png Binary files differindex 03e33de0..a7536fd4 100644 --- a/icons/MVBerry/changroup.png +++ b/icons/MVBerry/changroup.png diff --git a/icons/MVBerry/forward_sel.png b/icons/MVBerry/forward_sel.png Binary files differindex db43efa8..52c30b98 100644 --- a/icons/MVBerry/forward_sel.png +++ b/icons/MVBerry/forward_sel.png diff --git a/icons/MVBerry/pause_sel.png b/icons/MVBerry/pause_sel.png Binary files differindex 45ccf287..03fa43ad 100644 --- a/icons/MVBerry/pause_sel.png +++ b/icons/MVBerry/pause_sel.png diff --git a/icons/MVBerry/play_sel.png b/icons/MVBerry/play_sel.png Binary files differindex 30ba1c03..a3b4e946 100644 --- a/icons/MVBerry/play_sel.png +++ b/icons/MVBerry/play_sel.png diff --git a/icons/MVBerry/prev_sel.png b/icons/MVBerry/prev_sel.png Binary files differindex c3ef4c6d..c71bd970 100644 --- a/icons/MVBerry/prev_sel.png +++ b/icons/MVBerry/prev_sel.png diff --git a/icons/MVBerry/recording_cutted_extra.png b/icons/MVBerry/recording_cutted_extra.png Binary files differindex f174f90d..fa3776c2 100644 --- a/icons/MVBerry/recording_cutted_extra.png +++ b/icons/MVBerry/recording_cutted_extra.png diff --git a/icons/MVBerry/recording_new.png b/icons/MVBerry/recording_new.png Binary files differindex 7b0a27ff..dbbd65c9 100644 --- a/icons/MVBerry/recording_new.png +++ b/icons/MVBerry/recording_new.png diff --git a/icons/MVBerry/rewind_sel.png b/icons/MVBerry/rewind_sel.png Binary files differindex ba58d08d..8186c374 100644 --- a/icons/MVBerry/rewind_sel.png +++ b/icons/MVBerry/rewind_sel.png diff --git a/icons/MVBerry/skip_sel.png b/icons/MVBerry/skip_sel.png Binary files differindex f5b1dc64..43862cb1 100644 --- a/icons/MVBerry/skip_sel.png +++ b/icons/MVBerry/skip_sel.png diff --git a/icons/MVBerry/timer_full.png b/icons/MVBerry/timer_full.png Binary files differindex bd85cf48..38255804 100644 --- a/icons/MVBerry/timer_full.png +++ b/icons/MVBerry/timer_full.png diff --git a/icons/MVBerry/timer_partial.png b/icons/MVBerry/timer_partial.png Binary files differindex aaebda0a..44e8c975 100644 --- a/icons/MVBerry/timer_partial.png +++ b/icons/MVBerry/timer_partial.png diff --git a/icons/MVBerry/vps.png b/icons/MVBerry/vps.png Binary files differindex 9d1b028c..ec3ed3c2 100644 --- a/icons/MVBerry/vps.png +++ b/icons/MVBerry/vps.png diff --git a/icons/MVBlood/changroup.png b/icons/MVBlood/changroup.png Binary files differindex aa2674f6..6b017b61 100644 --- a/icons/MVBlood/changroup.png +++ b/icons/MVBlood/changroup.png diff --git a/icons/MVBlood/forward_sel.png b/icons/MVBlood/forward_sel.png Binary files differindex 8f29d76b..d060d249 100644 --- a/icons/MVBlood/forward_sel.png +++ b/icons/MVBlood/forward_sel.png diff --git a/icons/MVBlood/pause_sel.png b/icons/MVBlood/pause_sel.png Binary files differindex 45043e0f..30a5d684 100644 --- a/icons/MVBlood/pause_sel.png +++ b/icons/MVBlood/pause_sel.png diff --git a/icons/MVBlood/play_sel.png b/icons/MVBlood/play_sel.png Binary files differindex 29494741..2753747c 100644 --- a/icons/MVBlood/play_sel.png +++ b/icons/MVBlood/play_sel.png diff --git a/icons/MVBlood/prev_sel.png b/icons/MVBlood/prev_sel.png Binary files differindex 6c985f8f..a464f75a 100644 --- a/icons/MVBlood/prev_sel.png +++ b/icons/MVBlood/prev_sel.png diff --git a/icons/MVBlood/recording_cutted_extra.png b/icons/MVBlood/recording_cutted_extra.png Binary files differindex f2e4afff..a890f7d4 100644 --- a/icons/MVBlood/recording_cutted_extra.png +++ b/icons/MVBlood/recording_cutted_extra.png diff --git a/icons/MVBlood/recording_new.png b/icons/MVBlood/recording_new.png Binary files differindex b24225fc..7864aa47 100644 --- a/icons/MVBlood/recording_new.png +++ b/icons/MVBlood/recording_new.png diff --git a/icons/MVBlood/rewind_sel.png b/icons/MVBlood/rewind_sel.png Binary files differindex 0a45dee2..bac4079b 100644 --- a/icons/MVBlood/rewind_sel.png +++ b/icons/MVBlood/rewind_sel.png diff --git a/icons/MVBlood/skip_sel.png b/icons/MVBlood/skip_sel.png Binary files differindex 9eaf886b..47132238 100644 --- a/icons/MVBlood/skip_sel.png +++ b/icons/MVBlood/skip_sel.png diff --git a/icons/MVBlood/timer_full.png b/icons/MVBlood/timer_full.png Binary files differindex e09df449..7e98fd80 100644 --- a/icons/MVBlood/timer_full.png +++ b/icons/MVBlood/timer_full.png diff --git a/icons/MVBlood/timer_partial.png b/icons/MVBlood/timer_partial.png Binary files differindex 1494c9ee..5d5fdef9 100644 --- a/icons/MVBlood/timer_partial.png +++ b/icons/MVBlood/timer_partial.png diff --git a/icons/MVBlood/vps.png b/icons/MVBlood/vps.png Binary files differindex ab1ea9d0..49e764fb 100644 --- a/icons/MVBlood/vps.png +++ b/icons/MVBlood/vps.png diff --git a/icons/MVBlue/changroup.png b/icons/MVBlue/changroup.png Binary files differindex 40d7d1ff..987d824a 100644 --- a/icons/MVBlue/changroup.png +++ b/icons/MVBlue/changroup.png diff --git a/icons/MVBlue/forward_sel.png b/icons/MVBlue/forward_sel.png Binary files differindex cfd1b774..38030b26 100644 --- a/icons/MVBlue/forward_sel.png +++ b/icons/MVBlue/forward_sel.png diff --git a/icons/MVBlue/pause_sel.png b/icons/MVBlue/pause_sel.png Binary files differindex 5ceb3656..a9cce15c 100644 --- a/icons/MVBlue/pause_sel.png +++ b/icons/MVBlue/pause_sel.png diff --git a/icons/MVBlue/play_sel.png b/icons/MVBlue/play_sel.png Binary files differindex 9e708dc4..7fa4fb6d 100644 --- a/icons/MVBlue/play_sel.png +++ b/icons/MVBlue/play_sel.png diff --git a/icons/MVBlue/prev_sel.png b/icons/MVBlue/prev_sel.png Binary files differindex bdf4202d..25f0bae0 100644 --- a/icons/MVBlue/prev_sel.png +++ b/icons/MVBlue/prev_sel.png diff --git a/icons/MVBlue/recording_cutted_extra.png b/icons/MVBlue/recording_cutted_extra.png Binary files differindex f2f9ee88..b23e9538 100644 --- a/icons/MVBlue/recording_cutted_extra.png +++ b/icons/MVBlue/recording_cutted_extra.png diff --git a/icons/MVBlue/recording_new.png b/icons/MVBlue/recording_new.png Binary files differindex 88f9cdda..9919a5be 100644 --- a/icons/MVBlue/recording_new.png +++ b/icons/MVBlue/recording_new.png diff --git a/icons/MVBlue/rewind_sel.png b/icons/MVBlue/rewind_sel.png Binary files differindex bdaa55ea..76cc628e 100644 --- a/icons/MVBlue/rewind_sel.png +++ b/icons/MVBlue/rewind_sel.png diff --git a/icons/MVBlue/skip_sel.png b/icons/MVBlue/skip_sel.png Binary files differindex 69b6b488..d9030cd2 100644 --- a/icons/MVBlue/skip_sel.png +++ b/icons/MVBlue/skip_sel.png diff --git a/icons/MVBlue/timer_full.png b/icons/MVBlue/timer_full.png Binary files differindex fb7f6b4c..0091f476 100644 --- a/icons/MVBlue/timer_full.png +++ b/icons/MVBlue/timer_full.png diff --git a/icons/MVBlue/timer_partial.png b/icons/MVBlue/timer_partial.png Binary files differindex fc1ffcc3..ea080bd6 100644 --- a/icons/MVBlue/timer_partial.png +++ b/icons/MVBlue/timer_partial.png diff --git a/icons/MVBlue/vps.png b/icons/MVBlue/vps.png Binary files differindex 08ef5942..5e33ed02 100644 --- a/icons/MVBlue/vps.png +++ b/icons/MVBlue/vps.png diff --git a/icons/MVCappuchino/changroup.png b/icons/MVCappuchino/changroup.png Binary files differindex 4d3f6729..ec990290 100644 --- a/icons/MVCappuchino/changroup.png +++ b/icons/MVCappuchino/changroup.png diff --git a/icons/MVCappuchino/forward_sel.png b/icons/MVCappuchino/forward_sel.png Binary files differindex 8729ce3a..b83de29c 100644 --- a/icons/MVCappuchino/forward_sel.png +++ b/icons/MVCappuchino/forward_sel.png diff --git a/icons/MVCappuchino/pause_sel.png b/icons/MVCappuchino/pause_sel.png Binary files differindex 40bc56a9..3849edfc 100644 --- a/icons/MVCappuchino/pause_sel.png +++ b/icons/MVCappuchino/pause_sel.png diff --git a/icons/MVCappuchino/play_sel.png b/icons/MVCappuchino/play_sel.png Binary files differindex ad92e78f..78912e55 100644 --- a/icons/MVCappuchino/play_sel.png +++ b/icons/MVCappuchino/play_sel.png diff --git a/icons/MVCappuchino/prev_sel.png b/icons/MVCappuchino/prev_sel.png Binary files differindex 991f6b8f..a8780a22 100644 --- a/icons/MVCappuchino/prev_sel.png +++ b/icons/MVCappuchino/prev_sel.png diff --git a/icons/MVCappuchino/recording_cutted_extra.png b/icons/MVCappuchino/recording_cutted_extra.png Binary files differindex 34be9540..2b6f9b87 100644 --- a/icons/MVCappuchino/recording_cutted_extra.png +++ b/icons/MVCappuchino/recording_cutted_extra.png diff --git a/icons/MVCappuchino/recording_new.png b/icons/MVCappuchino/recording_new.png Binary files differindex 8ed3c7f1..ba45524e 100644 --- a/icons/MVCappuchino/recording_new.png +++ b/icons/MVCappuchino/recording_new.png diff --git a/icons/MVCappuchino/rewind_sel.png b/icons/MVCappuchino/rewind_sel.png Binary files differindex bd2d101b..6b8dc0a1 100644 --- a/icons/MVCappuchino/rewind_sel.png +++ b/icons/MVCappuchino/rewind_sel.png diff --git a/icons/MVCappuchino/skip_sel.png b/icons/MVCappuchino/skip_sel.png Binary files differindex 0f9d50aa..ef93c128 100644 --- a/icons/MVCappuchino/skip_sel.png +++ b/icons/MVCappuchino/skip_sel.png diff --git a/icons/MVCappuchino/timer_full.png b/icons/MVCappuchino/timer_full.png Binary files differindex 3e28d0c7..61e20cab 100644 --- a/icons/MVCappuchino/timer_full.png +++ b/icons/MVCappuchino/timer_full.png diff --git a/icons/MVCappuchino/timer_partial.png b/icons/MVCappuchino/timer_partial.png Binary files differindex 13322cef..35b6f4c7 100644 --- a/icons/MVCappuchino/timer_partial.png +++ b/icons/MVCappuchino/timer_partial.png diff --git a/icons/MVCappuchino/vps.png b/icons/MVCappuchino/vps.png Binary files differindex 3a7a7153..e6a6c8cc 100644 --- a/icons/MVCappuchino/vps.png +++ b/icons/MVCappuchino/vps.png diff --git a/icons/MVChocolate/changroup.png b/icons/MVChocolate/changroup.png Binary files differindex c69244d1..57a80bee 100644 --- a/icons/MVChocolate/changroup.png +++ b/icons/MVChocolate/changroup.png diff --git a/icons/MVChocolate/forward_sel.png b/icons/MVChocolate/forward_sel.png Binary files differindex b7d8c494..c0e61214 100644 --- a/icons/MVChocolate/forward_sel.png +++ b/icons/MVChocolate/forward_sel.png diff --git a/icons/MVChocolate/pause_sel.png b/icons/MVChocolate/pause_sel.png Binary files differindex ad154460..cb36250e 100644 --- a/icons/MVChocolate/pause_sel.png +++ b/icons/MVChocolate/pause_sel.png diff --git a/icons/MVChocolate/play_sel.png b/icons/MVChocolate/play_sel.png Binary files differindex daca7e44..a5934c20 100644 --- a/icons/MVChocolate/play_sel.png +++ b/icons/MVChocolate/play_sel.png diff --git a/icons/MVChocolate/prev_sel.png b/icons/MVChocolate/prev_sel.png Binary files differindex 4f427967..3c7ca1e9 100644 --- a/icons/MVChocolate/prev_sel.png +++ b/icons/MVChocolate/prev_sel.png diff --git a/icons/MVChocolate/recording_cutted_extra.png b/icons/MVChocolate/recording_cutted_extra.png Binary files differindex 613bbabd..624dd5f2 100644 --- a/icons/MVChocolate/recording_cutted_extra.png +++ b/icons/MVChocolate/recording_cutted_extra.png diff --git a/icons/MVChocolate/recording_new.png b/icons/MVChocolate/recording_new.png Binary files differindex f4f86e76..ee473c77 100644 --- a/icons/MVChocolate/recording_new.png +++ b/icons/MVChocolate/recording_new.png diff --git a/icons/MVChocolate/rewind_sel.png b/icons/MVChocolate/rewind_sel.png Binary files differindex eaad1512..114244fc 100644 --- a/icons/MVChocolate/rewind_sel.png +++ b/icons/MVChocolate/rewind_sel.png diff --git a/icons/MVChocolate/skip_sel.png b/icons/MVChocolate/skip_sel.png Binary files differindex 492e25cb..9b213971 100644 --- a/icons/MVChocolate/skip_sel.png +++ b/icons/MVChocolate/skip_sel.png diff --git a/icons/MVChocolate/timer_full.png b/icons/MVChocolate/timer_full.png Binary files differindex 558bef0a..4e1e4870 100644 --- a/icons/MVChocolate/timer_full.png +++ b/icons/MVChocolate/timer_full.png diff --git a/icons/MVChocolate/timer_partial.png b/icons/MVChocolate/timer_partial.png Binary files differindex 0abf9a7d..ff01121a 100644 --- a/icons/MVChocolate/timer_partial.png +++ b/icons/MVChocolate/timer_partial.png diff --git a/icons/MVChocolate/vps.png b/icons/MVChocolate/vps.png Binary files differindex 830e2beb..e953fe65 100644 --- a/icons/MVChocolate/vps.png +++ b/icons/MVChocolate/vps.png diff --git a/icons/MVCyan/changroup.png b/icons/MVCyan/changroup.png Binary files differindex 7c431971..214f55a4 100644 --- a/icons/MVCyan/changroup.png +++ b/icons/MVCyan/changroup.png diff --git a/icons/MVCyan/forward_sel.png b/icons/MVCyan/forward_sel.png Binary files differindex 411705e3..0d1554dc 100644 --- a/icons/MVCyan/forward_sel.png +++ b/icons/MVCyan/forward_sel.png diff --git a/icons/MVCyan/pause_sel.png b/icons/MVCyan/pause_sel.png Binary files differindex 38b795c1..2110e8f5 100644 --- a/icons/MVCyan/pause_sel.png +++ b/icons/MVCyan/pause_sel.png diff --git a/icons/MVCyan/play_sel.png b/icons/MVCyan/play_sel.png Binary files differindex 4954ee54..53079e5c 100644 --- a/icons/MVCyan/play_sel.png +++ b/icons/MVCyan/play_sel.png diff --git a/icons/MVCyan/prev_sel.png b/icons/MVCyan/prev_sel.png Binary files differindex df5880d6..250dcacd 100644 --- a/icons/MVCyan/prev_sel.png +++ b/icons/MVCyan/prev_sel.png diff --git a/icons/MVCyan/recording_cutted_extra.png b/icons/MVCyan/recording_cutted_extra.png Binary files differindex f78acd4b..ae986d61 100644 --- a/icons/MVCyan/recording_cutted_extra.png +++ b/icons/MVCyan/recording_cutted_extra.png diff --git a/icons/MVCyan/recording_new.png b/icons/MVCyan/recording_new.png Binary files differindex a76e1ed1..200e7558 100644 --- a/icons/MVCyan/recording_new.png +++ b/icons/MVCyan/recording_new.png diff --git a/icons/MVCyan/rewind_sel.png b/icons/MVCyan/rewind_sel.png Binary files differindex 72b5d833..884dd784 100644 --- a/icons/MVCyan/rewind_sel.png +++ b/icons/MVCyan/rewind_sel.png diff --git a/icons/MVCyan/skip_sel.png b/icons/MVCyan/skip_sel.png Binary files differindex eca8de28..5a88a224 100644 --- a/icons/MVCyan/skip_sel.png +++ b/icons/MVCyan/skip_sel.png diff --git a/icons/MVCyan/timer_full.png b/icons/MVCyan/timer_full.png Binary files differindex 59d1cfce..04a1e756 100644 --- a/icons/MVCyan/timer_full.png +++ b/icons/MVCyan/timer_full.png diff --git a/icons/MVCyan/timer_partial.png b/icons/MVCyan/timer_partial.png Binary files differindex 172a1b1c..7d0a1765 100644 --- a/icons/MVCyan/timer_partial.png +++ b/icons/MVCyan/timer_partial.png diff --git a/icons/MVCyan/vps.png b/icons/MVCyan/vps.png Binary files differindex 5a93038b..21d67c3c 100644 --- a/icons/MVCyan/vps.png +++ b/icons/MVCyan/vps.png diff --git a/icons/MVDeepBlue/changroup.png b/icons/MVDeepBlue/changroup.png Binary files differindex a52d259c..270494af 100644 --- a/icons/MVDeepBlue/changroup.png +++ b/icons/MVDeepBlue/changroup.png diff --git a/icons/MVDeepBlue/forward_sel.png b/icons/MVDeepBlue/forward_sel.png Binary files differindex 7aafa4a0..1213c39d 100644 --- a/icons/MVDeepBlue/forward_sel.png +++ b/icons/MVDeepBlue/forward_sel.png diff --git a/icons/MVDeepBlue/pause_sel.png b/icons/MVDeepBlue/pause_sel.png Binary files differindex 46e74067..e7e1c6ef 100644 --- a/icons/MVDeepBlue/pause_sel.png +++ b/icons/MVDeepBlue/pause_sel.png diff --git a/icons/MVDeepBlue/play_sel.png b/icons/MVDeepBlue/play_sel.png Binary files differindex 79179447..15ad0968 100644 --- a/icons/MVDeepBlue/play_sel.png +++ b/icons/MVDeepBlue/play_sel.png diff --git a/icons/MVDeepBlue/prev_sel.png b/icons/MVDeepBlue/prev_sel.png Binary files differindex c20ab724..9f9200de 100644 --- a/icons/MVDeepBlue/prev_sel.png +++ b/icons/MVDeepBlue/prev_sel.png diff --git a/icons/MVDeepBlue/recording_cutted_extra.png b/icons/MVDeepBlue/recording_cutted_extra.png Binary files differindex 79e6ebea..af7c29fb 100644 --- a/icons/MVDeepBlue/recording_cutted_extra.png +++ b/icons/MVDeepBlue/recording_cutted_extra.png diff --git a/icons/MVDeepBlue/recording_new.png b/icons/MVDeepBlue/recording_new.png Binary files differindex adbde787..81deee21 100644 --- a/icons/MVDeepBlue/recording_new.png +++ b/icons/MVDeepBlue/recording_new.png diff --git a/icons/MVDeepBlue/rewind_sel.png b/icons/MVDeepBlue/rewind_sel.png Binary files differindex 8ff067f2..fffa2f43 100644 --- a/icons/MVDeepBlue/rewind_sel.png +++ b/icons/MVDeepBlue/rewind_sel.png diff --git a/icons/MVDeepBlue/skip_sel.png b/icons/MVDeepBlue/skip_sel.png Binary files differindex 0ef17a87..81f0878a 100644 --- a/icons/MVDeepBlue/skip_sel.png +++ b/icons/MVDeepBlue/skip_sel.png diff --git a/icons/MVDeepBlue/timer_full.png b/icons/MVDeepBlue/timer_full.png Binary files differindex 967a4c12..fd1b9183 100644 --- a/icons/MVDeepBlue/timer_full.png +++ b/icons/MVDeepBlue/timer_full.png diff --git a/icons/MVDeepBlue/timer_partial.png b/icons/MVDeepBlue/timer_partial.png Binary files differindex a10ce318..fd11e85d 100644 --- a/icons/MVDeepBlue/timer_partial.png +++ b/icons/MVDeepBlue/timer_partial.png diff --git a/icons/MVDeepBlue/vps.png b/icons/MVDeepBlue/vps.png Binary files differindex 03871b6f..704336e7 100644 --- a/icons/MVDeepBlue/vps.png +++ b/icons/MVDeepBlue/vps.png diff --git a/icons/MVFog/changroup.png b/icons/MVFog/changroup.png Binary files differindex 7db72e0b..35924b30 100644 --- a/icons/MVFog/changroup.png +++ b/icons/MVFog/changroup.png diff --git a/icons/MVFog/forward_sel.png b/icons/MVFog/forward_sel.png Binary files differindex 6b17ae5e..ac483e8a 100644 --- a/icons/MVFog/forward_sel.png +++ b/icons/MVFog/forward_sel.png diff --git a/icons/MVFog/pause_sel.png b/icons/MVFog/pause_sel.png Binary files differindex fe891ede..6770ba8e 100644 --- a/icons/MVFog/pause_sel.png +++ b/icons/MVFog/pause_sel.png diff --git a/icons/MVFog/play_sel.png b/icons/MVFog/play_sel.png Binary files differindex fd07e2f0..86cfcb18 100644 --- a/icons/MVFog/play_sel.png +++ b/icons/MVFog/play_sel.png diff --git a/icons/MVFog/prev_sel.png b/icons/MVFog/prev_sel.png Binary files differindex caab801c..30f812b9 100644 --- a/icons/MVFog/prev_sel.png +++ b/icons/MVFog/prev_sel.png diff --git a/icons/MVFog/recording_cutted_extra.png b/icons/MVFog/recording_cutted_extra.png Binary files differindex 6ca8b94e..4bd981cb 100644 --- a/icons/MVFog/recording_cutted_extra.png +++ b/icons/MVFog/recording_cutted_extra.png diff --git a/icons/MVFog/recording_new.png b/icons/MVFog/recording_new.png Binary files differindex dd1c487a..d1969b0e 100644 --- a/icons/MVFog/recording_new.png +++ b/icons/MVFog/recording_new.png diff --git a/icons/MVFog/rewind_sel.png b/icons/MVFog/rewind_sel.png Binary files differindex 01a87a0a..0c84dfaa 100644 --- a/icons/MVFog/rewind_sel.png +++ b/icons/MVFog/rewind_sel.png diff --git a/icons/MVFog/skip_sel.png b/icons/MVFog/skip_sel.png Binary files differindex 6b6d82b5..74890f99 100644 --- a/icons/MVFog/skip_sel.png +++ b/icons/MVFog/skip_sel.png diff --git a/icons/MVFog/timer_full.png b/icons/MVFog/timer_full.png Binary files differindex f8a0a069..bcdc51d0 100644 --- a/icons/MVFog/timer_full.png +++ b/icons/MVFog/timer_full.png diff --git a/icons/MVFog/timer_partial.png b/icons/MVFog/timer_partial.png Binary files differindex d61253ae..c6c2db33 100644 --- a/icons/MVFog/timer_partial.png +++ b/icons/MVFog/timer_partial.png diff --git a/icons/MVFog/vps.png b/icons/MVFog/vps.png Binary files differindex 5b1f4ee4..9eb8ea0c 100644 --- a/icons/MVFog/vps.png +++ b/icons/MVFog/vps.png diff --git a/icons/MVGrapefruit/changroup.png b/icons/MVGrapefruit/changroup.png Binary files differindex d7b57923..57cacf94 100644 --- a/icons/MVGrapefruit/changroup.png +++ b/icons/MVGrapefruit/changroup.png diff --git a/icons/MVGrapefruit/forward_sel.png b/icons/MVGrapefruit/forward_sel.png Binary files differindex 53d82ed4..11fcf6b0 100644 --- a/icons/MVGrapefruit/forward_sel.png +++ b/icons/MVGrapefruit/forward_sel.png diff --git a/icons/MVGrapefruit/pause_sel.png b/icons/MVGrapefruit/pause_sel.png Binary files differindex 1a406c99..6190a85a 100644 --- a/icons/MVGrapefruit/pause_sel.png +++ b/icons/MVGrapefruit/pause_sel.png diff --git a/icons/MVGrapefruit/play_sel.png b/icons/MVGrapefruit/play_sel.png Binary files differindex 188035d8..66d5c047 100644 --- a/icons/MVGrapefruit/play_sel.png +++ b/icons/MVGrapefruit/play_sel.png diff --git a/icons/MVGrapefruit/prev_sel.png b/icons/MVGrapefruit/prev_sel.png Binary files differindex 863735da..c9c31d41 100644 --- a/icons/MVGrapefruit/prev_sel.png +++ b/icons/MVGrapefruit/prev_sel.png diff --git a/icons/MVGrapefruit/recording_cutted_extra.png b/icons/MVGrapefruit/recording_cutted_extra.png Binary files differindex aa0c9562..ac125bee 100644 --- a/icons/MVGrapefruit/recording_cutted_extra.png +++ b/icons/MVGrapefruit/recording_cutted_extra.png diff --git a/icons/MVGrapefruit/recording_new.png b/icons/MVGrapefruit/recording_new.png Binary files differindex 00c5e794..c301cd8a 100644 --- a/icons/MVGrapefruit/recording_new.png +++ b/icons/MVGrapefruit/recording_new.png diff --git a/icons/MVGrapefruit/rewind_sel.png b/icons/MVGrapefruit/rewind_sel.png Binary files differindex 0df08182..0013997b 100644 --- a/icons/MVGrapefruit/rewind_sel.png +++ b/icons/MVGrapefruit/rewind_sel.png diff --git a/icons/MVGrapefruit/skip_sel.png b/icons/MVGrapefruit/skip_sel.png Binary files differindex 3f107c25..65203009 100644 --- a/icons/MVGrapefruit/skip_sel.png +++ b/icons/MVGrapefruit/skip_sel.png diff --git a/icons/MVGrapefruit/timer_full.png b/icons/MVGrapefruit/timer_full.png Binary files differindex 9dab5cbb..a283c437 100644 --- a/icons/MVGrapefruit/timer_full.png +++ b/icons/MVGrapefruit/timer_full.png diff --git a/icons/MVGrapefruit/timer_partial.png b/icons/MVGrapefruit/timer_partial.png Binary files differindex 355d9bf7..2f1fe45b 100644 --- a/icons/MVGrapefruit/timer_partial.png +++ b/icons/MVGrapefruit/timer_partial.png diff --git a/icons/MVGrapefruit/vps.png b/icons/MVGrapefruit/vps.png Binary files differindex c94a0e94..f059e2b0 100644 --- a/icons/MVGrapefruit/vps.png +++ b/icons/MVGrapefruit/vps.png diff --git a/icons/MVGreen/changroup.png b/icons/MVGreen/changroup.png Binary files differindex 319595ac..b61f22de 100644 --- a/icons/MVGreen/changroup.png +++ b/icons/MVGreen/changroup.png diff --git a/icons/MVGreen/forward_sel.png b/icons/MVGreen/forward_sel.png Binary files differindex e35be982..cd19a57f 100644 --- a/icons/MVGreen/forward_sel.png +++ b/icons/MVGreen/forward_sel.png diff --git a/icons/MVGreen/pause_sel.png b/icons/MVGreen/pause_sel.png Binary files differindex 7be974bc..83664037 100644 --- a/icons/MVGreen/pause_sel.png +++ b/icons/MVGreen/pause_sel.png diff --git a/icons/MVGreen/play_sel.png b/icons/MVGreen/play_sel.png Binary files differindex d96a91e3..c17ae595 100644 --- a/icons/MVGreen/play_sel.png +++ b/icons/MVGreen/play_sel.png diff --git a/icons/MVGreen/prev_sel.png b/icons/MVGreen/prev_sel.png Binary files differindex a8d4c734..88afe0fd 100644 --- a/icons/MVGreen/prev_sel.png +++ b/icons/MVGreen/prev_sel.png diff --git a/icons/MVGreen/recording_cutted_extra.png b/icons/MVGreen/recording_cutted_extra.png Binary files differindex 13e280e6..99ca5f84 100644 --- a/icons/MVGreen/recording_cutted_extra.png +++ b/icons/MVGreen/recording_cutted_extra.png diff --git a/icons/MVGreen/recording_new.png b/icons/MVGreen/recording_new.png Binary files differindex defb4e42..bd3946a6 100644 --- a/icons/MVGreen/recording_new.png +++ b/icons/MVGreen/recording_new.png diff --git a/icons/MVGreen/rewind_sel.png b/icons/MVGreen/rewind_sel.png Binary files differindex 093d892f..619b3d6e 100644 --- a/icons/MVGreen/rewind_sel.png +++ b/icons/MVGreen/rewind_sel.png diff --git a/icons/MVGreen/skip_sel.png b/icons/MVGreen/skip_sel.png Binary files differindex 2604bb4b..f2716062 100644 --- a/icons/MVGreen/skip_sel.png +++ b/icons/MVGreen/skip_sel.png diff --git a/icons/MVGreen/timer_full.png b/icons/MVGreen/timer_full.png Binary files differindex 3dae9b92..99d9e66f 100644 --- a/icons/MVGreen/timer_full.png +++ b/icons/MVGreen/timer_full.png diff --git a/icons/MVGreen/timer_partial.png b/icons/MVGreen/timer_partial.png Binary files differindex 273154e2..55338a37 100644 --- a/icons/MVGreen/timer_partial.png +++ b/icons/MVGreen/timer_partial.png diff --git a/icons/MVGreen/vps.png b/icons/MVGreen/vps.png Binary files differindex 6fee3425..95e9538c 100644 --- a/icons/MVGreen/vps.png +++ b/icons/MVGreen/vps.png diff --git a/icons/MVGreen2/changroup.png b/icons/MVGreen2/changroup.png Binary files differindex 319595ac..b61f22de 100644 --- a/icons/MVGreen2/changroup.png +++ b/icons/MVGreen2/changroup.png diff --git a/icons/MVGreen2/forward_sel.png b/icons/MVGreen2/forward_sel.png Binary files differindex e35be982..cd19a57f 100644 --- a/icons/MVGreen2/forward_sel.png +++ b/icons/MVGreen2/forward_sel.png diff --git a/icons/MVGreen2/pause_sel.png b/icons/MVGreen2/pause_sel.png Binary files differindex 7be974bc..83664037 100644 --- a/icons/MVGreen2/pause_sel.png +++ b/icons/MVGreen2/pause_sel.png diff --git a/icons/MVGreen2/play_sel.png b/icons/MVGreen2/play_sel.png Binary files differindex d96a91e3..c17ae595 100644 --- a/icons/MVGreen2/play_sel.png +++ b/icons/MVGreen2/play_sel.png diff --git a/icons/MVGreen2/prev_sel.png b/icons/MVGreen2/prev_sel.png Binary files differindex a8d4c734..88afe0fd 100644 --- a/icons/MVGreen2/prev_sel.png +++ b/icons/MVGreen2/prev_sel.png diff --git a/icons/MVGreen2/recording_cutted_extra.png b/icons/MVGreen2/recording_cutted_extra.png Binary files differindex 13e280e6..99ca5f84 100644 --- a/icons/MVGreen2/recording_cutted_extra.png +++ b/icons/MVGreen2/recording_cutted_extra.png diff --git a/icons/MVGreen2/recording_new.png b/icons/MVGreen2/recording_new.png Binary files differindex defb4e42..bd3946a6 100644 --- a/icons/MVGreen2/recording_new.png +++ b/icons/MVGreen2/recording_new.png diff --git a/icons/MVGreen2/rewind_sel.png b/icons/MVGreen2/rewind_sel.png Binary files differindex 093d892f..619b3d6e 100644 --- a/icons/MVGreen2/rewind_sel.png +++ b/icons/MVGreen2/rewind_sel.png diff --git a/icons/MVGreen2/skip_sel.png b/icons/MVGreen2/skip_sel.png Binary files differindex 2604bb4b..f2716062 100644 --- a/icons/MVGreen2/skip_sel.png +++ b/icons/MVGreen2/skip_sel.png diff --git a/icons/MVGreen2/timer_full.png b/icons/MVGreen2/timer_full.png Binary files differindex 3dae9b92..99d9e66f 100644 --- a/icons/MVGreen2/timer_full.png +++ b/icons/MVGreen2/timer_full.png diff --git a/icons/MVGreen2/timer_partial.png b/icons/MVGreen2/timer_partial.png Binary files differindex 273154e2..55338a37 100644 --- a/icons/MVGreen2/timer_partial.png +++ b/icons/MVGreen2/timer_partial.png diff --git a/icons/MVGreen2/vps.png b/icons/MVGreen2/vps.png Binary files differindex 6fee3425..95e9538c 100644 --- a/icons/MVGreen2/vps.png +++ b/icons/MVGreen2/vps.png diff --git a/icons/MVGrey/changroup.png b/icons/MVGrey/changroup.png Binary files differindex e0bf655e..821ee23f 100644 --- a/icons/MVGrey/changroup.png +++ b/icons/MVGrey/changroup.png diff --git a/icons/MVGrey/forward_sel.png b/icons/MVGrey/forward_sel.png Binary files differindex f1ead5ea..a267453d 100644 --- a/icons/MVGrey/forward_sel.png +++ b/icons/MVGrey/forward_sel.png diff --git a/icons/MVGrey/pause_sel.png b/icons/MVGrey/pause_sel.png Binary files differindex d933eb8c..b4fd2fb5 100644 --- a/icons/MVGrey/pause_sel.png +++ b/icons/MVGrey/pause_sel.png diff --git a/icons/MVGrey/play_sel.png b/icons/MVGrey/play_sel.png Binary files differindex 9d1844be..2579a997 100644 --- a/icons/MVGrey/play_sel.png +++ b/icons/MVGrey/play_sel.png diff --git a/icons/MVGrey/prev_sel.png b/icons/MVGrey/prev_sel.png Binary files differindex 57ce9475..7c556e74 100644 --- a/icons/MVGrey/prev_sel.png +++ b/icons/MVGrey/prev_sel.png diff --git a/icons/MVGrey/recording_cutted_extra.png b/icons/MVGrey/recording_cutted_extra.png Binary files differindex 19c9fda9..0622a583 100644 --- a/icons/MVGrey/recording_cutted_extra.png +++ b/icons/MVGrey/recording_cutted_extra.png diff --git a/icons/MVGrey/recording_new.png b/icons/MVGrey/recording_new.png Binary files differindex d3c42760..d3844c95 100644 --- a/icons/MVGrey/recording_new.png +++ b/icons/MVGrey/recording_new.png diff --git a/icons/MVGrey/rewind_sel.png b/icons/MVGrey/rewind_sel.png Binary files differindex 84d5342e..960f716c 100644 --- a/icons/MVGrey/rewind_sel.png +++ b/icons/MVGrey/rewind_sel.png diff --git a/icons/MVGrey/skip_sel.png b/icons/MVGrey/skip_sel.png Binary files differindex 5b673f66..cf74389d 100644 --- a/icons/MVGrey/skip_sel.png +++ b/icons/MVGrey/skip_sel.png diff --git a/icons/MVGrey/timer_full.png b/icons/MVGrey/timer_full.png Binary files differindex 9bd530c0..27e11a99 100644 --- a/icons/MVGrey/timer_full.png +++ b/icons/MVGrey/timer_full.png diff --git a/icons/MVGrey/timer_partial.png b/icons/MVGrey/timer_partial.png Binary files differindex 60d85229..01dcb8a1 100644 --- a/icons/MVGrey/timer_partial.png +++ b/icons/MVGrey/timer_partial.png diff --git a/icons/MVGrey/vps.png b/icons/MVGrey/vps.png Binary files differindex ceb5dc70..b2242f27 100644 --- a/icons/MVGrey/vps.png +++ b/icons/MVGrey/vps.png diff --git a/icons/MVHelloKitty/changroup.png b/icons/MVHelloKitty/changroup.png Binary files differindex 8aa78187..a0e91924 100644 --- a/icons/MVHelloKitty/changroup.png +++ b/icons/MVHelloKitty/changroup.png diff --git a/icons/MVHelloKitty/forward_sel.png b/icons/MVHelloKitty/forward_sel.png Binary files differindex a1e25cc9..bc5707d9 100644 --- a/icons/MVHelloKitty/forward_sel.png +++ b/icons/MVHelloKitty/forward_sel.png diff --git a/icons/MVHelloKitty/pause_sel.png b/icons/MVHelloKitty/pause_sel.png Binary files differindex 3cdcb929..3f7ca6b9 100644 --- a/icons/MVHelloKitty/pause_sel.png +++ b/icons/MVHelloKitty/pause_sel.png diff --git a/icons/MVHelloKitty/play_sel.png b/icons/MVHelloKitty/play_sel.png Binary files differindex 1ea5ad96..a546ae1a 100644 --- a/icons/MVHelloKitty/play_sel.png +++ b/icons/MVHelloKitty/play_sel.png diff --git a/icons/MVHelloKitty/prev_sel.png b/icons/MVHelloKitty/prev_sel.png Binary files differindex dc699e01..2d3c55bb 100644 --- a/icons/MVHelloKitty/prev_sel.png +++ b/icons/MVHelloKitty/prev_sel.png diff --git a/icons/MVHelloKitty/recording_cutted_extra.png b/icons/MVHelloKitty/recording_cutted_extra.png Binary files differindex 1859be5f..ed9ea006 100644 --- a/icons/MVHelloKitty/recording_cutted_extra.png +++ b/icons/MVHelloKitty/recording_cutted_extra.png diff --git a/icons/MVHelloKitty/recording_new.png b/icons/MVHelloKitty/recording_new.png Binary files differindex 1c0038df..8118952a 100644 --- a/icons/MVHelloKitty/recording_new.png +++ b/icons/MVHelloKitty/recording_new.png diff --git a/icons/MVHelloKitty/rewind_sel.png b/icons/MVHelloKitty/rewind_sel.png Binary files differindex 326a6caf..a4584f29 100644 --- a/icons/MVHelloKitty/rewind_sel.png +++ b/icons/MVHelloKitty/rewind_sel.png diff --git a/icons/MVHelloKitty/skip_sel.png b/icons/MVHelloKitty/skip_sel.png Binary files differindex c8d0228c..aef3872c 100644 --- a/icons/MVHelloKitty/skip_sel.png +++ b/icons/MVHelloKitty/skip_sel.png diff --git a/icons/MVHelloKitty/timer_full.png b/icons/MVHelloKitty/timer_full.png Binary files differindex 4cc7b262..6c9f032f 100644 --- a/icons/MVHelloKitty/timer_full.png +++ b/icons/MVHelloKitty/timer_full.png diff --git a/icons/MVHelloKitty/timer_partial.png b/icons/MVHelloKitty/timer_partial.png Binary files differindex d1f67b39..adbca5f8 100644 --- a/icons/MVHelloKitty/timer_partial.png +++ b/icons/MVHelloKitty/timer_partial.png diff --git a/icons/MVHelloKitty/vps.png b/icons/MVHelloKitty/vps.png Binary files differindex 9f1c1063..b9879f09 100644 --- a/icons/MVHelloKitty/vps.png +++ b/icons/MVHelloKitty/vps.png diff --git a/icons/MVHelloKitty2/changroup.png b/icons/MVHelloKitty2/changroup.png Binary files differindex 8aa78187..a0e91924 100644 --- a/icons/MVHelloKitty2/changroup.png +++ b/icons/MVHelloKitty2/changroup.png diff --git a/icons/MVHelloKitty2/forward_sel.png b/icons/MVHelloKitty2/forward_sel.png Binary files differindex a1e25cc9..bc5707d9 100644 --- a/icons/MVHelloKitty2/forward_sel.png +++ b/icons/MVHelloKitty2/forward_sel.png diff --git a/icons/MVHelloKitty2/pause_sel.png b/icons/MVHelloKitty2/pause_sel.png Binary files differindex 3cdcb929..3f7ca6b9 100644 --- a/icons/MVHelloKitty2/pause_sel.png +++ b/icons/MVHelloKitty2/pause_sel.png diff --git a/icons/MVHelloKitty2/play_sel.png b/icons/MVHelloKitty2/play_sel.png Binary files differindex 1ea5ad96..a546ae1a 100644 --- a/icons/MVHelloKitty2/play_sel.png +++ b/icons/MVHelloKitty2/play_sel.png diff --git a/icons/MVHelloKitty2/prev_sel.png b/icons/MVHelloKitty2/prev_sel.png Binary files differindex dc699e01..2d3c55bb 100644 --- a/icons/MVHelloKitty2/prev_sel.png +++ b/icons/MVHelloKitty2/prev_sel.png diff --git a/icons/MVHelloKitty2/recording_cutted_extra.png b/icons/MVHelloKitty2/recording_cutted_extra.png Binary files differindex 1859be5f..ed9ea006 100644 --- a/icons/MVHelloKitty2/recording_cutted_extra.png +++ b/icons/MVHelloKitty2/recording_cutted_extra.png diff --git a/icons/MVHelloKitty2/recording_new.png b/icons/MVHelloKitty2/recording_new.png Binary files differindex 1c0038df..8118952a 100644 --- a/icons/MVHelloKitty2/recording_new.png +++ b/icons/MVHelloKitty2/recording_new.png diff --git a/icons/MVHelloKitty2/rewind_sel.png b/icons/MVHelloKitty2/rewind_sel.png Binary files differindex 326a6caf..a4584f29 100644 --- a/icons/MVHelloKitty2/rewind_sel.png +++ b/icons/MVHelloKitty2/rewind_sel.png diff --git a/icons/MVHelloKitty2/skip_sel.png b/icons/MVHelloKitty2/skip_sel.png Binary files differindex c8d0228c..aef3872c 100644 --- a/icons/MVHelloKitty2/skip_sel.png +++ b/icons/MVHelloKitty2/skip_sel.png diff --git a/icons/MVHelloKitty2/timer_full.png b/icons/MVHelloKitty2/timer_full.png Binary files differindex 4cc7b262..6c9f032f 100644 --- a/icons/MVHelloKitty2/timer_full.png +++ b/icons/MVHelloKitty2/timer_full.png diff --git a/icons/MVHelloKitty2/timer_partial.png b/icons/MVHelloKitty2/timer_partial.png Binary files differindex d1f67b39..adbca5f8 100644 --- a/icons/MVHelloKitty2/timer_partial.png +++ b/icons/MVHelloKitty2/timer_partial.png diff --git a/icons/MVHelloKitty2/vps.png b/icons/MVHelloKitty2/vps.png Binary files differindex 9f1c1063..b9879f09 100644 --- a/icons/MVHelloKitty2/vps.png +++ b/icons/MVHelloKitty2/vps.png diff --git a/icons/MVLightBlue/changroup.png b/icons/MVLightBlue/changroup.png Binary files differindex 9b426f93..7711036d 100644 --- a/icons/MVLightBlue/changroup.png +++ b/icons/MVLightBlue/changroup.png diff --git a/icons/MVLightBlue/forward_sel.png b/icons/MVLightBlue/forward_sel.png Binary files differindex 6aad5d73..29467472 100644 --- a/icons/MVLightBlue/forward_sel.png +++ b/icons/MVLightBlue/forward_sel.png diff --git a/icons/MVLightBlue/pause_sel.png b/icons/MVLightBlue/pause_sel.png Binary files differindex 4ee626aa..af4938de 100644 --- a/icons/MVLightBlue/pause_sel.png +++ b/icons/MVLightBlue/pause_sel.png diff --git a/icons/MVLightBlue/play_sel.png b/icons/MVLightBlue/play_sel.png Binary files differindex 9ad82d1b..2d4dc5ca 100644 --- a/icons/MVLightBlue/play_sel.png +++ b/icons/MVLightBlue/play_sel.png diff --git a/icons/MVLightBlue/prev_sel.png b/icons/MVLightBlue/prev_sel.png Binary files differindex a2fcffa6..f4694d37 100644 --- a/icons/MVLightBlue/prev_sel.png +++ b/icons/MVLightBlue/prev_sel.png diff --git a/icons/MVLightBlue/recording_cutted_extra.png b/icons/MVLightBlue/recording_cutted_extra.png Binary files differindex f136758f..ad1cac97 100644 --- a/icons/MVLightBlue/recording_cutted_extra.png +++ b/icons/MVLightBlue/recording_cutted_extra.png diff --git a/icons/MVLightBlue/recording_new.png b/icons/MVLightBlue/recording_new.png Binary files differindex 847389a6..cda2a206 100644 --- a/icons/MVLightBlue/recording_new.png +++ b/icons/MVLightBlue/recording_new.png diff --git a/icons/MVLightBlue/rewind_sel.png b/icons/MVLightBlue/rewind_sel.png Binary files differindex d0606368..28e5abff 100644 --- a/icons/MVLightBlue/rewind_sel.png +++ b/icons/MVLightBlue/rewind_sel.png diff --git a/icons/MVLightBlue/skip_sel.png b/icons/MVLightBlue/skip_sel.png Binary files differindex fccede1d..ef2a6550 100644 --- a/icons/MVLightBlue/skip_sel.png +++ b/icons/MVLightBlue/skip_sel.png diff --git a/icons/MVLightBlue/timer_full.png b/icons/MVLightBlue/timer_full.png Binary files differindex de6246f1..937196e2 100644 --- a/icons/MVLightBlue/timer_full.png +++ b/icons/MVLightBlue/timer_full.png diff --git a/icons/MVLightBlue/timer_partial.png b/icons/MVLightBlue/timer_partial.png Binary files differindex f4c0a105..238f199f 100644 --- a/icons/MVLightBlue/timer_partial.png +++ b/icons/MVLightBlue/timer_partial.png diff --git a/icons/MVLightBlue/vps.png b/icons/MVLightBlue/vps.png Binary files differindex 70ef6996..54e0ed3c 100644 --- a/icons/MVLightBlue/vps.png +++ b/icons/MVLightBlue/vps.png diff --git a/icons/MVLightGreen/changroup.png b/icons/MVLightGreen/changroup.png Binary files differindex 6de5b4d3..1548b388 100644 --- a/icons/MVLightGreen/changroup.png +++ b/icons/MVLightGreen/changroup.png diff --git a/icons/MVLightGreen/forward_sel.png b/icons/MVLightGreen/forward_sel.png Binary files differindex fa2b2f40..53c8768e 100644 --- a/icons/MVLightGreen/forward_sel.png +++ b/icons/MVLightGreen/forward_sel.png diff --git a/icons/MVLightGreen/pause_sel.png b/icons/MVLightGreen/pause_sel.png Binary files differindex 9e690242..d957ec7f 100644 --- a/icons/MVLightGreen/pause_sel.png +++ b/icons/MVLightGreen/pause_sel.png diff --git a/icons/MVLightGreen/play_sel.png b/icons/MVLightGreen/play_sel.png Binary files differindex 89ce4f21..882a1fb9 100644 --- a/icons/MVLightGreen/play_sel.png +++ b/icons/MVLightGreen/play_sel.png diff --git a/icons/MVLightGreen/prev_sel.png b/icons/MVLightGreen/prev_sel.png Binary files differindex f88fc343..47b6d917 100644 --- a/icons/MVLightGreen/prev_sel.png +++ b/icons/MVLightGreen/prev_sel.png diff --git a/icons/MVLightGreen/recording_cutted_extra.png b/icons/MVLightGreen/recording_cutted_extra.png Binary files differindex 5ece46ac..b409a7b5 100644 --- a/icons/MVLightGreen/recording_cutted_extra.png +++ b/icons/MVLightGreen/recording_cutted_extra.png diff --git a/icons/MVLightGreen/recording_new.png b/icons/MVLightGreen/recording_new.png Binary files differindex 9ad9cf63..37d0a068 100644 --- a/icons/MVLightGreen/recording_new.png +++ b/icons/MVLightGreen/recording_new.png diff --git a/icons/MVLightGreen/rewind_sel.png b/icons/MVLightGreen/rewind_sel.png Binary files differindex 1c38d843..56d8614c 100644 --- a/icons/MVLightGreen/rewind_sel.png +++ b/icons/MVLightGreen/rewind_sel.png diff --git a/icons/MVLightGreen/skip_sel.png b/icons/MVLightGreen/skip_sel.png Binary files differindex 8fdff181..2890cd06 100644 --- a/icons/MVLightGreen/skip_sel.png +++ b/icons/MVLightGreen/skip_sel.png diff --git a/icons/MVLightGreen/timer_full.png b/icons/MVLightGreen/timer_full.png Binary files differindex f977f103..dc06173f 100644 --- a/icons/MVLightGreen/timer_full.png +++ b/icons/MVLightGreen/timer_full.png diff --git a/icons/MVLightGreen/timer_partial.png b/icons/MVLightGreen/timer_partial.png Binary files differindex 55a8acfd..8275e444 100644 --- a/icons/MVLightGreen/timer_partial.png +++ b/icons/MVLightGreen/timer_partial.png diff --git a/icons/MVLightGreen/vps.png b/icons/MVLightGreen/vps.png Binary files differindex 021c5315..66f3dcfa 100644 --- a/icons/MVLightGreen/vps.png +++ b/icons/MVLightGreen/vps.png diff --git a/icons/MVMint/changroup.png b/icons/MVMint/changroup.png Binary files differindex 427eb430..7084b357 100644 --- a/icons/MVMint/changroup.png +++ b/icons/MVMint/changroup.png diff --git a/icons/MVMint/forward_sel.png b/icons/MVMint/forward_sel.png Binary files differindex 62381a9d..ef36458f 100644 --- a/icons/MVMint/forward_sel.png +++ b/icons/MVMint/forward_sel.png diff --git a/icons/MVMint/pause_sel.png b/icons/MVMint/pause_sel.png Binary files differindex 3777408b..e95b1ec0 100644 --- a/icons/MVMint/pause_sel.png +++ b/icons/MVMint/pause_sel.png diff --git a/icons/MVMint/play_sel.png b/icons/MVMint/play_sel.png Binary files differindex 2c6b5a07..7fceab0d 100644 --- a/icons/MVMint/play_sel.png +++ b/icons/MVMint/play_sel.png diff --git a/icons/MVMint/prev_sel.png b/icons/MVMint/prev_sel.png Binary files differindex 1859c650..5fa0b21e 100644 --- a/icons/MVMint/prev_sel.png +++ b/icons/MVMint/prev_sel.png diff --git a/icons/MVMint/recording_cutted_extra.png b/icons/MVMint/recording_cutted_extra.png Binary files differindex 6a0dd94f..9ef7b552 100644 --- a/icons/MVMint/recording_cutted_extra.png +++ b/icons/MVMint/recording_cutted_extra.png diff --git a/icons/MVMint/recording_new.png b/icons/MVMint/recording_new.png Binary files differindex 5ababebc..991e4e2a 100644 --- a/icons/MVMint/recording_new.png +++ b/icons/MVMint/recording_new.png diff --git a/icons/MVMint/rewind_sel.png b/icons/MVMint/rewind_sel.png Binary files differindex 5c2b9235..188dcebc 100644 --- a/icons/MVMint/rewind_sel.png +++ b/icons/MVMint/rewind_sel.png diff --git a/icons/MVMint/skip_sel.png b/icons/MVMint/skip_sel.png Binary files differindex c5e7e689..d731fdee 100644 --- a/icons/MVMint/skip_sel.png +++ b/icons/MVMint/skip_sel.png diff --git a/icons/MVMint/timer_full.png b/icons/MVMint/timer_full.png Binary files differindex 4e371411..9c9c6215 100644 --- a/icons/MVMint/timer_full.png +++ b/icons/MVMint/timer_full.png diff --git a/icons/MVMint/timer_partial.png b/icons/MVMint/timer_partial.png Binary files differindex 95da53bc..c06b4d4d 100644 --- a/icons/MVMint/timer_partial.png +++ b/icons/MVMint/timer_partial.png diff --git a/icons/MVMint/vps.png b/icons/MVMint/vps.png Binary files differindex 31a02a78..78f58d5a 100644 --- a/icons/MVMint/vps.png +++ b/icons/MVMint/vps.png diff --git a/icons/MVNuts/changroup.png b/icons/MVNuts/changroup.png Binary files differindex de8d8507..35d47095 100644 --- a/icons/MVNuts/changroup.png +++ b/icons/MVNuts/changroup.png diff --git a/icons/MVNuts/forward_sel.png b/icons/MVNuts/forward_sel.png Binary files differindex db53ecdd..7ddff99b 100644 --- a/icons/MVNuts/forward_sel.png +++ b/icons/MVNuts/forward_sel.png diff --git a/icons/MVNuts/pause_sel.png b/icons/MVNuts/pause_sel.png Binary files differindex afa53f67..24d1215f 100644 --- a/icons/MVNuts/pause_sel.png +++ b/icons/MVNuts/pause_sel.png diff --git a/icons/MVNuts/play_sel.png b/icons/MVNuts/play_sel.png Binary files differindex 839e9421..08493f9d 100644 --- a/icons/MVNuts/play_sel.png +++ b/icons/MVNuts/play_sel.png diff --git a/icons/MVNuts/prev_sel.png b/icons/MVNuts/prev_sel.png Binary files differindex 61359953..ff2a2a4d 100644 --- a/icons/MVNuts/prev_sel.png +++ b/icons/MVNuts/prev_sel.png diff --git a/icons/MVNuts/recording_cutted_extra.png b/icons/MVNuts/recording_cutted_extra.png Binary files differindex abbc6d3b..94b91ec7 100644 --- a/icons/MVNuts/recording_cutted_extra.png +++ b/icons/MVNuts/recording_cutted_extra.png diff --git a/icons/MVNuts/recording_new.png b/icons/MVNuts/recording_new.png Binary files differindex 8eec5b6a..7802999f 100644 --- a/icons/MVNuts/recording_new.png +++ b/icons/MVNuts/recording_new.png diff --git a/icons/MVNuts/rewind_sel.png b/icons/MVNuts/rewind_sel.png Binary files differindex 9b58665d..953a6965 100644 --- a/icons/MVNuts/rewind_sel.png +++ b/icons/MVNuts/rewind_sel.png diff --git a/icons/MVNuts/skip_sel.png b/icons/MVNuts/skip_sel.png Binary files differindex d853c302..6ece17ef 100644 --- a/icons/MVNuts/skip_sel.png +++ b/icons/MVNuts/skip_sel.png diff --git a/icons/MVNuts/timer_full.png b/icons/MVNuts/timer_full.png Binary files differindex 80f16b66..42b54ed7 100644 --- a/icons/MVNuts/timer_full.png +++ b/icons/MVNuts/timer_full.png diff --git a/icons/MVNuts/timer_partial.png b/icons/MVNuts/timer_partial.png Binary files differindex 780fcda8..22d9efa1 100644 --- a/icons/MVNuts/timer_partial.png +++ b/icons/MVNuts/timer_partial.png diff --git a/icons/MVNuts/vps.png b/icons/MVNuts/vps.png Binary files differindex 6c5466e2..91ee528f 100644 --- a/icons/MVNuts/vps.png +++ b/icons/MVNuts/vps.png diff --git a/icons/MVOlive/changroup.png b/icons/MVOlive/changroup.png Binary files differindex 9100d989..c38ef066 100644 --- a/icons/MVOlive/changroup.png +++ b/icons/MVOlive/changroup.png diff --git a/icons/MVOlive/forward_sel.png b/icons/MVOlive/forward_sel.png Binary files differindex af8a712b..685b726c 100644 --- a/icons/MVOlive/forward_sel.png +++ b/icons/MVOlive/forward_sel.png diff --git a/icons/MVOlive/pause_sel.png b/icons/MVOlive/pause_sel.png Binary files differindex c6632567..60455ae0 100644 --- a/icons/MVOlive/pause_sel.png +++ b/icons/MVOlive/pause_sel.png diff --git a/icons/MVOlive/play_sel.png b/icons/MVOlive/play_sel.png Binary files differindex c5bb3c40..23837552 100644 --- a/icons/MVOlive/play_sel.png +++ b/icons/MVOlive/play_sel.png diff --git a/icons/MVOlive/prev_sel.png b/icons/MVOlive/prev_sel.png Binary files differindex 6e3252ef..5e089b65 100644 --- a/icons/MVOlive/prev_sel.png +++ b/icons/MVOlive/prev_sel.png diff --git a/icons/MVOlive/recording_cutted_extra.png b/icons/MVOlive/recording_cutted_extra.png Binary files differindex b3979ecf..9c6844c1 100644 --- a/icons/MVOlive/recording_cutted_extra.png +++ b/icons/MVOlive/recording_cutted_extra.png diff --git a/icons/MVOlive/recording_new.png b/icons/MVOlive/recording_new.png Binary files differindex d8dfaa6d..bea75406 100644 --- a/icons/MVOlive/recording_new.png +++ b/icons/MVOlive/recording_new.png diff --git a/icons/MVOlive/rewind_sel.png b/icons/MVOlive/rewind_sel.png Binary files differindex a0614e93..ea0471ab 100644 --- a/icons/MVOlive/rewind_sel.png +++ b/icons/MVOlive/rewind_sel.png diff --git a/icons/MVOlive/skip_sel.png b/icons/MVOlive/skip_sel.png Binary files differindex c68d7059..133907a9 100644 --- a/icons/MVOlive/skip_sel.png +++ b/icons/MVOlive/skip_sel.png diff --git a/icons/MVOlive/timer_full.png b/icons/MVOlive/timer_full.png Binary files differindex 5a8a7a96..58d2fc3f 100644 --- a/icons/MVOlive/timer_full.png +++ b/icons/MVOlive/timer_full.png diff --git a/icons/MVOlive/timer_partial.png b/icons/MVOlive/timer_partial.png Binary files differindex 71dadc1d..13dab3c5 100644 --- a/icons/MVOlive/timer_partial.png +++ b/icons/MVOlive/timer_partial.png diff --git a/icons/MVOlive/vps.png b/icons/MVOlive/vps.png Binary files differindex 98639c9c..2cb51e4c 100644 --- a/icons/MVOlive/vps.png +++ b/icons/MVOlive/vps.png diff --git a/icons/MVPflaume/changroup.png b/icons/MVPflaume/changroup.png Binary files differindex 81e2dee3..426310e9 100644 --- a/icons/MVPflaume/changroup.png +++ b/icons/MVPflaume/changroup.png diff --git a/icons/MVPflaume/forward_sel.png b/icons/MVPflaume/forward_sel.png Binary files differindex 080d879b..f3c79349 100644 --- a/icons/MVPflaume/forward_sel.png +++ b/icons/MVPflaume/forward_sel.png diff --git a/icons/MVPflaume/pause_sel.png b/icons/MVPflaume/pause_sel.png Binary files differindex 87aa278c..213d6183 100644 --- a/icons/MVPflaume/pause_sel.png +++ b/icons/MVPflaume/pause_sel.png diff --git a/icons/MVPflaume/play_sel.png b/icons/MVPflaume/play_sel.png Binary files differindex 3fb3c9e8..bfa54ae6 100644 --- a/icons/MVPflaume/play_sel.png +++ b/icons/MVPflaume/play_sel.png diff --git a/icons/MVPflaume/prev_sel.png b/icons/MVPflaume/prev_sel.png Binary files differindex f1b8f84d..bbf083fe 100644 --- a/icons/MVPflaume/prev_sel.png +++ b/icons/MVPflaume/prev_sel.png diff --git a/icons/MVPflaume/recording_cutted_extra.png b/icons/MVPflaume/recording_cutted_extra.png Binary files differindex 16595c60..3b665029 100644 --- a/icons/MVPflaume/recording_cutted_extra.png +++ b/icons/MVPflaume/recording_cutted_extra.png diff --git a/icons/MVPflaume/recording_new.png b/icons/MVPflaume/recording_new.png Binary files differindex a8084351..26d2018c 100644 --- a/icons/MVPflaume/recording_new.png +++ b/icons/MVPflaume/recording_new.png diff --git a/icons/MVPflaume/rewind_sel.png b/icons/MVPflaume/rewind_sel.png Binary files differindex b9df8f2a..9152ecf7 100644 --- a/icons/MVPflaume/rewind_sel.png +++ b/icons/MVPflaume/rewind_sel.png diff --git a/icons/MVPflaume/skip_sel.png b/icons/MVPflaume/skip_sel.png Binary files differindex 4ba4f70b..e75e7d69 100644 --- a/icons/MVPflaume/skip_sel.png +++ b/icons/MVPflaume/skip_sel.png diff --git a/icons/MVPflaume/timer_full.png b/icons/MVPflaume/timer_full.png Binary files differindex c0d813a7..a0c62336 100644 --- a/icons/MVPflaume/timer_full.png +++ b/icons/MVPflaume/timer_full.png diff --git a/icons/MVPflaume/timer_partial.png b/icons/MVPflaume/timer_partial.png Binary files differindex eb5a67b7..62453d52 100644 --- a/icons/MVPflaume/timer_partial.png +++ b/icons/MVPflaume/timer_partial.png diff --git a/icons/MVPflaume/vps.png b/icons/MVPflaume/vps.png Binary files differindex ff1ea70c..1930ad55 100644 --- a/icons/MVPflaume/vps.png +++ b/icons/MVPflaume/vps.png diff --git a/icons/MVPumpkin/changroup.png b/icons/MVPumpkin/changroup.png Binary files differindex 3c5e1b61..02194d94 100644 --- a/icons/MVPumpkin/changroup.png +++ b/icons/MVPumpkin/changroup.png diff --git a/icons/MVPumpkin/forward_sel.png b/icons/MVPumpkin/forward_sel.png Binary files differindex 6ff5ec60..b81115c7 100644 --- a/icons/MVPumpkin/forward_sel.png +++ b/icons/MVPumpkin/forward_sel.png diff --git a/icons/MVPumpkin/pause_sel.png b/icons/MVPumpkin/pause_sel.png Binary files differindex 80c62e53..58f13ac3 100644 --- a/icons/MVPumpkin/pause_sel.png +++ b/icons/MVPumpkin/pause_sel.png diff --git a/icons/MVPumpkin/play_sel.png b/icons/MVPumpkin/play_sel.png Binary files differindex 644b3b41..dc7a248d 100644 --- a/icons/MVPumpkin/play_sel.png +++ b/icons/MVPumpkin/play_sel.png diff --git a/icons/MVPumpkin/prev_sel.png b/icons/MVPumpkin/prev_sel.png Binary files differindex 0b8ce0f9..ca760bfc 100644 --- a/icons/MVPumpkin/prev_sel.png +++ b/icons/MVPumpkin/prev_sel.png diff --git a/icons/MVPumpkin/recording_cutted_extra.png b/icons/MVPumpkin/recording_cutted_extra.png Binary files differindex 77c8da0b..0f223897 100644 --- a/icons/MVPumpkin/recording_cutted_extra.png +++ b/icons/MVPumpkin/recording_cutted_extra.png diff --git a/icons/MVPumpkin/recording_new.png b/icons/MVPumpkin/recording_new.png Binary files differindex c82e219f..9d1e5c7d 100644 --- a/icons/MVPumpkin/recording_new.png +++ b/icons/MVPumpkin/recording_new.png diff --git a/icons/MVPumpkin/rewind_sel.png b/icons/MVPumpkin/rewind_sel.png Binary files differindex 15204bcb..ad0af7c5 100644 --- a/icons/MVPumpkin/rewind_sel.png +++ b/icons/MVPumpkin/rewind_sel.png diff --git a/icons/MVPumpkin/skip_sel.png b/icons/MVPumpkin/skip_sel.png Binary files differindex ce329e1a..db311f34 100644 --- a/icons/MVPumpkin/skip_sel.png +++ b/icons/MVPumpkin/skip_sel.png diff --git a/icons/MVPumpkin/timer_full.png b/icons/MVPumpkin/timer_full.png Binary files differindex cdc93bec..bc838c89 100644 --- a/icons/MVPumpkin/timer_full.png +++ b/icons/MVPumpkin/timer_full.png diff --git a/icons/MVPumpkin/timer_partial.png b/icons/MVPumpkin/timer_partial.png Binary files differindex fdd8f639..91a7f92a 100644 --- a/icons/MVPumpkin/timer_partial.png +++ b/icons/MVPumpkin/timer_partial.png diff --git a/icons/MVPumpkin/vps.png b/icons/MVPumpkin/vps.png Binary files differindex 8ab87205..2b4c0c95 100644 --- a/icons/MVPumpkin/vps.png +++ b/icons/MVPumpkin/vps.png diff --git a/icons/MVPurple/changroup.png b/icons/MVPurple/changroup.png Binary files differindex d863d1d9..6a157b1b 100644 --- a/icons/MVPurple/changroup.png +++ b/icons/MVPurple/changroup.png diff --git a/icons/MVPurple/forward_sel.png b/icons/MVPurple/forward_sel.png Binary files differindex 6251db5b..ab212689 100644 --- a/icons/MVPurple/forward_sel.png +++ b/icons/MVPurple/forward_sel.png diff --git a/icons/MVPurple/pause_sel.png b/icons/MVPurple/pause_sel.png Binary files differindex 65d9c8ed..8ed80e5d 100644 --- a/icons/MVPurple/pause_sel.png +++ b/icons/MVPurple/pause_sel.png diff --git a/icons/MVPurple/play_sel.png b/icons/MVPurple/play_sel.png Binary files differindex 37d26a3d..763ca2d6 100644 --- a/icons/MVPurple/play_sel.png +++ b/icons/MVPurple/play_sel.png diff --git a/icons/MVPurple/prev_sel.png b/icons/MVPurple/prev_sel.png Binary files differindex adabb867..446f4493 100644 --- a/icons/MVPurple/prev_sel.png +++ b/icons/MVPurple/prev_sel.png diff --git a/icons/MVPurple/recording_cutted_extra.png b/icons/MVPurple/recording_cutted_extra.png Binary files differindex 29adf96c..078443f3 100644 --- a/icons/MVPurple/recording_cutted_extra.png +++ b/icons/MVPurple/recording_cutted_extra.png diff --git a/icons/MVPurple/recording_new.png b/icons/MVPurple/recording_new.png Binary files differindex 696571af..39d7346b 100644 --- a/icons/MVPurple/recording_new.png +++ b/icons/MVPurple/recording_new.png diff --git a/icons/MVPurple/rewind_sel.png b/icons/MVPurple/rewind_sel.png Binary files differindex 8abd6f45..58c3dfb3 100644 --- a/icons/MVPurple/rewind_sel.png +++ b/icons/MVPurple/rewind_sel.png diff --git a/icons/MVPurple/skip_sel.png b/icons/MVPurple/skip_sel.png Binary files differindex 3a4ae81d..5f1d0994 100644 --- a/icons/MVPurple/skip_sel.png +++ b/icons/MVPurple/skip_sel.png diff --git a/icons/MVPurple/timer_full.png b/icons/MVPurple/timer_full.png Binary files differindex 523f5ac1..b009f206 100644 --- a/icons/MVPurple/timer_full.png +++ b/icons/MVPurple/timer_full.png diff --git a/icons/MVPurple/timer_partial.png b/icons/MVPurple/timer_partial.png Binary files differindex 26285849..d15286a9 100644 --- a/icons/MVPurple/timer_partial.png +++ b/icons/MVPurple/timer_partial.png diff --git a/icons/MVPurple/vps.png b/icons/MVPurple/vps.png Binary files differindex 66622a84..93eb84a3 100644 --- a/icons/MVPurple/vps.png +++ b/icons/MVPurple/vps.png diff --git a/icons/MVPurpleGrey/changroup.png b/icons/MVPurpleGrey/changroup.png Binary files differindex 5c817a45..ca373897 100644 --- a/icons/MVPurpleGrey/changroup.png +++ b/icons/MVPurpleGrey/changroup.png diff --git a/icons/MVPurpleGrey/forward_sel.png b/icons/MVPurpleGrey/forward_sel.png Binary files differindex a544e921..1fef28ed 100644 --- a/icons/MVPurpleGrey/forward_sel.png +++ b/icons/MVPurpleGrey/forward_sel.png diff --git a/icons/MVPurpleGrey/pause_sel.png b/icons/MVPurpleGrey/pause_sel.png Binary files differindex a29c87c2..f5ec4f31 100644 --- a/icons/MVPurpleGrey/pause_sel.png +++ b/icons/MVPurpleGrey/pause_sel.png diff --git a/icons/MVPurpleGrey/play_sel.png b/icons/MVPurpleGrey/play_sel.png Binary files differindex 7e65bc7b..8090729a 100644 --- a/icons/MVPurpleGrey/play_sel.png +++ b/icons/MVPurpleGrey/play_sel.png diff --git a/icons/MVPurpleGrey/prev_sel.png b/icons/MVPurpleGrey/prev_sel.png Binary files differindex 2d540961..ca295806 100644 --- a/icons/MVPurpleGrey/prev_sel.png +++ b/icons/MVPurpleGrey/prev_sel.png diff --git a/icons/MVPurpleGrey/recording_cutted_extra.png b/icons/MVPurpleGrey/recording_cutted_extra.png Binary files differindex c88fe3cf..de5e07d9 100644 --- a/icons/MVPurpleGrey/recording_cutted_extra.png +++ b/icons/MVPurpleGrey/recording_cutted_extra.png diff --git a/icons/MVPurpleGrey/recording_new.png b/icons/MVPurpleGrey/recording_new.png Binary files differindex 6e2ad22a..92b88c36 100644 --- a/icons/MVPurpleGrey/recording_new.png +++ b/icons/MVPurpleGrey/recording_new.png diff --git a/icons/MVPurpleGrey/rewind_sel.png b/icons/MVPurpleGrey/rewind_sel.png Binary files differindex f5843ebb..e073bf7a 100644 --- a/icons/MVPurpleGrey/rewind_sel.png +++ b/icons/MVPurpleGrey/rewind_sel.png diff --git a/icons/MVPurpleGrey/skip_sel.png b/icons/MVPurpleGrey/skip_sel.png Binary files differindex aa8c7de8..878e5538 100644 --- a/icons/MVPurpleGrey/skip_sel.png +++ b/icons/MVPurpleGrey/skip_sel.png diff --git a/icons/MVPurpleGrey/timer_full.png b/icons/MVPurpleGrey/timer_full.png Binary files differindex a785748c..dd46b64a 100644 --- a/icons/MVPurpleGrey/timer_full.png +++ b/icons/MVPurpleGrey/timer_full.png diff --git a/icons/MVPurpleGrey/timer_partial.png b/icons/MVPurpleGrey/timer_partial.png Binary files differindex 70a091c0..98a2a51a 100644 --- a/icons/MVPurpleGrey/timer_partial.png +++ b/icons/MVPurpleGrey/timer_partial.png diff --git a/icons/MVPurpleGrey/vps.png b/icons/MVPurpleGrey/vps.png Binary files differindex f550e802..3bf2f4b5 100644 --- a/icons/MVPurpleGrey/vps.png +++ b/icons/MVPurpleGrey/vps.png diff --git a/icons/MVRauchglas/changroup.png b/icons/MVRauchglas/changroup.png Binary files differindex c69244d1..57a80bee 100644 --- a/icons/MVRauchglas/changroup.png +++ b/icons/MVRauchglas/changroup.png diff --git a/icons/MVRauchglas/forward_sel.png b/icons/MVRauchglas/forward_sel.png Binary files differindex b7d8c494..c0e61214 100644 --- a/icons/MVRauchglas/forward_sel.png +++ b/icons/MVRauchglas/forward_sel.png diff --git a/icons/MVRauchglas/pause_sel.png b/icons/MVRauchglas/pause_sel.png Binary files differindex ad154460..cb36250e 100644 --- a/icons/MVRauchglas/pause_sel.png +++ b/icons/MVRauchglas/pause_sel.png diff --git a/icons/MVRauchglas/play_sel.png b/icons/MVRauchglas/play_sel.png Binary files differindex daca7e44..a5934c20 100644 --- a/icons/MVRauchglas/play_sel.png +++ b/icons/MVRauchglas/play_sel.png diff --git a/icons/MVRauchglas/prev_sel.png b/icons/MVRauchglas/prev_sel.png Binary files differindex 4f427967..3c7ca1e9 100644 --- a/icons/MVRauchglas/prev_sel.png +++ b/icons/MVRauchglas/prev_sel.png diff --git a/icons/MVRauchglas/recording_cutted_extra.png b/icons/MVRauchglas/recording_cutted_extra.png Binary files differindex 613bbabd..624dd5f2 100644 --- a/icons/MVRauchglas/recording_cutted_extra.png +++ b/icons/MVRauchglas/recording_cutted_extra.png diff --git a/icons/MVRauchglas/recording_new.png b/icons/MVRauchglas/recording_new.png Binary files differindex f4f86e76..ee473c77 100644 --- a/icons/MVRauchglas/recording_new.png +++ b/icons/MVRauchglas/recording_new.png diff --git a/icons/MVRauchglas/rewind_sel.png b/icons/MVRauchglas/rewind_sel.png Binary files differindex eaad1512..114244fc 100644 --- a/icons/MVRauchglas/rewind_sel.png +++ b/icons/MVRauchglas/rewind_sel.png diff --git a/icons/MVRauchglas/skip_sel.png b/icons/MVRauchglas/skip_sel.png Binary files differindex 492e25cb..9b213971 100644 --- a/icons/MVRauchglas/skip_sel.png +++ b/icons/MVRauchglas/skip_sel.png diff --git a/icons/MVRauchglas/timer_full.png b/icons/MVRauchglas/timer_full.png Binary files differindex 558bef0a..4e1e4870 100644 --- a/icons/MVRauchglas/timer_full.png +++ b/icons/MVRauchglas/timer_full.png diff --git a/icons/MVRauchglas/timer_partial.png b/icons/MVRauchglas/timer_partial.png Binary files differindex 0abf9a7d..ff01121a 100644 --- a/icons/MVRauchglas/timer_partial.png +++ b/icons/MVRauchglas/timer_partial.png diff --git a/icons/MVRauchglas/vps.png b/icons/MVRauchglas/vps.png Binary files differindex 830e2beb..e953fe65 100644 --- a/icons/MVRauchglas/vps.png +++ b/icons/MVRauchglas/vps.png diff --git a/icons/MVRed/changroup.png b/icons/MVRed/changroup.png Binary files differindex 64dbb5e8..abae87bf 100644 --- a/icons/MVRed/changroup.png +++ b/icons/MVRed/changroup.png diff --git a/icons/MVRed/forward_sel.png b/icons/MVRed/forward_sel.png Binary files differindex d8c2b016..9f721e13 100644 --- a/icons/MVRed/forward_sel.png +++ b/icons/MVRed/forward_sel.png diff --git a/icons/MVRed/pause_sel.png b/icons/MVRed/pause_sel.png Binary files differindex ba6eabc3..8a497ede 100644 --- a/icons/MVRed/pause_sel.png +++ b/icons/MVRed/pause_sel.png diff --git a/icons/MVRed/play_sel.png b/icons/MVRed/play_sel.png Binary files differindex 1e912844..78ae2b8e 100644 --- a/icons/MVRed/play_sel.png +++ b/icons/MVRed/play_sel.png diff --git a/icons/MVRed/prev_sel.png b/icons/MVRed/prev_sel.png Binary files differindex 2ac90c4c..8f9766c1 100644 --- a/icons/MVRed/prev_sel.png +++ b/icons/MVRed/prev_sel.png diff --git a/icons/MVRed/recording_cutted_extra.png b/icons/MVRed/recording_cutted_extra.png Binary files differindex 07590af4..bb9460c2 100644 --- a/icons/MVRed/recording_cutted_extra.png +++ b/icons/MVRed/recording_cutted_extra.png diff --git a/icons/MVRed/recording_new.png b/icons/MVRed/recording_new.png Binary files differindex b0e912ce..aec48395 100644 --- a/icons/MVRed/recording_new.png +++ b/icons/MVRed/recording_new.png diff --git a/icons/MVRed/rewind_sel.png b/icons/MVRed/rewind_sel.png Binary files differindex 384798ee..0bd8b3d8 100644 --- a/icons/MVRed/rewind_sel.png +++ b/icons/MVRed/rewind_sel.png diff --git a/icons/MVRed/skip_sel.png b/icons/MVRed/skip_sel.png Binary files differindex 28716b77..79695d59 100644 --- a/icons/MVRed/skip_sel.png +++ b/icons/MVRed/skip_sel.png diff --git a/icons/MVRed/timer_full.png b/icons/MVRed/timer_full.png Binary files differindex 39f4c9b7..2468066d 100644 --- a/icons/MVRed/timer_full.png +++ b/icons/MVRed/timer_full.png diff --git a/icons/MVRed/timer_partial.png b/icons/MVRed/timer_partial.png Binary files differindex ff3f8f50..be73e538 100644 --- a/icons/MVRed/timer_partial.png +++ b/icons/MVRed/timer_partial.png diff --git a/icons/MVRed/vps.png b/icons/MVRed/vps.png Binary files differindex 02450d4a..e5d2e845 100644 --- a/icons/MVRed/vps.png +++ b/icons/MVRed/vps.png diff --git a/icons/MVXMAS/changroup.png b/icons/MVXMAS/changroup.png Binary files differindex 167316cd..3f9c9cca 100644 --- a/icons/MVXMAS/changroup.png +++ b/icons/MVXMAS/changroup.png diff --git a/icons/MVXMAS/forward_sel.png b/icons/MVXMAS/forward_sel.png Binary files differindex 13c3eff4..ad24b206 100644 --- a/icons/MVXMAS/forward_sel.png +++ b/icons/MVXMAS/forward_sel.png diff --git a/icons/MVXMAS/pause_sel.png b/icons/MVXMAS/pause_sel.png Binary files differindex cc7ae54c..27c2dfea 100644 --- a/icons/MVXMAS/pause_sel.png +++ b/icons/MVXMAS/pause_sel.png diff --git a/icons/MVXMAS/play_sel.png b/icons/MVXMAS/play_sel.png Binary files differindex 02a4be27..1f5a049d 100644 --- a/icons/MVXMAS/play_sel.png +++ b/icons/MVXMAS/play_sel.png diff --git a/icons/MVXMAS/prev_sel.png b/icons/MVXMAS/prev_sel.png Binary files differindex 67a87fdb..e4483b7f 100644 --- a/icons/MVXMAS/prev_sel.png +++ b/icons/MVXMAS/prev_sel.png diff --git a/icons/MVXMAS/recording_cutted_extra.png b/icons/MVXMAS/recording_cutted_extra.png Binary files differindex ac9a9668..f9eb3210 100644 --- a/icons/MVXMAS/recording_cutted_extra.png +++ b/icons/MVXMAS/recording_cutted_extra.png diff --git a/icons/MVXMAS/recording_new.png b/icons/MVXMAS/recording_new.png Binary files differindex f5922f71..e9f6df94 100644 --- a/icons/MVXMAS/recording_new.png +++ b/icons/MVXMAS/recording_new.png diff --git a/icons/MVXMAS/rewind_sel.png b/icons/MVXMAS/rewind_sel.png Binary files differindex ba7d3185..727818b6 100644 --- a/icons/MVXMAS/rewind_sel.png +++ b/icons/MVXMAS/rewind_sel.png diff --git a/icons/MVXMAS/skip_sel.png b/icons/MVXMAS/skip_sel.png Binary files differindex f4e99401..514b41fc 100644 --- a/icons/MVXMAS/skip_sel.png +++ b/icons/MVXMAS/skip_sel.png diff --git a/icons/MVXMAS/timer_full.png b/icons/MVXMAS/timer_full.png Binary files differindex 928f58f8..c7533d34 100644 --- a/icons/MVXMAS/timer_full.png +++ b/icons/MVXMAS/timer_full.png diff --git a/icons/MVXMAS/timer_partial.png b/icons/MVXMAS/timer_partial.png Binary files differindex ba60a36d..64863aeb 100644 --- a/icons/MVXMAS/timer_partial.png +++ b/icons/MVXMAS/timer_partial.png diff --git a/icons/MVXMAS/vps.png b/icons/MVXMAS/vps.png Binary files differindex ad5d0051..040621ea 100644 --- a/icons/MVXMAS/vps.png +++ b/icons/MVXMAS/vps.png diff --git a/icons/MVdefault/169.png b/icons/MVdefault/169.png Binary files differindex 239b6a1b..5a77a95d 100644 --- a/icons/MVdefault/169.png +++ b/icons/MVdefault/169.png diff --git a/icons/MVdefault/221.png b/icons/MVdefault/221.png Binary files differindex 921b74ff..ed087cf2 100644 --- a/icons/MVdefault/221.png +++ b/icons/MVdefault/221.png diff --git a/icons/MVdefault/43.png b/icons/MVdefault/43.png Binary files differindex 48c38535..a7e35f21 100644 --- a/icons/MVdefault/43.png +++ b/icons/MVdefault/43.png diff --git a/icons/MVdefault/crypted.png b/icons/MVdefault/crypted.png Binary files differindex 0cd73ce8..df839897 100644 --- a/icons/MVdefault/crypted.png +++ b/icons/MVdefault/crypted.png diff --git a/icons/MVdefault/forward.png b/icons/MVdefault/forward.png Binary files differindex 71a2c72c..ca2f1f30 100644 --- a/icons/MVdefault/forward.png +++ b/icons/MVdefault/forward.png diff --git a/icons/MVdefault/hd.png b/icons/MVdefault/hd.png Binary files differindex acda9185..42fb8c36 100644 --- a/icons/MVdefault/hd.png +++ b/icons/MVdefault/hd.png diff --git a/icons/MVdefault/pause.png b/icons/MVdefault/pause.png Binary files differindex e21a0356..f5b5f628 100644 --- a/icons/MVdefault/pause.png +++ b/icons/MVdefault/pause.png diff --git a/icons/MVdefault/play.png b/icons/MVdefault/play.png Binary files differindex b97358a8..bddae0de 100644 --- a/icons/MVdefault/play.png +++ b/icons/MVdefault/play.png diff --git a/icons/MVdefault/prev.png b/icons/MVdefault/prev.png Binary files differindex df40d90e..349d85bf 100644 --- a/icons/MVdefault/prev.png +++ b/icons/MVdefault/prev.png diff --git a/icons/MVdefault/rewind.png b/icons/MVdefault/rewind.png Binary files differindex da0d9853..b734099d 100644 --- a/icons/MVdefault/rewind.png +++ b/icons/MVdefault/rewind.png diff --git a/icons/MVdefault/sd.png b/icons/MVdefault/sd.png Binary files differindex 4df1e481..7f5d93c8 100644 --- a/icons/MVdefault/sd.png +++ b/icons/MVdefault/sd.png diff --git a/icons/MVdefault/skip.png b/icons/MVdefault/skip.png Binary files differindex d5a005b5..e77c439f 100644 --- a/icons/MVdefault/skip.png +++ b/icons/MVdefault/skip.png diff --git a/icons/MVdefault/uncrypted.png b/icons/MVdefault/uncrypted.png Binary files differindex edff81d7..04a69fab 100644 --- a/icons/MVdefault/uncrypted.png +++ b/icons/MVdefault/uncrypted.png diff --git a/po/de_DE.po b/po/de_DE.po index 1f9e6e88..ee5cc5ea 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-skinflat 0.3.1\n" "Report-Msgid-Bugs-To: <see README>\n" -"POT-Creation-Date: 2014-06-14 11:52+0200\n" +"POT-Creation-Date: 2014-06-23 21:52+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -219,6 +219,12 @@ msgstr "vertikal" msgid "hoizontal" msgstr "horizontal" +msgid "carriage return" +msgstr "carriage return" + +msgid "left-right-left" +msgstr "links-rechts-links" + msgid "General settings" msgstr "Allgemeine Einstellungen" @@ -282,6 +288,18 @@ msgstr "Meldung unterer Abstand" msgid "Message color position" msgstr "Meldungsfarbe Position" +msgid "Use Textscroller?" +msgstr "Nutze Textscroller?" + +msgid "Scroller step (in pixel)" +msgstr "Scroller Schrittweite (in Pixel)" + +msgid "Scroller delay (in ms)" +msgstr "Scroller Verzögerung (in ms)" + +msgid "Scroller type" +msgstr "Scroller Typ" + msgid "TopBar border by decor-file?" msgstr "TopBar Rand von Decordatei?" @@ -9,6 +9,7 @@ cStringList MenuEventViews; cStringList MenuRecordingViews; cStringList DecorDescriptions; cStringList MessageColorPositions; +cStringList ScrollerTypes; cFlatSetup::cFlatSetup(void) { SetupConfig = Config; @@ -81,6 +82,10 @@ void cFlatSetup::Setup(void) { MessageColorPositions.Append( strdup(tr("vertical")) ); MessageColorPositions.Append( strdup(tr("hoizontal")) ); + ScrollerTypes.Clear(); + ScrollerTypes.Append( strdup( tr("carriage return")) ); + ScrollerTypes.Append( strdup( tr("left-right-left")) ); + Add(new cOsdItem(tr("General settings"), osUnknown, true)); Add(new cOsdItem(tr("Channelinfo settings"), osUnknown, true)); Add(new cOsdItem(tr("Menu settings"), osUnknown, true)); @@ -223,6 +228,10 @@ void cFlatSetup::Store(void) { SetupStore("TVScraperEPGInfoShowActors", Config.TVScraperEPGInfoShowActors); SetupStore("TVScraperRecInfoShowActors", Config.TVScraperRecInfoShowActors); SetupStore("MessageColorPosition", Config.MessageColorPosition); + SetupStore("ScrollerEnable", Config.ScrollerEnable); + SetupStore("ScrollerStep", Config.ScrollerStep); + SetupStore("ScrollerDelay", Config.ScrollerDelay); + SetupStore("ScrollerType", Config.ScrollerType); Config.Init(); } @@ -272,6 +281,20 @@ void cFlatSetupGeneral::Setup(void) { Add(new cMenuEditIntItem(tr("Message bottom offset"), &SetupConfig->MessageOffset)); Add(new cMenuEditStraItem(tr("Message color position"), &SetupConfig->MessageColorPosition, MessageColorPositions.Size(), &MessageColorPositions[0])); + Add(new cMenuEditBoolItem(tr("Use Textscroller?"), &SetupConfig->ScrollerEnable)); + if( SetupConfig->ScrollerEnable ) { + Add(new cMenuEditIntItem(tr("Scroller step (in pixel)"), &SetupConfig->ScrollerStep)); + Add(new cMenuEditIntItem(tr("Scroller delay (in ms)"), &SetupConfig->ScrollerDelay)); + Add(new cMenuEditStraItem(tr("Scroller type"), &SetupConfig->ScrollerType, ScrollerTypes.Size(), &ScrollerTypes[0])); + } else { + cString step = cString::sprintf("%s:\t%d", tr("Scroller step (in pixel)"), SetupConfig->ScrollerStep); + Add(new cOsdItem(step, osUnknown, false)); + cString delay = cString::sprintf("%s:\t%d", tr("Scroller delay (in ms)"), SetupConfig->ScrollerDelay); + Add(new cOsdItem(delay, osUnknown, false)); + cString type = cString::sprintf("%s:\t%s", tr("Scroller type"), ScrollerTypes[SetupConfig->ScrollerType]); + Add(new cOsdItem(type, osUnknown, false)); + } + Add(new cMenuEditBoolItem(tr("TopBar border by decor-file?"), &SetupConfig->decorBorderTopBarByTheme)); if( SetupConfig->decorBorderTopBarByTheme ) { cString type = cString::sprintf("%s:\t%s", tr("TopBar border type"), Bordertypes[SetupConfig->decorBorderTopBarTypeTheme]); @@ -330,6 +353,7 @@ eOSState cFlatSetupGeneral::ProcessKey(eKeys Key) { const char* ItemText = Get(Current())->Text(); if( strstr(ItemText, tr("TopBar border by decor-file?")) != NULL || strstr(ItemText, tr("Message border by decor-file?")) != NULL || + strstr(ItemText, tr("Use Textscroller?")) != NULL || strstr(ItemText, tr("Button border by decor-file?")) != NULL ) { ItemLastSel = Current(); diff --git a/textscroller.c b/textscroller.c new file mode 100644 index 00000000..b1763834 --- /dev/null +++ b/textscroller.c @@ -0,0 +1,143 @@ +#include "textscroller.h" + +void cTextScroll::SetText(const char *text, cRect position, tColor colorFg, tColor colorBg, cFont *font) { + if( Osd == NULL ) + return; + + Text = text; + + Font = font; + Position = position; + + ColorFg = colorFg; ColorBg = colorBg; + cRect drawPort(0, 0, font->Width(Text.c_str()), Position.Height()); + + if( Osd && Pixmap ) + Osd->DestroyPixmap(Pixmap); + + Pixmap = Osd->CreatePixmap(2, Position, drawPort); + Pixmap->Fill( colorBg ); + Draw(); +} + +void cTextScroll::Reset(void) { + if( !Pixmap ) + return; + + Pixmap->SetDrawPortPoint(cPoint(0, 0)); + waitSteps = WAITSTEPS; +} + +void cTextScroll::Draw(void) { + if( !Pixmap ) + return; + Pixmap->DrawText(cPoint(0, 0), Text.c_str(), ColorFg, ColorBg, Font); +} + +void cTextScroll::DoStep(int Step) { + if( !Pixmap ) + return; + + // wait at the beginning for better read + if( waitSteps > 0 ) { + waitSteps--; + return; + } + // wait after return to the front + if( ResetX ) { + ResetX = false; + Pixmap->SetDrawPortPoint(cPoint(0, 0)); + waitSteps = WAITSTEPS; + return; + } + + int drawPortX = Pixmap->DrawPort().X(); + + if( isReserveStep ) + drawPortX += Step; + else + drawPortX -= Step; + + int maxX = Pixmap->DrawPort().Width() - Pixmap->ViewPort().Width(); + maxX *= -1; + + if( ScrollType == 0 ) { + if( drawPortX <= maxX ) { + drawPortX += Step; + ResetX = true; + waitSteps = WAITSTEPS; + } + } else if( ScrollType == 1 ) { + if( drawPortX <= maxX ) { + isReserveStep = true; + waitSteps = WAITSTEPS; + } else if( drawPortX > 0 ) { + isReserveStep = false; + waitSteps = WAITSTEPS; + } + + } + + Pixmap->SetDrawPortPoint(cPoint(drawPortX, 0)); +} + +cTextScrollers::cTextScrollers() { +} + +cTextScrollers::~cTextScrollers() { +} + +void cTextScrollers::Clear(void) { + Cancel(-1); + while( Active() ) + cCondWait::SleepMs(10); + + std::vector<cTextScroll *>::iterator it; + for( it = Scrollers.begin(); it != Scrollers.end(); it++) { + delete *it; + } + + Scrollers.clear(); +} + +void cTextScrollers::AddScroller(const char *text, cRect position, tColor colorFg, tColor colorBg, cFont *font) { + Cancel(-1); + while (Active()) + cCondWait::SleepMs(10); + + Scrollers.push_back( new cTextScroll(Osd, scrollType) ); + Scrollers.back()->SetText(text, position, colorFg, colorBg, font); + + if( !Running() ) { + Start(); + } +} + +void cTextScrollers::Action(void) { + std::vector<cTextScroll *>::iterator it; + for( it = Scrollers.begin(); it != Scrollers.end(); it++) { + if( !Running() ) + return; + cPixmap::Lock(); + (*it)->Reset(); + cPixmap::Unlock(); + } + + while( Running() ) { + std::vector<cTextScroll *>::iterator it; + for( it = Scrollers.begin(); it != Scrollers.end(); it++) { + if( !Running() ) + return; + cPixmap::Lock(); + (*it)->DoStep(scrollStep); + cPixmap::Unlock(); + } + + if (Running()) + Osd->Flush(); + + if (Running()) + cCondWait::SleepMs(scrollDelay); + } +} + diff --git a/textscroller.h b/textscroller.h new file mode 100644 index 00000000..5303cf87 --- /dev/null +++ b/textscroller.h @@ -0,0 +1,87 @@ +#pragma once + +#include <list> +#include "flat.h" +#include <string.h> +#include <vdr/thread.h> + +#define WAITSTEPS 50 + +class cTextScroll +{ +private: + cRect Position; + + tColor ColorFg, ColorBg; + std::string Text; + cFont *Font; + cPixmap *Pixmap; + cOsd *Osd; + + int waitSteps; + bool isReserveStep; + bool ResetX; + int ScrollType; + +public: + cTextScroll(cOsd *osd, int type) { + Font = NULL; + Pixmap = NULL; + Osd = osd; + + ScrollType = type; + isReserveStep = false; + waitSteps = WAITSTEPS; + ResetX = false; + } + + ~cTextScroll() { + if( Pixmap ) { + Osd->DestroyPixmap(Pixmap); + Pixmap = NULL; + } + } + +/* + cTextScroll& operator=(const cTextScroll& other) { + if( this != &other ) { + this->Position = other.Position; + this->Text = other.Text; + this->ColorFg = other.ColorFg; + this->ColorBg = other.ColorBg; + this->Font = other.Font; + this->Pixmap = other.Pixmap; + this->Osd = other.Osd; + dsyslog("operator= pointer: %x", this->Pixmap); + } + return *this; + } +*/ + void Reset(void); + void SetText(const char *text, cRect position, tColor colorFg, tColor colorBg, cFont *font); + void DoStep(int Step); + void Draw(void); + +}; + +class cTextScrollers : public cThread +{ +private: + std::vector<cTextScroll *> Scrollers; + + cOsd *Osd; + int scrollStep, scrollDelay; + int scrollType; + + virtual void Action(void); +public: + cTextScrollers(); + ~cTextScrollers(); + + void Clear(void); + void SetOsd(cOsd *osd) { Osd = osd;} + void SetScrollStep(int step) { scrollStep = step; } + void SetScrollDelay(int delay) { scrollDelay = delay; } + void SetScrollType(int type) { scrollType = type; } + void AddScroller(const char *text, cRect position, tColor colorFg, tColor colorBg, cFont *font); +}; diff --git a/textscroller.o b/textscroller.o Binary files differnew file mode 100644 index 00000000..d035d342 --- /dev/null +++ b/textscroller.o |