mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,940 Commits 2 Branches 9 Tags
b011ff37b9cd2f7cf30103d5a6b51c4e6e96b927
Commit Graph

632 Commits

Author SHA1 Message Date
Stefan Seyfried
ca2cd4d8ac remove obsolete locales 
Origin commit data
------------------
Commit: 8a7095c208
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)
 2013-05-24 23:31:17 +02:00
Stefan Seyfried
b6e65d0300 Merge remote-tracking branch 'check/next-cc' 
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)
 2013-05-24 20:24:39 +02:00
rhabarber1848
7bb0dc4f34 Neutrino: Show audio track descriptions and program length in EPG info, patch by Gaucho316: http://www.dbox2-tuning.net/forum/viewtopic.php?f=2&t=49185 
Origin commit data
------------------
Commit: 19d47e04a5
Author: rhabarber1848 <rhabarber1848@web.de>
Date: 2010-02-28 (Sun, 28 Feb 2010)
 2013-05-23 21:08:18 +02:00
Michael Liebmann
682b0a6261 Sort deutsch.locale 
Origin commit data
------------------
Commit: f6d72f6448
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-18 (Sat, 18 May 2013)

Origin message was:
------------------
* Sort deutsch.locale
 2013-05-18 14:44:20 +01:00
Jacek Jendrzej
23de0a12b5 CNeutrinoEventList::findEvents - add search all epg option 
Origin commit data
------------------
Commit: 35bac1ff40
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-17 (Fri, 17 May 2013)
 2013-05-17 21:08:09 +02:00
vanhofen
4f521760ef locals: use more matching descriptions for screen positions 
Origin commit data
------------------
Commit: c80b1b0640
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-11 (Sat, 11 May 2013)

Origin message was:
------------------
- locals: use more matching descriptions for screen positions
 2013-05-11 12:57:36 +02:00
vanhofen
381c5459b8 deutsch.locale: fix typo in menu.hint_subchannel_pos 
Origin commit data
------------------
Commit: fd63df9688
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-10 (Fri, 10 May 2013)

Origin message was:
------------------
- deutsch.locale: fix typo in menu.hint_subchannel_pos
 2013-05-10 21:55:19 +02:00
vanhofen
3e5bf1083e osd-setup: move menu-related stuff to a submenu 'menus' 
* re-sort remaining items


Origin commit data
------------------
Commit: 655ae5d51f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-10 (Fri, 10 May 2013)

Origin message was:
------------------
- osd-setup: move menu-related stuff to a submenu 'menus'

* re-sort remaining items
 2013-05-10 21:36:34 +02:00
Stefan Seyfried
f6c0718366 Merge remote-tracking branch 'check/next-cc' 
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
 2013-05-10 10:06:47 +02:00
Michael Liebmann
ff9e2196dd OSD Setup: Move volume settings in a separate submenu. 
Origin commit data
------------------
Commit: 3d33901e5e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-09 (Thu, 09 May 2013)

Origin message was:
------------------
* OSD Setup: Move volume settings in a separate submenu.
 2013-05-09 16:58:52 +01:00
Jacek Jendrzej
4b53c28f34 update encoding.conf by EnoSat 
Origin commit data
------------------
Commit: 36044a9414
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-01 (Wed, 01 May 2013)
 2013-05-01 11:47:10 +02:00
Jacek Jendrzej
20131c3d56 update slovak locale by EnoSat 
Origin commit data
------------------
Commit: 3f8536b029
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-01 (Wed, 01 May 2013)
 2013-05-01 11:46:28 +02:00
Michael Liebmann
f438582d91 deutsch.locale complements 
Origin commit data
------------------
Commit: 7061c1179a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-16 (Tue, 16 Apr 2013)

Origin message was:
------------------
* deutsch.locale complements
 2013-04-18 18:51:58 +01:00
Michael Liebmann
1229383e01 Sort unmaintained locale 
Origin commit data
------------------
Commit: 9adfd63f1f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-18 (Thu, 18 Apr 2013)

Origin message was:
------------------
* Sort unmaintained locale
 2013-04-18 18:51:58 +01:00
Michael Liebmann
28affe5972 Sort deutsch.locale / english.locale 
Origin commit data
------------------
Commit: 81613f209d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-17 (Wed, 17 Apr 2013)

Origin message was:
------------------
* Sort deutsch.locale / english.locale
 2013-04-18 18:51:58 +01:00
[CST] Focus
1bd0bd8a7b Merge branch 'pu/cc' into next-cc 
Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/eitd/SIlanguage.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan.h
	src/gui/test_menu.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h
	src/neutrino.cpp
	src/nhttpd/yconfig.h


Origin commit data
------------------
Commit: 8bb70d1ab3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-17 (Wed, 17 Apr 2013)
 2013-04-17 13:32:12 +04:00
Stefan Seyfried
84a3f0dd0d add menu option to delete 'removed channels' 
Origin commit data
------------------
Commit: da327c099b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
 2013-04-17 10:21:33 +04:00
