mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-18 02:43:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,325 Commits 2 Branches 9 Tags
a547340034e402a9d948cd97f95b10642f227b79
Commit Graph

11098 Commits

Author SHA1 Message Date
vanhofen
a547340034 remove file crap; comes by mistake with 765cfdd; my fault 
Origin commit data
------------------
Commit: 742bd3ff8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)

Origin message was:
------------------
- remove file crap; comes by mistake with 765cfdd; my fault
 2017-10-20 11:27:57 +02:00
TangoCash
589b8485da modify autocreate HD _and_ UHD channels as seperate lists 
Origin commit data
------------------
Commit: ec7f5e9b98
Author: TangoCash <eric@loxat.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)
 2017-10-20 08:02:09 +02:00
TangoCash
765cfdd570 zapit: detect uhd-channels 
Origin commit data
------------------
Commit: 2f40a15327
Author: TangoCash <eric@loxat.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)

Origin message was:
------------------
- zapit: detect uhd-channels
 2017-10-20 08:02:09 +02:00
vanhofen
9d1691fb8d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac
	data/locale/english.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.h
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: 20d546e42f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)
 2017-10-18 09:53:55 +02:00
vanhofen
f5bea1c0cd Revert "CComponentsPIP: use default background image as default image" 
This reverts commit 68ea18ecbf.


Origin commit data
------------------
Commit: 3e754c36d0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)
 2017-10-18 09:43:09 +02:00
vanhofen
904003dede 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
------------------
Commit: 4121099dcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)
 2017-10-18 09:41:46 +02:00
Thilo Graf
fcd9d06d45 Merge branch 'pu/mp' into 'master' 
Origin commit data
------------------
Commit: ccb19a8880
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-17 (Tue, 17 Oct 2017)
 2017-10-17 20:38:58 +02:00
Thilo Graf
04249e850b CUpnpBrowserGui: fix button arrangement 
defined label width parameter was too large


Origin commit data
------------------
Commit: acf9cdfea8
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)
 2017-10-17 20:03:10 +02:00
Thilo Graf
cdc251da82 neutrino.cpp: show logo on start up 
Origin commit data
------------------
Commit: 54750e49b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)
 2017-10-17 20:02:45 +02:00
Thilo Graf
68ea18ecbf CComponentsPIP: use default background image as default image 
Origin commit data
------------------
Commit: e169a76ff9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)
 2017-10-17 20:02:23 +02:00
Jacek Jendrzej
d49c063273 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 306c52642d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-17 (Tue, 17 Oct 2017)
 2017-10-17 12:45:19 +02:00
Jacek Jendrzej
be413a20a0 movieplayer.cpp remove free , attempting free on address which was not malloc()-ed 
Origin commit data
------------------
Commit: 79a9186515
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-17 (Tue, 17 Oct 2017)

Origin message was:
------------------
movieplayer.cpp remove free , attempting free on address which was not malloc()-ed
 2017-10-17 12:42:32 +02:00
Jacek Jendrzej
041101db81 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 4b8cf23d70
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-16 (Mon, 16 Oct 2017)
 2017-10-16 13:17:17 +02:00
TangoCash
9f4e6ff79f let playback handle devices 
Origin commit data
------------------
Commit: 9f0397c363
Author: TangoCash <eric@loxat.de>
Date: 2017-10-15 (Sun, 15 Oct 2017)
 2017-10-15 17:36:35 +02:00
vanhofen
5a8232a688 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/streaminfo2.cpp


Origin commit data
------------------
Commit: f166f36e9a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)
 2017-10-14 16:10:22 +02:00
vanhofen
19b065d244 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: d5fb26c405
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)
 2017-10-14 16:07:44 +02:00
Jacek Jendrzej
04c9857d5e streaminfo2: add desc to audiotype 
Origin commit data
------------------
Commit: ff61f5aef1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-14 (Sat, 14 Oct 2017)
 2017-10-14 13:26:55 +02:00
vanhofen
18469f2878 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 64994c769c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)
 2017-10-14 12:22:23 +02:00
vanhofen
09eab1dead Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a9c252d81f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)
 2017-10-14 12:22:05 +02:00
Michael Liebmann
a9e4f66bd1 CBEBouquetWidget::getInfoText(): Fix compile error 
Origin commit data
------------------
Commit: 9365e09ab9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-10-14 (Sat, 14 Oct 2017)
 2017-10-14 10:02:50 +02:00
vanhofen
36e82eb293 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 14f190ac6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)
 2017-10-14 08:41:42 +02:00
vanhofen
944cd0ec0f cc-footer: remove our calcation of label-width; should now work automatically 
Origin commit data
------------------
Commit: 8aad36ed83
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)

Origin message was:
------------------
- cc-footer: remove our calcation of label-width; should now work automatically
 2017-10-14 08:40:11 +02:00
vanhofen
d8355fe5e4 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Commit: 33857873dc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)
 2017-10-14 07:15:30 +02:00
vanhofen
a11d152062 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 84484832c3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)
 2017-10-14 07:10:33 +02:00
vanhofen
68c3d20998 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: ccb70fd1b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-13 (Fri, 13 Oct 2017)
 2017-10-13 14:13:22 +02:00
vanhofen
e41ad78e8f add UHD icons to infoviewer 
Conflicts:
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: db184e3abe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- add UHD icons to infoviewer

