mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-14 17:03:34 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,724 Commits 2 Branches 9 Tags
d339f73231e6aa86efceab9d86950f1e9bda85f1
Commit Graph

105 Commits

Author SHA1 Message Date
vanhofen
d339f73231 dboxinfo: fix compile 
Origin commit data
------------------
Commit: 76fb1243b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)

Origin message was:
------------------
- dboxinfo: fix compile
 2017-08-09 10:09:13 +02:00
vanhofen
73463ef279 add listModeKey() function to simplify these calls 
Origin commit data
------------------
Commit: 59b7e3ae36
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- add listModeKey() function to simplify these calls
 2016-09-20 08:03:50 +02:00
vanhofen
d2c7f7ca5a dboxinfo: fix merge error in header text 
Origin commit data
------------------
Commit: a93814f12c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)

Origin message was:
------------------
- dboxinfo: fix merge error in header text
 2016-08-26 23:25:19 +02:00
vanhofen
bc33663742 Merge branch 'ni/mp' into ni/cst-next 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 19:13:47 +02:00
Michael Liebmann
4246a31ba6 Merge branch 'cst-next' into nmp-cst-next 
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-19 17:40:48 +02:00
vanhofen
dffca87dfa minor alignments to cst-git; no binary changes 
Origin commit data
------------------
Commit: 750c779f9f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-21 (Sat, 21 May 2016)

Origin message was:
------------------
- minor alignments to cst-git; no binary changes
 2016-05-21 22:21:08 +02:00
vanhofen
4cf2b60722 NI \o/ 
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
 2016-05-19 22:59:54 +02:00
[CST] Focus
38ede6dfb0 neutrino: add webtv channel list mode 
Origin commit data
------------------
Commit: 302642cee7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-23 (Wed, 23 Mar 2016)
 2016-03-23 16:36:00 +03:00
Thilo Graf
694fea40ad CDBoxInfoWidget: remove superfluous paint of header 
Origin commit data
------------------
Commit: d8e3ecfa1d
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-03-22 (Tue, 22 Mar 2016)
 2016-03-22 13:15:19 +01:00
Michael Liebmann
18573e39cb Merge branch 'cst-next' into nmp-cst-next 
Conflicts: src/gui/dboxinfo.cpp


Origin commit data
------------------
Commit: 2175a0f327
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-29 (Fri, 29 Jan 2016)
 2016-01-29 14:11:08 +01:00
[CST] Focus
f7997cb6dc gui/dboxinfo.cpp: try to fix missing s/n digits, 
fix x position


Origin commit data
------------------
Commit: c796891165
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-01-29 (Fri, 29 Jan 2016)
 2016-01-29 14:41:09 +03:00
Michael Liebmann
11a926f4d3 Adapt neutrino-mp for CST hardware part #4 
- Add hw_caps.frontend to dboxinfo head


Origin commit data
------------------
Commit: 2f3c97acb3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-15 (Fri, 15 Jan 2016)
 2016-01-16 07:26:04 +01:00
Stefan Seyfried
e38e24e2c6 Revert "gui/dboxinfo.cpp: add serial number to title" 
This reverts commit 87c2b3ed74.


Origin commit data
------------------
Commit: 530da9abeb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
 2015-12-13 17:45:06 +01:00
Stefan Seyfried
17880c4125 Merge remote-tracking branch 'uncool/cst-next' 
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
 2015-12-13 17:41:55 +01:00
[CST] Focus
87c2b3ed74 gui/dboxinfo.cpp: add serial number to title 
Origin commit data
------------------
Commit: 6bcb85fa07
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-24 (Wed, 24 Jun 2015)
 2015-09-24 12:28:23 +03:00
Stefan Seyfried
d1e2143fd6 Merge remote-tracking branch 'check/cst-next' 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)
 2014-12-28 12:32:12 +01:00
Stefan Seyfried
b22bf6f543 dboxinfo: fix buffer size, avoid overflow 
Origin commit data
------------------
Commit: a91a27900c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-26 (Fri, 26 Dec 2014)
 2014-12-26 22:13:59 +01:00
Stefan Seyfried
ec1a9fce17 Merge remote-tracking branch 'check/cst-next' 
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
 2014-12-25 18:03:08 +01:00
