Commit Graph

705 Commits

Author SHA1 Message Date
Stefan Seyfried
e6cbfe61bc Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
2013-10-21 22:58:55 +02:00
vanhofen
4cc026cd05 sleeptimer: add possibilty to preset with a fixed value
Origin commit data
------------------
Commit: 25e550e9e3
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-10-16 (Wed, 16 Oct 2013)

Origin message was:
------------------
- sleeptimer: add possibilty to preset with a fixed value
2013-10-16 10:37:23 +02:00
Jacek Jendrzej
e2056607ba satellites.xml remove 23.3E
Origin commit data
------------------
Commit: a74e05de7e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-10-10 (Thu, 10 Oct 2013)
2013-10-10 15:13:48 +02:00
Michael Liebmann
efa4048ba1 Update deutsch.locale
Origin commit data
------------------
Commit: 117b7bae3c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-02 (Wed, 02 Oct 2013)
2013-10-02 20:49:56 +02:00
Michael Liebmann
6610b56ae1 nederlands.locale: Fix sort order
Origin commit data
------------------
Commit: 41d50d793f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
2013-10-02 20:49:55 +02:00
[CST] Focus
e97198e4a9 locals: add locale for epg scan mode
Origin commit data
------------------
Commit: da0bfde715
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-02 (Wed, 02 Oct 2013)
2013-10-02 15:30:44 +04:00
Thilo Graf
2c48a510e0 icons.h: add larger audio icon
Taken from GNU/GPL icon package "Dark Glass" by Alessandro Rei

http://www.mentalrey.it/


Origin commit data
------------------
Commit: 252c1925d8
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-02 (Wed, 02 Oct 2013)

Origin message was:
------------------
icons.h: add larger audio icon

Taken from GNU/GPL icon package "Dark Glass" by Alessandro Rei

http://www.mentalrey.it/
2013-10-02 10:21:01 +02:00
Michael Liebmann
3f19c34e16 Image backup apollo Part #7
- Add image backup to menu 'Software Update'


Origin commit data
------------------
Commit: c48a8cf695
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-26 (Thu, 26 Sep 2013)
2013-09-27 06:44:44 +02:00
Michael Liebmann
3e016e5e81 Image backup apollo Part #6
- Menu option for including kernel/uldr/u-boot in the image backup
- Menu option for creating an image with a different erasesize
 Tank <=> Trinity


Origin commit data
------------------
Commit: d00cb6f8ec
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)

Origin message was:
------------------
Image backup apollo Part #6

- Menu option for including kernel/uldr/u-boot in the image backup
- Menu option for creating an image with a different erasesize
 Tank <=> Trinity
2013-09-27 06:44:43 +02:00
Michael Liebmann
3c9cdf38c6 Image backup apollo Part #2
- Add locales for progressbar


Origin commit data
------------------
Commit: 2e360ca480
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-21 (Sat, 21 Sep 2013)
2013-09-27 06:44:38 +02:00
Michael Liebmann
fb9cf673d2 Update deutsch.locale
Origin commit data
------------------
Commit: 76d2cc17fb
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-25 (Wed, 25 Sep 2013)
2013-09-27 06:44:30 +02:00
[CST] Focus
362cf44e16 gui/channellist.cpp: add menu option to reset all 'new' channels
Origin commit data
------------------
Commit: 8d52885a5e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-25 (Wed, 25 Sep 2013)
2013-09-25 17:08:34 +04:00
Michael Liebmann
969a20d776 Update deutsch.locale
Origin commit data
------------------
Commit: a2240f4640
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-03 (Tue, 03 Sep 2013)
2013-09-04 02:25:10 +02:00
[CST] Focus
c14d9089e4 locals: add hint locale for xupnpd network service
Origin commit data
------------------
Commit: 4902c39f95
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-03 (Tue, 03 Sep 2013)
2013-09-03 18:23:20 +04:00
[CST] Focus
3e932b7076 locals: add locale for file start play dialog
Origin commit data
------------------
Commit: a99395cb05
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-03 (Tue, 03 Sep 2013)
2013-09-03 18:23:20 +04:00
Stefan Seyfried
158bd2c244 Merge branch 'check/next-cc'
Origin commit data
------------------
Commit: 50977ef2f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-03 (Tue, 03 Sep 2013)
2013-09-03 09:36:49 +02:00
vanhofen
4bcbf90dc1 osd_setup: introduce g_settings.window_size to scale some windows
* remove g_settings.big_windows
* add setup window (use up/down to change size)


