Commit Graph

189 Commits

Author SHA1 Message Date
Thilo Graf
ab2a2779d6 moviebrowser/mb.cpp: use key blue instead key 3 for reload movies
Alignment to function of blue button in main movie browser window.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69440f9c3e
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-05-07 (Tue, 07 May 2019)



------------------
This commit was generated by Migit
2019-05-07 22:36:08 +02:00
Thilo Graf
e04b2b9a10 moviebrowser/mb.cpp: fix possible fragments on screen while scrolling
Origin commit data
------------------
Branch: ni/coolstream
Commit: 76d050fc4a
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-05-07 (Tue, 07 May 2019)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-05-07 22:36:08 +02:00
vanhofen
0db3d1c4f4 locale: remove obsolete LOCALE_MOVIEBROWSER_IMDB_DATA
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9fc41bbf09
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-05-06 (Mon, 06 May 2019)

Origin message was:
------------------
- locale: remove obsolete LOCALE_MOVIEBROWSER_IMDB_DATA

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-05-06 19:31:39 +02:00
Thilo Graf
e78cdfc2e4 moviebrowser: use separate locale for movie database request
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4ec00dfa19
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-05-06 (Mon, 06 May 2019)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-05-06 19:31:39 +02:00
Thilo Graf
86e701cfd3 moviebrowser: use more generic action key name
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cc9290678
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-05-06 (Mon, 06 May 2019)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-05-06 19:31:39 +02:00
Thilo Graf
42a5f0d1b2 moviebrowser: show lastplay date only when really no played in info menu
Last play date was filled with sensles data.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 927bbf74b4
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-05-05 (Sun, 05 May 2019)



------------------
This commit was generated by Migit
2019-05-05 22:44:29 +02:00
Thilo Graf
6307e4c75b moviebrowser: show minute instead percent for last play stop
Origin commit data
------------------
Branch: ni/coolstream
Commit: 695320debc
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-05-05 (Sun, 05 May 2019)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-05-05 22:44:29 +02:00
Thilo Graf
fcd10f6302 moviebrowser: add switch for cut of text inside rows, default enabled
Origin commit data
------------------
Branch: ni/coolstream
Commit: 52f85ed3d0
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-05-05 (Sun, 05 May 2019)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-05-05 22:44:29 +02:00
Thilo Graf
c7eaad1120 moviebrowser: use MESSAGEBOX_YES_NO_OPTIONS struct from mymenu.h
avoid dub code


Origin commit data
------------------
Branch: ni/coolstream
Commit: ed0b583ec1
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-05-05 (Sun, 05 May 2019)



------------------
This commit was generated by Migit
2019-05-05 22:44:29 +02:00
Thilo Graf
d3292c2cf6 moviebrowser: add possibility to show visualized elapsed time
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a3bafd457
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-05-05 (Sun, 05 May 2019)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-05-05 22:44:28 +02:00
Jacek Jendrzej
b16e9b0327 fix segfault,supplement to 69ae7d89e3f179a4263abbadc6cc7951607a3854
Origin commit data
------------------
Branch: ni/coolstream
Commit: 48f101404d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-05-01 (Wed, 01 May 2019)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-05-01 16:28:43 +02:00
vanhofen
cc76d8af71 moviebrowser: reset selected item in MB_FOCUS_LAST_PLAY after deleting any movie
Origin commit data
------------------
Branch: ni/coolstream
Commit: 54f162a41a
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-30 (Sat, 30 Mar 2019)

Origin message was:
------------------
- moviebrowser: reset selected item in MB_FOCUS_LAST_PLAY after deleting any movie

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-03-30 00:27:40 +01:00
vanhofen
abf08f7ee8 moviebrowser: better check for *tmdb's availability
Origin commit data
------------------
Branch: ni/coolstream
Commit: 57b59145b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-19 (Tue, 19 Mar 2019)

Origin message was:
------------------
- moviebrowser: better check for *tmdb's availability

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-03-19 21:11:12 +01:00
vanhofen
2365589d80 moviebrowser: fix segfault (second tmdb call crashes)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d14a2b796
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-19 (Tue, 19 Mar 2019)

