Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source

Conflicts:
	src/gui/Makefile.am
	src/gui/user_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 79a2dc262b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)



------------------
This commit was generated by Migit

...

This commit is contained in:

vanhofen

2016-12-15 11:49:05 +01:00

parent 2dae9f273a 39c2751a05

commit 36741264b0

265 changed files with 381 additions and 338 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

data/icons/buttons/0.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 252 B After Width:  |  Height:  |  Size: 312 B

BIN

data/icons/buttons/1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 237 B After Width:  |  Height:  |  Size: 254 B

BIN

data/icons/buttons/2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 265 B After Width:  |  Height:  |  Size: 307 B

BIN

data/icons/buttons/3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 261 B After Width:  |  Height:  |  Size: 316 B

BIN

data/icons/buttons/4.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 246 B After Width:  |  Height:  |  Size: 255 B

BIN

data/icons/buttons/5.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 263 B After Width:  |  Height:  |  Size: 290 B

BIN

data/icons/buttons/6.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 259 B After Width:  |  Height:  |  Size: 323 B

BIN

data/icons/buttons/7.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 250 B After Width:  |  Height:  |  Size: 301 B

BIN

data/icons/buttons/8.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 260 B After Width:  |  Height:  |  Size: 366 B

BIN

data/icons/buttons/9.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 257 B After Width:  |  Height:  |  Size: 321 B

BIN

data/icons/buttons/blau.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 225 B After Width:  |  Height:  |  Size: 236 B

BIN

data/icons/buttons/btn_backward.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 572 B After Width:  |  Height:  |  Size: 350 B

BIN

data/icons/buttons/btn_forward.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 620 B After Width:  |  Height:  |  Size: 354 B

BIN

data/icons/buttons/btn_pause.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 566 B After Width:  |  Height:  |  Size: 249 B

BIN

data/icons/buttons/btn_play.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 580 B After Width:  |  Height:  |  Size: 380 B

BIN

data/icons/buttons/btn_record_active.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 601 B After Width:  |  Height:  |  Size: 336 B

BIN

data/icons/buttons/btn_record_inactive.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 591 B After Width:  |  Height:  |  Size: 340 B

BIN

data/icons/buttons/btn_stop.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 484 B After Width:  |  Height:  |  Size: 245 B

BIN

data/icons/buttons/down.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 263 B After Width:  |  Height:  |  Size: 356 B

BIN

data/icons/buttons/dummy.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 226 B After Width:  |  Height:  |  Size: 217 B

BIN

data/icons/buttons/dummy_small.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 216 B After Width:  |  Height:  |  Size: 217 B

BIN

data/icons/buttons/gelb.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 222 B After Width:  |  Height:  |  Size: 239 B

BIN

data/icons/buttons/gruen.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 231 B After Width:  |  Height:  |  Size: 238 B

BIN

data/icons/buttons/help.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 334 B After Width:  |  Height:  |  Size: 324 B

BIN

data/icons/buttons/help_small.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 251 B After Width:  |  Height:  |  Size: 324 B

BIN

data/icons/buttons/home.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 344 B After Width:  |  Height:  |  Size: 311 B

BIN

data/icons/buttons/info.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 265 B After Width:  |  Height:  |  Size: 238 B

BIN

data/icons/buttons/info_small.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 257 B After Width:  |  Height:  |  Size: 238 B

BIN

data/icons/buttons/left.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 257 B After Width:  |  Height:  |  Size: 354 B

BIN

data/icons/buttons/menu.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 550 B After Width:  |  Height:  |  Size: 327 B

BIN

data/icons/buttons/menu_small.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 323 B After Width:  |  Height:  |  Size: 327 B

BIN

data/icons/buttons/mute_small.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 368 B After Width:  |  Height:  |  Size: 697 B

BIN

data/icons/buttons/mute_zap_gray.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.0 KiB After Width:  |  Height:  |  Size: 827 B

BIN

data/icons/buttons/mute_zap_green.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 992 B After Width:  |  Height:  |  Size: 869 B

BIN

data/icons/buttons/ok.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 350 B After Width:  |  Height:  |  Size: 394 B

BIN

data/icons/buttons/power.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 263 B After Width:  |  Height:  |  Size: 621 B

BIN

data/icons/buttons/right.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 256 B After Width:  |  Height:  |  Size: 350 B

BIN

data/icons/buttons/rot.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 227 B After Width:  |  Height:  |  Size: 236 B

BIN

data/icons/buttons/up.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 267 B After Width:  |  Height:  |  Size: 353 B

BIN

data/icons/filetypes/file.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 259 B After Width:  |  Height:  |  Size: 150 B

BIN

data/icons/filetypes/folder.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 271 B After Width:  |  Height:  |  Size: 100 B

BIN

data/icons/filetypes/movie.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 259 B After Width:  |  Height:  |  Size: 138 B

BIN

data/icons/headers/audio.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 376 B After Width:  |  Height:  |  Size: 150 B

BIN

data/icons/headers/bookmarkmanager.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 379 B After Width:  |  Height:  |  Size: 139 B

BIN

data/icons/headers/colors.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 371 B After Width:  |  Height:  |  Size: 266 B

BIN

data/icons/headers/error.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 326 B After Width:  |  Height:  |  Size: 325 B

BIN

data/icons/headers/features.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 827 B After Width:  |  Height:  |  Size: 229 B

BIN

data/icons/headers/games.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 354 B After Width:  |  Height:  |  Size: 129 B

BIN