Jacek Jendrzej
3905eb0fda fix some possible errors 
Origin commit data
------------------
Commit: d5d6c4de62
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-06 (Thu, 06 Nov 2014)
 2014-11-06 14:40:44 +01:00
Jacek Jendrzej
526acd76d9 dboxinfo.cpp: fix progressbar offset 
Origin commit data
------------------
Commit: 8055c0fbe2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
 2014-09-27 16:21:26 +04:00
martii
547d900fee system/settings: move theme colors to dedicated struct 
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/epgview.cpp
	src/gui/osd_setup.cpp
	src/gui/pluginlist.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: b21cb152b5
Author: martii <m4rtii@gmx.de>
Date: 2014-01-06 (Mon, 06 Jan 2014)
 2014-09-12 18:29:21 +04:00
vanhofen
f24d3bd2d5 dboxinfo: align color of time/load headers to other headers 
Origin commit data
------------------
Commit: 0d236b39c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-11 (Thu, 11 Sep 2014)

Origin message was:
------------------
- dboxinfo: align color of time/load headers to other headers
 2014-09-11 16:19:00 +02:00
[CST] Focus
3cbffe06f1 gui/dboxinfo: fixes 
Origin commit data
------------------
Commit: d3c4b4f199
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-11 (Thu, 11 Sep 2014)
 2014-09-11 18:12:09 +04:00
martii
bb0239bd4c gui/dboxinfo: localize (partially based on patch from Benny -- thanks!) 
Conflicts:
	src/gui/dboxinfo.cpp


Origin commit data
------------------
Commit: 742760dbd3
Author: martii <m4rtii@gmx.de>
Date: 2014-05-24 (Sat, 24 May 2014)
 2014-09-11 18:12:06 +04:00
[CST] Focus
3e2c460cc0 gui/dboxinfo.cpp: do not paint empty line 
Origin commit data
------------------
Commit: 6857f616c2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-09 (Tue, 09 Sep 2014)
 2014-09-09 15:28:35 +04:00
[CST] Focus
17c40a5d6e merge neutrino-mp progressbar code, (C) martii 
Origin commit data
------------------
Commit: 416646bbff
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)
 2014-07-17 17:02:37 +04:00
Thilo Graf
f271c801de COSDFader: rename member functions, adapt implementations 
Stop() is not exactly attributable if fader class used as inherited and
Fade() don't tell really what done and related to return value 'bool'...
especially as the fader class members have been not documented.


Origin commit data
------------------
Commit: 69e2debb02
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-30 (Fri, 30 May 2014)
 2014-06-23 18:43:47 +02:00
vanhofen
3bba3094e2 change getRenderWidth() default to UTF8 
Origin commit data
------------------
Commit: 8b91cda918
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change getRenderWidth() default to UTF8
 2014-06-11 23:07:00 +02:00
Stefan Seyfried
3f36062fe7 Merge remote-tracking branch 'check/next-cc' 
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:14:06 +02:00
Jacek Jendrzej
1242b47e67 dboxinfo.cpp: shov inactive rec icon, if no rec is run 
Origin commit data
------------------
Commit: 5764f3fc2c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-04-01 (Tue, 01 Apr 2014)
 2014-04-01 14:44:09 +02:00
Stefan Seyfried
4f7ac90359 dboxinfo: fix format strings for uint64_t 
Origin commit data
------------------
Commit: ecf430ba97
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)
 2014-01-13 20:56:56 +01:00
Stefan Seyfried
69aa77b445 dboxinfo: fix format strings for uint64_t 
Origin commit data
------------------
Commit: f23b9074f6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)
 2014-01-12 14:45:48 +01:00
Stefan Seyfried
ddeef54bcf Merge remote-tracking branch 'check/next-cc' 
Origin commit data
------------------
Commit: a92141d147
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)
 2014-01-12 14:41:44 +01:00
martii
c8f556138f gui/dboxinfo: minor clean-up 
Origin commit data
------------------
Commit: 341b75ccd9
Author: martii <m4rtii@gmx.de>
Date: 2014-01-07 (Tue, 07 Jan 2014)
 2014-01-07 02:00:56 +01:00