Origin message was:
------------------
- moviebrowser: fix segfault (second tmdb call crashes)

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-03-19 20:00:37 +01:00
BPanther
e50651428b tmdb cleanup
Origin commit data
------------------
Branch: ni/coolstream
Commit: 577611e3cf
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2019-03-18 (Mon, 18 Mar 2019)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-03-19 12:15:47 +01:00
TangoCash
a9b3fd02c6 rework tmdb class
Origin commit data
------------------
Branch: ni/coolstream
Commit: a633525ba2
Author: TangoCash <eric@loxat.de>
Date: 2019-03-03 (Sun, 03 Mar 2019)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-03-03 22:20:23 +01:00
Thilo Graf
49059fb89f moviebrowser.cpp: fix position of top marker for details line
Top marker was painted at wrong y position.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cff6f52a2
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-02-23 (Sat, 23 Feb 2019)



------------------
This commit was generated by Migit
2019-02-23 22:40:56 +01:00
vanhofen
7fe588d9a0 moviebrowser: re-enable both progressbars while loading movies (for testing)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2714c5d9b7
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-13 (Sun, 13 Jan 2019)

Origin message was:
------------------
- moviebrowser: re-enable both progressbars while loading movies (for testing)

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-01-13 00:35:39 +01:00
vanhofen
24d226a5ca moviebrowser: load movies and refresh gui after menu only if needed
Origin commit data
------------------
Branch: ni/coolstream
Commit: a91a2460c7
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-12 (Sat, 12 Jan 2019)

Origin message was:
------------------
- moviebrowser: load movies and refresh gui after menu only if needed

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-01-12 20:18:53 +01:00
vanhofen
22c85c557c moviebrowser: remove unnecessary check from hintbox in showYTMenu() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: e9bfb9e829
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-10-16 (Tue, 16 Oct 2018)

Origin message was:
------------------
- moviebrowser: remove unnecessary check from hintbox in showYTMenu() function

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-10-16 23:57:28 +02:00
GetAway
8fc52f909e mb.cpp: fix locale for YT
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8fc2a511da
Author: GetAway <get-away@t-online.de>
Date: 2018-10-16 (Tue, 16 Oct 2018)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-10-16 23:57:28 +02:00
Jacek Jendrzej
e41ea4b48b moviebrowser: workaround fix for delete fileinfo from gui list wit epginfo1 with whitespace
Origin commit data
------------------
Branch: ni/coolstream
Commit: b5a43177a7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2018-09-22 (Sat, 22 Sep 2018)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-09-23 00:58:08 +02:00
vanhofen
d2d59fd648 moviebrowser: party revert 853752003a186f72f50182aca8f3b26694ff0327; ...
unfortunately this subheader breaks the m_settings.browserAdditional feature


Origin commit data
------------------
Branch: ni/coolstream
Commit: a5a2dcfbeb
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-17 (Tue, 17 Jul 2018)

Origin message was:
------------------
- moviebrowser: party revert 853752003a186f72f50182aca8f3b26694ff0327; ...

unfortunately this subheader breaks the m_settings.browserAdditional feature


------------------
This commit was generated by Migit
2018-07-17 21:28:53 +02:00
vanhofen
5339024445 moviebrowser: small changes in menu locales; display hintbox while saving movie info
Origin commit data
------------------
Branch: ni/coolstream
Commit: 03937eeec9
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-17 (Tue, 17 Jul 2018)

Origin message was:
------------------
- moviebrowser: small changes in menu locales; display hintbox while saving movie info

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-07-17 00:04:12 +02:00
vanhofen
90efda5d34 moviebrowser: re-add by mistake removed boolean value got_start_pos
Origin commit data
------------------
Branch: ni/coolstream
Commit: 58c7d2d0bb
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-17 (Tue, 17 Jul 2018)

Origin message was:
------------------
- moviebrowser: re-add by mistake removed boolean value got_start_pos

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-07-17 00:04:12 +02:00
vanhofen
01a0bfe8ea moviebrowser: set focus in StartPosSelectionMenu to last play stop if it exists
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b0a37bef4
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-15 (Sun, 15 Jul 2018)

Origin message was:
------------------
- moviebrowser: set focus in StartPosSelectionMenu to last play stop if it exists

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-07-15 00:41:40 +02:00
vanhofen
853752003a moviebrowser: add subheader to main window to avoid gui-jumps; add left/right icons to header
Origin commit data
------------------
Branch: ni/coolstream
Commit: caa8b68b17
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-05 (Thu, 05 Jul 2018)