data/icons/headers/icon_blue.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 772 B After Width:  |  Height:  |  Size: 341 B

BIN

data/icons/headers/icon_green.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 466 B After Width:  |  Height:  |  Size: 368 B

BIN

data/icons/headers/icon_movieplayer.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 132 B

BIN

data/icons/headers/icon_red.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 366 B After Width:  |  Height:  |  Size: 341 B

BIN

data/icons/headers/icon_yellow.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 362 B After Width:  |  Height:  |  Size: 338 B

BIN

data/icons/headers/icon_ytplay.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.0 KiB After Width:  |  Height:  |  Size: 303 B

BIN

data/icons/headers/information.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 298 B After Width:  |  Height:  |  Size: 320 B

BIN

data/icons/headers/keybinding.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 346 B After Width:  |  Height:  |  Size: 126 B

BIN

data/icons/headers/language.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 KiB After Width:  |  Height:  |  Size: 390 B

BIN

data/icons/headers/lcd.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 339 B After Width:  |  Height:  |  Size: 270 B

BIN

data/icons/headers/mainmenue.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 396 B After Width:  |  Height:  |  Size: 572 B

BIN

data/icons/headers/mp3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 388 B After Width:  |  Height:  |  Size: 150 B

BIN

data/icons/headers/multimedia.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 371 B After Width:  |  Height:  |  Size: 162 B

BIN

data/icons/headers/network.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 394 B After Width:  |  Height:  |  Size: 269 B

BIN

data/icons/headers/personalize.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.8 KiB After Width:  |  Height:  |  Size: 188 B

BIN

data/icons/headers/recording.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 384 B After Width:  |  Height:  |  Size: 181 B

BIN

data/icons/headers/settings.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 386 B After Width:  |  Height:  |  Size: 326 B

BIN

data/icons/headers/shell.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 163 B After Width:  |  Height:  |  Size: 122 B

BIN

data/icons/headers/softupdate.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 409 B After Width:  |  Height:  |  Size: 345 B

BIN

data/icons/headers/streaming.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 372 B After Width:  |  Height:  |  Size: 251 B

BIN

data/icons/headers/timer.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 379 B After Width:  |  Height:  |  Size: 329 B

BIN

data/icons/headers/upnp.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 214 B

BIN

data/icons/headers/video.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 353 B After Width:  |  Height:  |  Size: 134 B

BIN

data/icons/hints/hint_a_pic.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 488 B

BIN

data/icons/hints/hint_adzap.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.9 KiB After Width:  |  Height:  |  Size: 335 B

BIN

data/icons/hints/hint_aplay.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.7 KiB After Width:  |  Height:  |  Size: 434 B

BIN

data/icons/hints/hint_audio.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.7 KiB After Width:  |  Height:  |  Size: 219 B

BIN

data/icons/hints/hint_back.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.9 KiB After Width:  |  Height:  |  Size: 151 B

BIN

data/icons/hints/hint_bedit.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.9 KiB After Width:  |  Height:  |  Size: 199 B

BIN

data/icons/hints/hint_blank_screen.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.0 KiB After Width:  |  Height:  |  Size: 229 B

BIN

data/icons/hints/hint_ci.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.4 KiB After Width:  |  Height:  |  Size: 258 B

BIN

data/icons/hints/hint_dboxinfo.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.1 KiB After Width:  |  Height:  |  Size: 187 B

BIN

data/icons/hints/hint_delete.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.6 KiB After Width:  |  Height:  |  Size: 228 B

BIN

data/icons/hints/hint_extended.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.9 KiB After Width:  |  Height:  |  Size: 344 B

BIN

data/icons/hints/hint_fileplay.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.5 KiB After Width:  |  Height:  |  Size: 204 B

BIN

data/icons/hints/hint_games.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.6 KiB After Width:  |  Height:  |  Size: 172 B

BIN

data/icons/hints/hint_hdd.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 574 B

BIN

data/icons/hints/hint_hdd_info.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.0 KiB After Width:  |  Height:  |  Size: 659 B

BIN

data/icons/hints/hint_iconsPKG0.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 131 B After Width:  |  Height:  |  Size: 355 B

BIN

data/icons/hints/hint_iconsPKG1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 350 B After Width:  |  Height:  |  Size: 336 B

BIN

data/icons/hints/hint_iconsPKG2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 993 B After Width:  |  Height:  |  Size: 991 B

BIN

data/icons/hints/hint_iconsPKG3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 745 B After Width:  |  Height:  |  Size: 744 B

BIN

data/icons/hints/hint_imageinfo.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.2 KiB After Width:  |  Height:  |  Size: 655 B

BIN

data/icons/hints/hint_imagelogo.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 863 B

BIN

data/icons/hints/hint_inetradio.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.2 KiB After Width:  |  Height:  |  Size: 516 B

BIN

data/icons/hints/hint_info.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.9 KiB After Width:  |  Height:  |  Size: 655 B

BIN

data/icons/hints/hint_keys.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 467 B

BIN

data/icons/hints/hint_language.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.7 KiB After Width:  |  Height:  |  Size: 812 B

BIN

data/icons/hints/hint_lcd4linux.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 298 B After Width:  |  Height:  |  Size: 325 B

BIN

data/icons/hints/hint_manage.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 249 B

BIN

data/icons/hints/hint_mb.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.3 KiB After Width:  |  Height:  |  Size: 281 B

BIN

data/icons/hints/hint_media.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.0 KiB After Width:  |  Height:  |  Size: 416 B

Some files were not shown because too many files have changed in this diff Show More