Origin commit data
------------------
Commit: 6ed30528f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-09-02 (Mon, 02 Sep 2013)

Origin message was:
------------------
- osd_setup: introduce g_settings.window_size to scale some windows

* remove g_settings.big_windows
* add setup window (use up/down to change size)
2013-09-02 20:59:26 +02:00
Jacek Jendrzej
df873e801f update satellites.xml
Origin commit data
------------------
Commit: b8ec3b55e6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-02 (Mon, 02 Sep 2013)
2013-09-02 17:34:25 +02:00
Stefan Seyfried
2c76238007 Merge remote-tracking branch 'check/next-cc'
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
2013-09-01 19:46:10 +02:00
Michael Liebmann
87fef9c895 Softupdate: Check the available disk space when reading the flash
Origin commit data
------------------
Commit: a3762416af
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-20 (Tue, 20 Aug 2013)
2013-08-20 02:55:56 +02:00
Michael Liebmann
36b3fd0a99 Softupdate: Use user-defined file names
for apply settings and saving partitions from the flash.


Origin commit data
------------------
Commit: bc069b0a84
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-08 (Thu, 08 Aug 2013)
2013-08-20 02:55:54 +02:00
Jacek Jendrzej
bba8f67cdf update encoding.conf
Origin commit data
------------------
Commit: 08b1f99352
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-08-08 (Thu, 08 Aug 2013)
2013-08-08 15:51:47 +02:00
Jacek Jendrzej
e25872c3de update slovak locale (THX EnoSat)
Origin commit data
------------------
Commit: fd911c9deb
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-08-08 (Thu, 08 Aug 2013)
2013-08-08 15:30:16 +02:00
[CST] Focus
c9a4fc44cd data/locale/nederlands.locale: fix telesat prov name
Origin commit data
------------------
Commit: 70882dde00
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-08 (Thu, 08 Aug 2013)
2013-08-08 17:02:30 +04:00
[CST] Focus
8c36a25c63 update initial astra frontend.conf, use same config as default
Origin commit data
------------------
Commit: 527e835d7e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
2013-07-30 11:13:50 +04:00
[CST] Focus
5e750a44f1 english.locale: little changes/corrections
Origin commit data
------------------
Commit: dd29b0ae86
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-24 (Wed, 24 Jul 2013)
2013-07-30 11:13:50 +04:00
[CST] Focus
36b4895389 nederlands.locale update
Origin commit data
------------------
Commit: f75d6d1ea1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-24 (Wed, 24 Jul 2013)
2013-07-30 11:13:50 +04:00
Michael Liebmann
5d488ee73c Update deutsch.locale
Origin commit data
------------------
Commit: 7e58a0bcae
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-24 (Wed, 24 Jul 2013)
2013-07-24 11:47:25 +02:00
[CST] Focus
71f2b604be locals: add locale for motor control network info;
change motor options hints


Origin commit data
------------------
Commit: 5c3708e871
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-23 (Tue, 23 Jul 2013)
2013-07-23 16:07:49 +04:00
Michael Liebmann
af1f9a1e14 Add option to resize the VolumeBar
- Minimum height: Height of NEUTRINO_ICON_VOLUME + 2 pixels
- Maximum height: 50 pixels
- Setting can be changed with:
 Menu -> Settings -> OSD -> Volume -> Height of display


Origin commit data
------------------
Commit: 0a0035c2ae
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-29 (Sat, 29 Jun 2013)

Origin message was:
------------------
Add option to resize the VolumeBar

- Minimum height: Height of NEUTRINO_ICON_VOLUME + 2 pixels
- Maximum height: 50 pixels
- Setting can be changed with:
 Menu -> Settings -> OSD -> Volume -> Height of display
2013-07-21 22:06:05 +02:00
[CST] Focus
9d96e4d8c9 locals: add locales for buttons backlight menu
Origin commit data
------------------
Commit: 1dba13d74f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
2013-07-18 14:51:59 +04:00
Michael Liebmann
9a10987d06 keybind_setup: Rename item in locale
- fix to 1598b73e63


Origin commit data
------------------
Commit: 339b1b4030
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)
2013-07-15 00:22:12 +02:00
J. Krieg
f63af64ac7 cables.xml: update Kabel BW (rearrangement channels, June 2013)
Origin commit data
------------------
Commit: cc728d299c
Author: J. Krieg <bellum07@googlemail.com>
Date: 2013-07-13 (Sat, 13 Jul 2013)
2013-07-13 23:03:06 +02:00
tomworld
1598b73e63 keybind_setup: add possibility to disable/enable some special keys
Origin commit data
------------------
Commit: ea66aaaf8f
Author: tomworld <atzeworld@msn.com>
Date: 2013-07-12 (Fri, 12 Jul 2013)