Origin message was:
------------------
- moviebrowser: add subheader to main window to avoid gui-jumps; add left/right icons to header

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-07-05 23:36:17 +02:00
vanhofen
8c70278c1f fix build
Origin commit data
------------------
Branch: ni/coolstream
Commit: 13d047fbd1
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-05 (Thu, 05 Jul 2018)

Origin message was:
------------------
- fix build

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-07-05 23:27:40 +02:00
vanhofen
5428a4c026 moviebrowser: fix sorting
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ad02fc0ba
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-05 (Thu, 05 Jul 2018)

Origin message was:
------------------
- moviebrowser: fix sorting

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-07-05 21:48:01 +02:00
vanhofen
01d5bae77d moviebrowser: allow to display record time
Origin commit data
------------------
Branch: ni/coolstream
Commit: dc735caace
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-05 (Thu, 05 Jul 2018)

Origin message was:
------------------
- moviebrowser: allow to display record time

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-07-05 21:38:31 +02:00
vanhofen
14fff9a692 moviebrowser: fix display of mp_movie_info->dateOfLastPlay
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98b00c1a70
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-05 (Thu, 05 Jul 2018)

Origin message was:
------------------
- moviebrowser: fix display of mp_movie_info->dateOfLastPlay

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-07-05 20:40:27 +02:00
vanhofen
1c127979b1 movieinfo/moviebrowser: do not use any fake date to fill dateOfLastPlay and file.Time
Origin commit data
------------------
Branch: ni/coolstream
Commit: 08a4e95113
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-04 (Wed, 04 Jul 2018)

Origin message was:
------------------
- movieinfo/moviebrowser: do not use any fake date to fill dateOfLastPlay and file.Time

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-07-04 22:58:11 +02:00
vanhofen
50682806ae moviebrowser: check for channelname too to change channellogo; ...
usefull for popup-channels with same id but different names


Origin commit data
------------------
Branch: ni/coolstream
Commit: 59070b3120
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-06-05 (Tue, 05 Jun 2018)

Origin message was:
------------------
- moviebrowser: check for channelname too to change channellogo; ...

usefull for popup-channels with same id but different names


------------------
This commit was generated by Migit
2018-06-05 23:11:22 +02:00
vanhofen
3e87bdd26a moviebrowser: remove NI tags
Origin commit data
------------------
Branch: ni/coolstream
Commit: c85c75b3f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-04-29 (Sun, 29 Apr 2018)

Origin message was:
------------------
- moviebrowser: remove NI tags

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-04-29 03:13:08 +02:00
vanhofen
a8bbad2772 framebuffer: better name for getWindowWidth/Height() functions
getScreenWidth/HeightRel() was confusing because it depends on users window settings.
Replace names in old unused framebuffer code too.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 86cdc12c8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-22 (Mon, 22 Jan 2018)

Origin message was:
------------------
- framebuffer: better name for getWindowWidth/Height() functions

getScreenWidth/HeightRel() was confusing because it depends on users window settings.
Replace names in old unused framebuffer code too.


------------------
This commit was generated by Migit
2018-01-22 12:06:15 +01:00
vanhofen
5f830c74ee moviebrowser: use new marker icons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 267fa531d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-04 (Thu, 04 Jan 2018)

Origin message was:
------------------
- moviebrowser: use new marker icons

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-01-04 16:07:46 +01:00
vanhofen
938b53bb4b neutrino: add more RC_playpause handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: 764b25542f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-19 (Tue, 19 Dec 2017)

Origin message was:
------------------
- neutrino: add more RC_playpause handling

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-12-19 10:58:44 +01:00
vanhofen
476ce63d99 neutrino: unify modes handling; ...
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


Origin commit data
------------------
Branch: ni/coolstream
Commit: 028ec3cf3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: unify modes handling; ...

remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


------------------
This commit was generated by Migit
2017-11-20 15:19:06 +01:00
gixxpunk
e279c14994 CMovieBrowser::info_hdd_level(): fix miscalculation
Origin commit data
------------------
Branch: ni/coolstream
Commit: a75915414d
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-30 (Mon, 30 Oct 2017)

