Commit Graph

729 Commits

Author SHA1 Message Date
Stefan Seyfried
4c7a2f38df Merge branch 'check/next-cc'
Only compile-tested.


Origin commit data
------------------
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)
2013-11-30 20:17:31 +01:00
Michael Liebmann
c9b42ca396 CInfoClock: Use dynamic font for display
Origin commit data
------------------
Commit: 435d25c0ce
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
2013-11-28 16:07:49 +01:00
Jacek Jendrzej
a33bb55eaa CEventFinderMenu -add epg search history
Origin commit data
------------------
Commit: 4f387ae87f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-11-26 (Tue, 26 Nov 2013)
2013-11-26 16:23:24 +01:00
vanhofen
253c5e34f3 data/locale/Makefile.am: remove circular dependency
Origin commit data
------------------
Commit: d52e750de7
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-22 (Fri, 22 Nov 2013)

Origin message was:
------------------
- data/locale/Makefile.am: remove circular dependency
2013-11-22 13:12:55 +01:00
Michael Liebmann
d30ce8b0e5 deutsch.locale: Fix sort order
Origin commit data
------------------
Commit: 80d656e362
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-12 (Tue, 12 Nov 2013)
2013-11-20 09:38:37 +01:00
martii
9f5b067928 yt: make search order selectable
Origin commit data
------------------
Commit: fd5f9f118d
Author: martii <m4rtii@gmx.de>
Date: 2013-10-06 (Sun, 06 Oct 2013)
2013-11-13 16:04:30 +01:00
Stefan Seyfried
261ea85af6 Merge branch 'check/next-cc'
Only compile-tested.


Origin commit data
------------------
Commit: 548448456a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
2013-11-13 14:04:15 +01:00
[CST] Focus
f45c16a376 data/locale/english.locale: capitalize Bouquet editor
Origin commit data
------------------
Commit: c3eb7a8d1a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-12 (Tue, 12 Nov 2013)
2013-11-12 17:21:36 +04:00
martii
13746c0310 implement yt search history
Origin commit data
------------------
Commit: 4a0fdba710
Author: martii <m4rtii@gmx.de>
Date: 2013-08-15 (Thu, 15 Aug 2013)
2013-11-11 17:22:55 +01:00
Thilo Graf
eac95733f6 locales: remove colon from string
Entry is used as caption, not as descriptive paragraph.


Origin commit data
------------------
Commit: 0d50045469
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-11 (Mon, 11 Nov 2013)
2013-11-11 09:02:23 +01:00
Thilo Graf
e2a842bfb8 CImageInfo: rework some parts of imageinfo
-use CComponentsExtTextForm: this combines labels and text to one item

-add build informations: this includes some functions of CBuildInfo class
 to show its informations, user can now use the red button and toggle
 between license and build infos


Origin commit data
------------------
Commit: 2bd2714770
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-11 (Mon, 11 Nov 2013)
2013-11-11 00:20:10 +01:00
Thilo Graf
9bf2127c32 CBuildInfo: rework buildinfo class for use as CComponentsWindow
also possible: get partial informations also as strings for usage
in other classes


Origin commit data
------------------
Commit: 6955df5c5e
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
2013-11-11 00:20:10 +01:00
Michael Liebmann
92dd88d98d Add display of build info
- Display compiler version, compiler flags, build PC, kernel version
- configure.ac part ported from filezilla project


Origin commit data
------------------
Commit: 4cf4857201
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-17 (Thu, 17 Oct 2013)
2013-11-11 00:20:09 +01:00
Thilo Graf
dc838c8810 locales: use german translation for 'Setup Tuner'
Origin commit data
------------------
Commit: 5d37b0b88f
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-31 (Thu, 31 Oct 2013)
2013-11-11 00:19:45 +01:00
Stefan Seyfried
80b809a370 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
2013-11-10 16:55:53 +01:00
[CST] Focus
e9713c62be data/locale/english.locale: fix typo
Origin commit data
------------------
Commit: 1e247dd6f4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-05 (Tue, 05 Nov 2013)
2013-11-05 15:34:23 +04:00
vanhofen
2876a70d0a locales: more suitable locales for networkmenu.setuponstartup
Origin commit data
------------------
Commit: be1e8facac
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-02 (Sat, 02 Nov 2013)

Origin message was:
------------------
- locales: more suitable locales for networkmenu.setuponstartup
2013-11-02 13:33:10 +01:00
vanhofen
b523988600 deutsch.locale: add locales for wlan scan
Origin commit data
------------------
Commit: d976dbbba0
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-02 (Sat, 02 Nov 2013)

Origin message was:
------------------
- deutsch.locale: add locales for wlan scan
2013-11-02 13:30:51 +01:00
Michael Liebmann
174d230b0a deutsch.locale mainmenu.service/settings: Restore original values
Origin commit data
------------------
Commit: c9aa4bd707
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-02 (Sat, 02 Nov 2013)
2013-11-02 08:01:59 +01:00
[CST] Focus
e8bbfd0011 locals: add locales for wlan scan
Origin commit data
------------------
Commit: 71510aa3f0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-01 (Fri, 01 Nov 2013)
2013-11-01 16:43:06 +04:00
Michael Liebmann
e0a5bcce92 Update deutsch.locale an fix sort order in english.locale
Origin commit data
------------------
Commit: 36e20a8535
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-25 (Fri, 25 Oct 2013)
2013-10-26 18:55:40 +02:00
[CST] Focus
60881342d1 move tuner setup to Service menu
Origin commit data
------------------
Commit: 067891fe52
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-25 (Fri, 25 Oct 2013)
2013-10-25 14:27:38 +04:00
[CST] Focus
e091a84f2b as requested, implement 'easy' menu mode for novice users;
default behavior should not be changed, easy mode forced by /var/etc/.easymenu file inside image;
at the moment switch between modes is done by main menu -> 'stop' button -> enter pin code,
restart needed after mode switch


Origin commit data
------------------
Commit: 606bd01878
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-25 (Fri, 25 Oct 2013)
2013-10-25 13:03:26 +04:00
vanhofen
788daa5ad3 locale: remove confusing string 'squashFS'
Origin commit data
------------------
Commit: c239f7af95
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-10-23 (Wed, 23 Oct 2013)

Origin message was:
------------------
- locale: remove confusing string 'squashFS'
2013-10-23 10:41:47 +02:00
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