Conflicts:
	src/gui/infoviewer_bb.cpp
 2017-10-13 14:10:34 +02:00
vanhofen
c440aff769 remove some obsolete icons definitions 
Origin commit data
------------------
Commit: c53b385df6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-13 (Fri, 13 Oct 2017)

Origin message was:
------------------
- remove some obsolete icons definitions
 2017-10-13 14:04:37 +02:00
Thilo Graf
cfcd17a285 bedit: add methods ResetModules() and init() 
Help to handle instances of modules to get current screen and font settings
after changed settings by user.

Dimensions were not applied after changed settings. eg: All Items had wrong
position and dimensions after changed font size.


Origin commit data
------------------
Commit: f53b8fb110
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-13 13:40:49 +02:00
Thilo Graf
094b88b4f9 bedit: remove multiple code from paintHead() method 
Origin commit data
------------------
Commit: c651f6aa40
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-13 13:40:49 +02:00
Thilo Graf
dbf2424f62 bedit: remove multiple code from paintFoot() method 
Origin commit data
------------------
Commit: 4dc047557f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-13 13:40:49 +02:00
Thilo Graf
4da4faa05b bedit: ensure apply of possible changed timeout settings on runtime 
Origin commit data
------------------
Commit: b7124973de
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-13 13:40:49 +02:00
Thilo Graf
8cdcccd62f bedit: move paintBody() into base class 
Avoids multiple code parts


Origin commit data
------------------
Commit: 61a29f061a
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-13 13:40:49 +02:00
Thilo Graf
8bbb561675 bedit: declare internal vars as protected 
Access to internal member vars should be done via methods and funtions.


Origin commit data
------------------
Commit: 53293ba49d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-13 13:40:49 +02:00
Thilo Graf
05af6c373f bedit: use inherited version of hide() 
This overwrites inherited hide() from CMenuTarget

rework hide


Origin commit data
------------------
Commit: d64f06b196
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-13 13:40:49 +02:00
Thilo Graf
157dc9db9c bedit: use inherited version of paintDetails() and dline/ibox objects 
This moves full identicaly code into base class.

TODO: There are more similar parts.


Origin commit data
------------------
Commit: 3045baea13
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-13 13:40:37 +02:00
Thilo Graf
d62faac931 bedit: remove multiple forward declaration of CFrameBuffer 
I don't see any sense why this should be done here.


Origin commit data
------------------
Commit: 97a124ab44
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-13 13:38:20 +02:00
Thilo Graf
1861d5710c CComponentsFooter: rework uniformed arrangement 
Some parts were incomplete treated with defined parameter
'label_width' and/or 'chain_width'.


Origin commit data
------------------
Commit: c7a2dd70fc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-13 12:35:59 +02:00
Thilo Graf
e925ec373e Revert "CTimerList: adjust label width in footer dependent by count of buttons" 
This reverts commit d8caaaf758.


Origin commit data
------------------
Commit: 88e488d3a0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-13 12:35:59 +02:00
Thilo Graf
a15887cc4a CMenuWidget: don't use parameter for label width calculation 
Footer object does this itself.


Origin commit data
------------------
Commit: 35f048a735
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-13 12:35:59 +02:00
Thilo Graf
a2bd290f38 CTimerList: localize info and send timer buttons 
Origin commit data
------------------
Commit: c1d4da731b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-13 12:35:59 +02:00
vanhofen
18bbbbabfe audio_select: copy full code from TangoCash 
Just compile tested. Maybe some more alignments needed.


Origin commit data
------------------
Commit: e264e6334b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- audio_select: copy full code from TangoCash

Just compile tested. Maybe some more alignments needed.
 2017-10-12 08:52:32 +02:00
vanhofen
a20b55bb75 neutrino: don't scroll standby/resume text on frontdisplay 
Origin commit data
------------------
Commit: 27a16a6f9f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- neutrino: don't scroll standby/resume text on frontdisplay
 2017-10-12 00:43:56 +02:00
vanhofen
8045ab1dd5 add UHD icons to infoviewer 
Origin commit data
------------------
Commit: d367c33842
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- add UHD icons to infoviewer
 2017-10-12 00:36:45 +02:00
TangoCash
503a8ebbec armbox: fix dimming vfd 
Origin commit data
------------------
Commit: 789159e13a
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-12 00:36:45 +02:00
TangoCash
dd711fdfad armbox: show grafical volume in vfd 
Origin commit data
------------------
Commit: 07cc235989
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-12 00:36:45 +02:00
TangoCash
576735795e fix time in vfd 
Origin commit data
------------------
Commit: 32a7338aae
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-12 00:36:45 +02:00
TangoCash
8d89f95aae fix some keys 
Origin commit data
------------------
Commit: 8f420cdeea
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-12 00:36:45 +02:00
TangoCash
8ab431151d fix resolution icon in infoviewer 
Origin commit data
------------------
Commit: d2faaec888
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-12 00:36:45 +02:00
gixxpunk
c2a44aa4d8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a6de24c7b7
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-11 (Wed, 11 Oct 2017)
 2017-10-11 21:35:55 +02:00
vanhofen
659076d4e0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 32414b6a48
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-11 (Wed, 11 Oct 2017)
 2017-10-11 20:58:45 +02:00