Origin message was:
------------------
- CMovieBrowser::info_hdd_level(): fix miscalculation

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-30 21:01:52 +01:00
vanhofen
e143e0bcb0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/icons/buttons/0.png
	data/icons/buttons/1.png
	data/icons/buttons/2.png
	data/icons/buttons/3.png
	data/icons/buttons/4.png
	data/icons/buttons/5.png
	data/icons/buttons/6.png
	data/icons/buttons/7.png
	data/icons/buttons/8.png
	data/icons/buttons/9.png
	data/icons/buttons/blau.png
	data/icons/buttons/btn_backward.png
	data/icons/buttons/btn_forward.png
	data/icons/buttons/btn_pause.png
	data/icons/buttons/btn_play.png
	data/icons/buttons/btn_record_active.png
	data/icons/buttons/btn_record_inactive.png
	data/icons/buttons/btn_stop.png
	data/icons/buttons/down.png
	data/icons/buttons/gelb.png
	data/icons/buttons/gruen.png
	data/icons/buttons/help.png
	data/icons/buttons/help_small.png
	data/icons/buttons/home.png
	data/icons/buttons/info.png
	data/icons/buttons/info_small.png
	data/icons/buttons/left.png
	data/icons/buttons/menu.png
	data/icons/buttons/menu_small.png
	data/icons/buttons/mute_small.png
	data/icons/buttons/mute_zap_gray.png
	data/icons/buttons/mute_zap_green.png
	data/icons/buttons/ok.png
	data/icons/buttons/power.png
	data/icons/buttons/right.png
	data/icons/buttons/rot.png
	data/icons/buttons/up.png
	data/icons/filetypes/movie.png
	data/icons/filetypes/mp3.png
	data/icons/headers/audio.png
	data/icons/headers/bookmarkmanager.png
	data/icons/headers/colors.png
	data/icons/headers/error.png
	data/icons/headers/features.png
	data/icons/headers/games.png
	data/icons/headers/icon_blue.png
	data/icons/headers/icon_green.png
	data/icons/headers/icon_red.png
	data/icons/headers/icon_yellow.png
	data/icons/headers/information.png
	data/icons/headers/keybinding.png
	data/icons/headers/language.png
	data/icons/headers/lcd.png
	data/icons/headers/mainmenue.png
	data/icons/headers/multimedia.png
	data/icons/headers/network.png
	data/icons/headers/personalize.png
	data/icons/headers/shell.png
	data/icons/headers/softupdate.png
	data/icons/headers/streaming.png
	data/icons/headers/timer.png
	data/icons/headers/upnp.png
	data/icons/headers/video.png
	data/icons/movieplayer/mp_b-skip.png
	data/icons/movieplayer/mp_f-skip.png
	data/icons/movieplayer/mp_pause.png
	data/icons/movieplayer/mp_play.png
	data/icons/movieplayer/mp_play_repeat_all.png
	data/icons/movieplayer/mp_play_repeat_track.png
	data/icons/status/ca/biss_green.png
	data/icons/status/ca/biss_white.png
	data/icons/status/ca/biss_yellow.png
	data/icons/status/ca/conax_green.png
	data/icons/status/ca/conax_white.png
	data/icons/status/ca/conax_yellow.png
	data/icons/status/ca/cw_green.png
	data/icons/status/ca/cw_white.png
	data/icons/status/ca/cw_yellow.png
	data/icons/status/ca/d_green.png
	data/icons/status/ca/d_white.png
	data/icons/status/ca/d_yellow.png
	data/icons/status/ca/ird_green.png
	data/icons/status/ca/ird_white.png
	data/icons/status/ca/ird_yellow.png
	data/icons/status/ca/nagra_green.png
	data/icons/status/ca/nagra_white.png
	data/icons/status/ca/nagra_yellow.png
	data/icons/status/ca/nds_green.png
	data/icons/status/ca/nds_white.png
	data/icons/status/ca/nds_yellow.png
	data/icons/status/ca/powervu_green.png
	data/icons/status/ca/powervu_white.png
	data/icons/status/ca/powervu_yellow.png
	data/icons/status/ca/seca_green.png
	data/icons/status/ca/seca_white.png
	data/icons/status/ca/seca_yellow.png
	data/icons/status/ca/via_green.png
	data/icons/status/ca/via_white.png
	data/icons/status/ca/via_yellow.png
	data/icons/status/ca/x_green.png
	data/icons/status/ca/x_white.png
	data/icons/status/ca/x_yellow.png
	data/icons/status/channel/16_9.png
	data/icons/status/channel/16_9_gray.png
	data/icons/status/channel/ca2.png
	data/icons/status/channel/ca2_gray.png
	data/icons/status/channel/dd.png
	data/icons/status/channel/dd_avail.png
	data/icons/status/channel/dd_gray.png
	data/icons/status/channel/radiotextget.png
	data/icons/status/channel/radiotextoff.png
	data/icons/status/channel/radiotextwait.png
	data/icons/status/channel/res_000.png
	data/icons/status/channel/res_1080.png
	data/icons/status/channel/res_1280.png
	data/icons/status/channel/res_1440.png
	data/icons/status/channel/res_1920.png
	data/icons/status/channel/res_288.png
	data/icons/status/channel/res_352.png
	data/icons/status/channel/res_382.png
	data/icons/status/channel/res_480.png
	data/icons/status/channel/res_528.png
	data/icons/status/channel/res_544.png
	data/icons/status/channel/res_576.png
	data/icons/status/channel/res_704.png
	data/icons/status/channel/res_720.png
	data/icons/status/channel/res_hd.png
	data/icons/status/channel/res_sd.png
	data/icons/status/channel/subt.png
	data/icons/status/channel/subt_gray.png
	data/icons/status/channel/tuner_1.png
	data/icons/status/channel/tuner_2.png
	data/icons/status/channel/tuner_3.png
	data/icons/status/channel/tuner_4.png
	data/icons/status/channel/vtxt.png
	data/icons/status/channel/vtxt_gray.png
	data/icons/status/various/ats.png
	data/icons/status/various/ats_gray.png
	data/icons/status/various/ca.png
	data/icons/status/various/lock.png
	data/icons/status/various/mounted.png
	data/icons/status/various/mute.png
	data/icons/status/various/not_mounted.png
	data/icons/status/various/pip.png
	data/icons/status/various/rec_event_marker.png
	data/icons/status/various/rec_gray.png
	data/icons/status/various/zap.png
	data/locale/Makefile.am
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/start.jpg
	src/driver/fb_accel_sti.cpp
	src/gui/Makefile.am
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/system/settings.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4121099dcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)