vanhofen
3b26c5bcc0 english.locale: typo 
Origin commit data
------------------
Commit: 976d3669ed
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-13 (Sat, 13 Apr 2013)

Origin message was:
------------------
- english.locale: typo
 2013-04-17 10:21:32 +04:00
[CST] Focus
f5481cd0fe locals: add locale for ignore CI messages option 
Origin commit data
------------------
Commit: b8519d2db0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-16 (Tue, 16 Apr 2013)
 2013-04-16 13:16:40 +04:00
Stefan Seyfried
15bd99a827 add menu option to delete 'removed channels' 
Origin commit data
------------------
Commit: aa8a137707
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
 2013-04-15 19:34:26 +02:00
Stefan Seyfried
02571e6695 add menu option to delete 'removed channels' 
Origin commit data
------------------
Commit: 1c58f5f093
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
 2013-04-14 12:46:10 +02:00
Stefan Seyfried
51bbad3ab1 Merge branch 'check/pu-cc' into master 
Conflicts:
	src/gui/osd_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 61bf95f552
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-13 (Sat, 13 Apr 2013)
 2013-04-13 17:17:30 +02:00
vanhofen
7dfb8931d7 english.locale: typo 
Origin commit data
------------------
Commit: 4b624f88bd
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-13 (Sat, 13 Apr 2013)

Origin message was:
------------------
- english.locale: typo
 2013-04-13 11:46:06 +02:00
vanhofen
e3905bf5c7 eventlist: make additional infos switchable 
* new menu 'eventlist' in osd-setup
* fix offset in infozone
* fontsize for infozone adjustable


Origin commit data
------------------
Commit: 473d6f38ba
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-13 (Sat, 13 Apr 2013)

Origin message was:
------------------
- eventlist: make additional infos switchable

* new menu 'eventlist' in osd-setup
* fix offset in infozone
* fontsize for infozone adjustable
 2013-04-13 11:13:23 +02:00
Stefan Seyfried
c64dc2ffa5 osd_setup: bring progressbar locales closer to mainline 
Origin commit data
------------------
Commit: 899fcaf8ca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
 2013-04-06 15:20:46 +02:00
Stefan Seyfried
f0f32ff08f Merge branch 'check/pu-cc' into master 
...needs some build- and logical fixing...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h


Origin commit data
------------------
Commit: 8b689f4b26
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
 2013-04-06 14:28:16 +02:00
Stefan Seyfried
f1e664b75e Merge branch 'check/pu-cc' into master 
needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/framebuffer.h
	src/driver/volume.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/imageinfo.cpp
	src/gui/infoviewer.cpp
	src/gui/streaminfo2.cpp
	src/gui/widget/textbox.cpp


Origin commit data
------------------
Commit: 5ad0b6b6dc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
 2013-04-06 11:21:55 +02:00
Stefan Seyfried
9ba28c1287 neutrino: add the possibility to lock bouquets by default 
This basically inverts the "locked" attribute of bouquets.xml and
allows to selectively enable only favourites or similar.

Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Commit: 27493de2ef
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-30 (Sun, 30 Oct 2011)
 2013-04-05 15:52:58 +04:00
[CST] Focus
1d17890343 dutch.locale: update 
Origin commit data
------------------
Commit: 83cbc1cbef
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-04 (Thu, 04 Apr 2013)
 2013-04-05 14:54:22 +04:00
Michael Liebmann
2e51731543 Sort locales 
Origin commit data
------------------
Commit: d4e54571a4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-01 (Mon, 01 Apr 2013)

Origin message was:
------------------
* Sort locales
 2013-04-01 19:25:21 +01:00
[CST] Focus
f84899764e deutsch.locale: remove 'coolstream' after merge 
Origin commit data
------------------
Commit: 4d1bf5c3d6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-01 (Mon, 01 Apr 2013)
 2013-04-01 16:30:36 +04:00
Jacek Jendrzej
74eeae3a1e data/satellites.xml: update Eurobird 9A (9.0E) 
Origin commit data
------------------
Commit: cecbd13107
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-26 (Tue, 26 Mar 2013)

Origin message was:
------------------
data/satellites.xml: update Eurobird 9A (9.0E)
 2013-04-01 16:18:42 +04:00
vanhofen
204d3ca7bb osd_progressbar_setup: rework locales; marginal changes in code 
Conflicts:
	data/locale/deutsch.locale


Origin commit data
------------------
Commit: c20d1ef6eb
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-26 (Tue, 26 Mar 2013)

Origin message was:
------------------
- osd_progressbar_setup: rework locales; marginal changes in code

Conflicts:
	data/locale/deutsch.locale
 2013-04-01 16:14:29 +04:00
Stefan Seyfried
adaec8168a create zapit config dir on install 
Origin commit data
------------------
Commit: 2fe93f6285
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)
 2013-04-01 15:43:08 +04:00
vanhofen
b659d5c95a strech most windows to full screen 
* switchable with existing switch for 'big_windows'
* 'big_windows' default is on