martii
51223a5e37 gui/dboxinfo: fix bytes2string() 
Origin commit data
------------------
Commit: 8839256793
Author: martii <m4rtii@gmx.de>
Date: 2014-01-06 (Mon, 06 Jan 2014)
 2014-01-06 14:04:50 +01:00
Stefan Seyfried
63023ed83e fix sign 
Origin commit data
------------------
Commit: 6a158066d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-01 (Wed, 01 Jan 2014)
 2014-01-06 00:34:06 +01:00
Stefan Seyfried
0acf55d8e6 dboxinfo: avoid unnecessary 64bit math 
The kernel uses 'unsigned long' for those values anyway,
so there is no need for 'long long' in userspace.


Origin commit data
------------------
Commit: 34a2d55385
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)
 2014-01-05 21:12:20 +01:00
Stefan Seyfried
9b89414d7d dboxinfo: remove impossible case 
The kernel does (and has always) report memory in
kib units, so there is no need to check this.


Origin commit data
------------------
Commit: 75e14b90e5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)
 2014-01-05 21:11:59 +01:00
Stefan Seyfried
cb983803ab dboxinfo: fix partition size display 
Origin commit data
------------------
Commit: 171324fb95
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)
 2014-01-05 21:10:42 +01:00
Stefan Seyfried
bc811dabe8 dboxinfo: avoid unnecessary 64bit math 
The kernel uses 'unsigned long' for those values anyway,
so there is no need for 'long long' in userspace.


Origin commit data
------------------
Commit: 77c07386e6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)
 2014-01-05 19:01:59 +01:00
Stefan Seyfried
9f88583a81 dboxinfo: remove impossible case 
The kernel does (and has always) report memory in
kib units, so there is no need to check this.


Origin commit data
------------------
Commit: 5d157456ed
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)
 2014-01-05 18:53:23 +01:00
Stefan Seyfried
736d0c47f0 dboxinfo: fix partition size display 
Origin commit data
------------------
Commit: 8946c6ebf8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)
 2014-01-05 18:34:51 +01:00
Stefan Seyfried
16942ab183 Merge remote-tracking branch 'check/next-cc' 
Origin commit data
------------------
Commit: 56a7262d5d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)
 2014-01-05 18:31:31 +01:00
vanhofen
f240261210 dboxinfo: show uptime even more human readable 
Origin commit data
------------------
Commit: 621a712e81
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-04 (Sat, 04 Jan 2014)

Origin message was:
------------------
- dboxinfo: show uptime even more human readable
 2014-01-04 12:26:08 +01:00
martii
491c0fe537 gui/dboxinfo: show remote volumes, too 
Origin commit data
------------------
Commit: 535f5dfc67
Author: martii <m4rtii@gmx.de>
Date: 2014-01-04 (Sat, 04 Jan 2014)
 2014-01-04 12:26:08 +01:00
Michael Liebmann
3ac5bbc1d5 dboxinfo: prevent rendering outside window 
Origin commit data
------------------
Commit: fb5aa513d6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-04 (Sat, 04 Jan 2014)

Origin message was:
------------------
- dboxinfo: prevent rendering outside window
 2014-01-04 12:26:08 +01:00
vanhofen
224a55e282 dboxinfo: show uptime more human readable; show load average 
Origin commit data
------------------
Commit: 19bcfa5329
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-04 (Sat, 04 Jan 2014)

Origin message was:
------------------
- dboxinfo: show uptime more human readable; show load average
 2014-01-04 12:26:08 +01:00
vanhofen
18effe844f dboxinfo: don't show frontends 
Origin commit data
------------------
Commit: f2f2e208d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-04 (Sat, 04 Jan 2014)

Origin message was:
------------------
- dboxinfo: don't show frontends
 2014-01-04 12:26:08 +01:00
martii
1831ae6c21 gui/dboxinfo: adjust spacing 
Origin commit data
------------------
Commit: 5e9af14eb5
Author: martii <m4rtii@gmx.de>
Date: 2014-01-02 (Thu, 02 Jan 2014)
 2014-01-04 12:26:08 +01:00
martii
0488b793c6 gui/dboxinfo: unbreak height calculation 
Origin commit data
------------------
Commit: 06a95008fd
Author: martii <m4rtii@gmx.de>
Date: 2014-01-02 (Thu, 02 Jan 2014)
 2014-01-04 12:26:08 +01:00