Origin message was:
------------------
- keybind_setup: add possibility to disable/enable some special keys
2013-07-12 15:50:30 +02:00
Stefan Seyfried
6830b68cac Merge branch 'check/next-cc'
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)
2013-07-06 19:01:15 +02:00
Michael Liebmann
356c217ae8 start wizard: add german locale
Origin commit data
------------------
Commit: 082b301d64
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-28 (Fri, 28 Jun 2013)
2013-07-04 22:58:36 +02:00
Michael Liebmann
5712ef356f CRecordInstance::GetRecordString(): Fix calculation of duration
- Use locales for time string
- Show recording duration right aligned in stop menu


Origin commit data
------------------
Commit: 0ce25a86d5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-03 (Wed, 03 Jul 2013)
2013-07-04 02:05:34 +02:00
[CST] Focus
d09745a48f add initial Astra 19e settings to install
Origin commit data
------------------
Commit: 33bc58915a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-28 (Fri, 28 Jun 2013)
2013-06-28 16:12:33 +04:00
[CST] Focus
b623eb1854 start wizard: add easy mode as requested by customers,
which only ask for gui language and show fast scan (sat) and/or simple cable scan menu


Origin commit data
------------------
Commit: d5e57f8877
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-28 (Fri, 28 Jun 2013)
2013-06-28 15:55:19 +04:00
Thilo Graf
649d7083fa Locales: small text change for image info caption
Origin commit data
------------------
Commit: 0495780668
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-06-21 (Fri, 21 Jun 2013)
2013-06-21 13:52:55 +02:00
martii
460f07946d yt: speed up retrieving feed data by starting multiple (up to 8, default is 4) http transfers in parallel
Origin commit data
------------------
Commit: 8836a15a42
Author: martii <m4rtii@gmx.de>
Date: 2013-06-09 (Sun, 09 Jun 2013)
2013-06-20 16:07:59 +04:00
martii
416ab07620 ytparser/moviebrowser: add option for selecting prefered quality
Origin commit data
------------------
Commit: e01e96c1ac
Author: martii <m4rtii@gmx.de>
Date: 2013-06-09 (Sun, 09 Jun 2013)
2013-06-20 16:07:59 +04:00
vanhofen
68e9f78c4d slovak.license: fix license text (thx bazi98)
Origin commit data
------------------
Commit: 1f297edafe
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-06-20 (Thu, 20 Jun 2013)

Origin message was:
------------------
- slovak.license: fix license text (thx bazi98)
2013-06-20 12:43:18 +02:00
Stefan Seyfried
fce4dbbe72 Merge branch 'check/next-cc'
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
2013-06-16 21:22:14 +02:00
Michael Liebmann
67903dfd93 Software update: Copy flashimage to /tmp if it is not present in this directory
- unmount mounted network folders before flashing
- kill timerd before flashing


Origin commit data
------------------
Commit: c780676ce5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)
2013-06-13 01:36:03 +02:00
Michael Liebmann
e740dd32f3 scan epg: add german locale
Origin commit data
------------------
Commit: 950d85e41b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)
2013-06-12 17:50:10 +02:00
[CST] Focus
2652e6b514 locals: add locale for epg scan option
Origin commit data
------------------
Commit: c8828cb608
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)
2013-06-12 18:46:34 +04:00
[CST] Focus
38a50d6bc5 add font with simplified chinese support
Origin commit data
------------------
Commit: 2ea80c27ea
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-11 (Tue, 11 Jun 2013)
2013-06-11 17:46:05 +04:00
vanhofen
eb3afed9a5 flash.start: fix djmount upnp directory
Origin commit data
------------------
Commit: eb2edf404b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-06-10 (Mon, 10 Jun 2013)

Origin message was:
------------------
- flash.start: fix djmount upnp directory
2013-06-10 10:54:03 +02:00
Michael Liebmann
4987f7ef5b Software update: Rework preparing the flash process
- Finish all unnecessary threads and processes before the flash process
- Use flash.start to stop other (user-defined) processes


Origin commit data
------------------
Commit: c26fd64759
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-08 (Sat, 08 Jun 2013)

Origin message was:
------------------
* Software update: Rework preparing the flash process

- Finish all unnecessary threads and processes before the flash process
- Use flash.start to stop other (user-defined) processes
2013-06-08 16:20:32 +02:00