Conflicts:
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp


Origin commit data
------------------
Commit: 4714a30f83
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)

Origin message was:
------------------
- strech most windows to full screen

* switchable with existing switch for 'big_windows'
* 'big_windows' default is on

Conflicts:
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp
 2013-04-01 15:42:38 +04:00
vanhofen
b8da2f64f5 fix another typo around DATA_PIDS 
Origin commit data
------------------
Commit: 30a0fdafda
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-20 (Wed, 20 Mar 2013)

Origin message was:
------------------
- fix another typo around DATA_PIDS
 2013-04-01 15:07:55 +04:00
vanhofen
e06cd12eb3 deutsch.locale: fix typos 
Origin commit data
------------------
Commit: ea21a9a84f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-20 (Wed, 20 Mar 2013)

Origin message was:
------------------
- deutsch.locale: fix typos
 2013-04-01 15:07:25 +04:00
Jacek Jendrzej
4838903eb9 add record option for teletext & dvbsub pids 
Origin commit data
------------------
Commit: b2241df43d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-19 (Tue, 19 Mar 2013)

Origin message was:
------------------
-add record option for teletext & dvbsub pids
 2013-04-01 15:07:05 +04:00
[CST] Focus
c696f07aab locals: add locale for numeric zap adjust option 
Origin commit data
------------------
Commit: caca00682d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-01 (Mon, 01 Apr 2013)
 2013-04-01 14:15:14 +04:00
vanhofen
52653b13d5 imageinfo: remove some fixed width values ... 
... to avoid possible ugly overlaps

* split kernel-version from image-version
* whitespace cleanup


Origin commit data
------------------
Commit: c07b8781a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-30 (Sat, 30 Mar 2013)

Origin message was:
------------------
- imageinfo: remove some fixed width values ...

... to avoid possible ugly overlaps

* split kernel-version from image-version
* whitespace cleanup
 2013-03-30 16:03:27 +01:00
[CST] Focus
a564f121f3 data/icons/Makefile.am: add icons for tuner 3/4 
Origin commit data
------------------
Commit: b126a457c6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-27 (Wed, 27 Mar 2013)
 2013-03-27 19:41:47 +04:00
[CST] Focus
f0e805bf68 data/icons/start.jpg: modified start.jpg, thanks to bazi98 
Origin commit data
------------------
Commit: 7da9f2791a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-27 (Wed, 27 Mar 2013)
 2013-03-27 16:34:29 +04:00
[CST] Focus
209fb43c07 locals, english.locale: add locales for more MB foot buttons 
Origin commit data
------------------
Commit: 24a6874c22
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-27 (Wed, 27 Mar 2013)
 2013-03-27 16:19:50 +04:00
[CST] Focus
cf3aaae88e add icons for tuner 3/4 
Origin commit data
------------------
Commit: 83f27e69d8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-27 (Wed, 27 Mar 2013)
 2013-03-27 15:00:55 +04:00
Stefan Seyfried
864c0c2bee Revert "progressbar-menu-tomworld" 
This reverts commit 1bc23bfc31.

A better and simpler solution for progressbar setup is already in place.


Origin commit data
------------------
Commit: 8835f4a0c7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-26 (Tue, 26 Mar 2013)
 2013-03-26 19:17:29 +01:00
Stefan Seyfried
7d817954b7 Revert "progresbar -add colored & vertical design , ported from neutrino-mp" 
This reverts commit dcda89dcb3.

A better and simpler solution for progressbar setup is already in place.


Origin commit data
------------------
Commit: 3ab1cd74da
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-26 (Tue, 26 Mar 2013)
 2013-03-26 19:17:06 +01:00
Stefan Seyfried
c44fd7d843 Revert "- osd_progressbar_setup: rework locales; marginal changes in code" 
This reverts commit f02bd7f5a7.

A better and simpler solution for progressbar setup is already in place.


Origin commit data
------------------
Commit: b367b0f5e9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-26 (Tue, 26 Mar 2013)
 2013-03-26 19:15:04 +01:00
[CST] Focus
4da94ba652 update dutch.locale 
Origin commit data
------------------
Commit: eb03492fe6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-26 (Tue, 26 Mar 2013)
 2013-03-26 16:15:00 +04:00
Jacek Jendrzej
a3f140bc20 data/satellites.xml: update Eurobird 9A (9.0E) 
Origin commit data
------------------
Commit: 3a68a4bf19
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-26 (Tue, 26 Mar 2013)

Origin message was:
------------------
data/satellites.xml: update Eurobird 9A (9.0E)
 2013-03-26 11:52:21 +01:00
vanhofen
f02bd7f5a7 osd_progressbar_setup: rework locales; marginal changes in code 
Origin commit data
------------------
Commit: 33c8526673
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-26 (Tue, 26 Mar 2013)

Origin message was:
------------------
- osd_progressbar_setup: rework locales; marginal changes in code
 2013-03-26 00:48:04 +01:00