------------------
This commit was generated by Migit
2017-10-18 09:41:46 +02:00
vanhofen
463700033b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 23:19:49 +02:00
Jacek Jendrzej
a91765a685 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ad4a0e6cc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-02 13:56:25 +02:00
Stefan Seyfried
ef71d00d7f remove "using namespace std" from header files
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 13:43:57 +02:00
Jacek Jendrzej
a25626adc1 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: b7ceb705a0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-26 12:52:04 +02:00
Stefan Seyfried
997d61671d moviebrowser: fix format-string warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5457ddc108
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-26 12:41:05 +02:00
Stefan Seyfried
60be1cbe05 moviebrowser: fix format-string warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 85c1a8e451
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-25 11:25:51 +02:00
Jacek Jendrzej
80887f7906 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 72a9fa40db
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-07-05 (Wed, 05 Jul 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-07-05 21:43:36 +02:00
vanhofen
3533a3bb8a moviebrowser: another fix for deletion function ...
and add some temporary console output to see what happens

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: f191f0730f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-03 (Mon, 03 Jul 2017)

Origin message was:
------------------
- moviebrowser: another fix for deletion function ...

and add some temporary console output to see what happens

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-07-04 12:22:53 +02:00
vanhofen
7a7b17ea21 moviebrowser: another fix for deletion function ...
and add some temporary console output to see what happens


Origin commit data
------------------
Branch: ni/coolstream
Commit: 14c137b8ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-03 (Mon, 03 Jul 2017)

Origin message was:
------------------
- moviebrowser: another fix for deletion function ...

and add some temporary console output to see what happens


------------------
This commit was generated by Migit
2017-07-03 22:02:50 +02:00
Jacek Jendrzej
12870b976c Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: f791ee1455
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-07-02 (Sun, 02 Jul 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-07-02 17:22:23 +02:00