Commit Graph

564 Commits

Author SHA1 Message Date
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
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
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
Stefan Seyfried
79c46f7e3e create zapit config dir on install
Origin commit data
------------------
Commit: eea77b7c8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)
2013-03-25 16:48:25 +01:00
vanhofen
0df9a58c45 strech most windows to full screen
* switchable with existing switch for 'big_windows'
* 'big_windows' default is on


Origin commit data
------------------
Commit: 759966f935
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
2013-03-25 09:45:22 +01:00
vanhofen
6735a60b10 fix another typo around DATA_PIDS
Origin commit data
------------------
Commit: d0164eaaf6
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-20 (Wed, 20 Mar 2013)

Origin message was:
------------------
- fix another typo around DATA_PIDS
2013-03-20 21:50:16 +01:00
vanhofen
b14fe3cf44 deutsch.locale: fix typos
Origin commit data
------------------
Commit: 9b7c96f07e
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-20 (Wed, 20 Mar 2013)

Origin message was:
------------------
- deutsch.locale: fix typos
2013-03-20 21:41:14 +01:00
Jacek Jendrzej
1caa128727 add record option for teletext & dvbsub pids
Origin commit data
------------------
Commit: d9c7739aa6
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-03-19 17:14:04 +01:00
Michael Liebmann
a6e18aa1b7 Imageinfo: Format license text
Origin commit data
------------------
Commit: 9755751217
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-03-19 (Tue, 19 Mar 2013)

Origin message was:
------------------
* Imageinfo: Format license text
2013-03-19 11:54:57 +01:00
Thilo Graf
c7cf5b94ec Data files: add license files
Avoids hard coded parts e.g. for use mainly in image info.


Origin commit data
------------------
Commit: 98b3265719
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-18 (Mon, 18 Mar 2013)
2013-03-18 12:05:01 +01:00
Jacek Jendrzej
dcda89dcb3 progresbar -add colored & vertical design , ported from neutrino-mp
Origin commit data
------------------
Commit: a501b6efeb
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-11 (Mon, 11 Mar 2013)
2013-03-11 14:40:42 +01:00
Jacek Jendrzej
1bc23bfc31 progressbar-menu-tomworld
Origin commit data
------------------
Commit: be2966035f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-11 (Mon, 11 Mar 2013)
2013-03-11 14:40:36 +01:00
Stefan Seyfried
8d71c14242 neutrino: add more progressbar design options
new progressbar design
* colored horizontal lines
* colored vertical lines
* colored solid bar


Origin commit data
------------------
Commit: 385d4ff6a9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-09 (Sat, 09 Mar 2013)
2013-03-09 13:23:14 +01:00
Stefan Seyfried
0a6e405603 Merge branch 'check/next' into master
Conflicts:
	data/locale/english.locale
	src/neutrino.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: 8048673dec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-07 (Thu, 07 Mar 2013)
2013-03-07 17:10:11 +01:00
vanhofen
3474adcdcd deutsch.locale: external plugin-dir must not be on a hdd
Origin commit data
------------------
Commit: 2d611504af
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-05 (Tue, 05 Mar 2013)

Origin message was:
------------------
- deutsch.locale: external plugin-dir must not be on a hdd
2013-03-05 22:46:06 +01:00
vanhofen
a2cee4e0b0 deutsch.locale: rework german menu hints
serveral fixes in spelling and grammar, intelligibility and wording


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

Origin message was:
------------------
- deutsch.locale: rework german menu hints

serveral fixes in spelling and grammar, intelligibility and wording
2013-03-05 22:37:21 +01:00
vanhofen
0d625e8704 locale: two little requested fixes (typo and intelligibility)
Origin commit data
------------------
Commit: 6772336524
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-05 (Tue, 05 Mar 2013)

Origin message was:
------------------
- locale: two little requested fixes (typo and intelligibility)
2013-03-05 21:22:32 +01:00
vanhofen
3fabc8e493 icons: remove unneeded movieplayer.raw
Origin commit data
------------------
Commit: c0959cc5f5
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-28 (Thu, 28 Feb 2013)

Origin message was:
------------------
- icons: remove unneeded movieplayer.raw
2013-02-28 09:49:27 +01:00
vanhofen
2774c2b6da icons: add missing hint_a_pic.png
Origin commit data
------------------
Commit: 365300c830
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-26 (Tue, 26 Feb 2013)

Origin message was:
------------------
- icons: add missing hint_a_pic.png
2013-02-26 13:30:13 +01:00
vanhofen
fc9cfdfced locale: clean screenshot-locale from unnecessary ballast
Origin commit data
------------------
Commit: e72d3685f0
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-26 (Tue, 26 Feb 2013)

Origin message was:
------------------
- locale: clean screenshot-locale from unnecessary ballast
2013-02-26 13:07:20 +01:00
Stefan Seyfried
0657136ddc scan_setup: add option to set frontend type to multinorm boxes
Origin commit data
------------------
Commit: 29a23bffb6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-24 (Sun, 24 Feb 2013)
2013-02-24 01:45:38 +01:00
Stefan Seyfried
2b4f5306dc Merge branch 'check/dvbsi++' commit 984435d48e
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 0cf191822a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-21 (Thu, 21 Feb 2013)
2013-02-21 17:07:18 +01:00
vanhofen
1451221683 Revert "Revert '- channellist.cpp: enable to lock new_zap_mode'"
This reverts commit fa85dcc867.


Origin commit data
------------------
Commit: 505c4ba80d
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)
2013-02-17 22:55:28 +01:00
vanhofen
37e4c1ce61 icons: remove unneeded ddfill.png
Origin commit data
------------------
Commit: b19bd87580
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)

Origin message was:
------------------
- icons: remove unneeded ddfill.png
2013-02-17 21:39:10 +01:00
vanhofen
ada1fa54a6 icons: remove unneeded radio.jpg
Origin commit data
------------------
Commit: 5357724b4c
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-16 (Sat, 16 Feb 2013)

Origin message was:
------------------
- icons: remove unneeded radio.jpg
2013-02-16 16:38:05 +01:00
vanhofen
5bf0eee9ad icons: add missing multimedia.png
Origin commit data
------------------
Commit: aa1d9ce450
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-16 (Sat, 16 Feb 2013)

Origin message was:
------------------
- icons: add missing multimedia.png
2013-02-16 13:14:50 +01:00
vanhofen
b57036c7a1 icons: add missing hint_restart.png
Origin commit data
------------------
Commit: fe3f4ce863
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-16 (Sat, 16 Feb 2013)

Origin message was:
------------------
- icons: add missing hint_restart.png
2013-02-16 10:28:38 +01:00
vanhofen
fa85dcc867 Revert "- channellist.cpp: enable to lock new_zap_mode"
This reverts commit 06a54ba7ce
because the display of infobar while zapping is broken with
this commit.


Origin commit data
------------------
Commit: fb892d18ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-15 (Fri, 15 Feb 2013)
2013-02-15 22:55:45 +01:00
Michael Liebmann
110d2dc734 Sort english.locale
Origin commit data
------------------
Commit: c7f250c2a7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
* Sort english.locale
2013-02-13 11:41:04 +01:00
Jacek Jendrzej
d17c767183 add progressbar hint loc
Origin commit data
------------------
Commit: 6fb981b447
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)
2013-02-12 19:26:46 +01:00
Jacek Jendrzej
00dfd32794 add progressbar opt to infobar
Origin commit data
------------------
Commit: 63c66c1f4e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)
2013-02-12 18:03:50 +01:00
tomworld
51fda1d48f channellist.cpp: Use extra font for event list
Origin commit data
------------------
Commit: 105c6b4c70
Author: tomworld <atzeworld@msn.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
* channellist.cpp: Use extra font for event list
2013-02-12 15:45:27 +01:00
vanhofen
06a54ba7ce channellist.cpp: enable to lock new_zap_mode
Origin commit data
------------------
Commit: 15d787f79b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-10 (Sun, 10 Feb 2013)

Origin message was:
------------------
- channellist.cpp: enable to lock new_zap_mode
2013-02-10 21:03:43 +01:00
vanhofen
9da986e456 channellist: make miniTV switchable
Origin commit data
------------------
Commit: d8bd46e9d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-04 (Mon, 04 Feb 2013)

Origin message was:
------------------
- channellist: make miniTV switchable
2013-02-04 22:25:15 +01:00
Michael Liebmann
9b207fadab src/gui/channellist.cpp: miniTV fix locale
- Add locale for menuhint
- Sort header for locale


Origin commit data
------------------
Commit: 1c85803632
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-02-03 (Sun, 03 Feb 2013)

Origin message was:
------------------
* src/gui/channellist.cpp: miniTV fix locale

- Add locale for menuhint
- Sort header for locale
2013-02-03 07:38:45 +01:00
vanhofen
82d47e3fbe cables.xml: add "antennengemeinschaft penig"
thx Zeng!


Origin commit data
------------------
Commit: 4b8d0e156e
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-01-31 (Thu, 31 Jan 2013)

Origin message was:
------------------
- cables.xml: add "antennengemeinschaft penig"

thx Zeng!
2013-01-31 17:28:18 +01:00
Jacek Jendrzej
a3d0075c20 add locale minitv
Origin commit data
------------------
Commit: 5803ddf873
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)

Origin message was:
------------------
-add locale minitv
2013-01-30 23:41:40 +01:00
Jacek Jendrzej
beba4d412d neutrino: -add unicabel menu option
Origin commit data
------------------
Commit: 7d550ed88e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-08 (Tue, 08 Jan 2013)
2013-01-08 20:35:53 +01:00
Stefan Seyfried
398f17e65a Merge branch 'uncool/dvbsi++' commit d7a2395633
Conflicts:
	src/driver/framebuffer.cpp


Origin commit data
------------------
Commit: 8d69036be5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-03 (Thu, 03 Jan 2013)
2013-01-03 09:46:11 +01:00
Stefan Seyfried
b6b8890979 neutrino: update unicable code
* add an own diseqc type for unicable
* do not configure scr / freq per satellite but only per frontend
* use the diseqc setting of the satellite for determining input 0/1


Origin commit data
------------------
Commit: e1c7f95d63
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-31 (Mon, 31 Dec 2012)
2013-01-01 22:26:07 +01:00
Michael Liebmann
6edc1f7655 Software Update with apply the settings (Part14)
- Add warning/error if not enough space
- THX Striper for translation into English of the locale


Origin commit data
------------------
Commit: 099d0181b6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-01-01 (Tue, 01 Jan 2013)

Origin message was:
------------------
* Software Update with apply the settings (Part14)

- Add warning/error if not enough space
- THX Striper for translation into English of the locale
2013-01-01 15:05:26 +01:00
Michael Liebmann
336cc75a5a Software Update with apply the settings (Part13)
- Delete files from image, before apply settings


Origin commit data
------------------
Commit: 158a8ba4ce
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-12-19 (Wed, 19 Dec 2012)

Origin message was:
------------------
* Software Update with apply the settings (Part13)

- Delete files from image, before apply settings
2013-01-01 15:05:21 +01:00
Stefan Seyfried
6dc8fe83a0 locale: adapt helper scripts to current compilers
Origin commit data
------------------
Commit: 4b03fa98ba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-31 (Mon, 31 Dec 2012)
2012-12-31 22:16:46 +01:00
Stefan Seyfried
384c3b3785 locale: fix ordercheck target
Origin commit data
------------------
Commit: 59e8be0b58
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-31 (Mon, 31 Dec 2012)
2012-12-31 22:16:46 +01:00
Stefan Seyfried
033d0352cb create zapit config dir on install
Origin commit data
------------------
Commit: f6e3dcd385
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-31 (Mon, 31 Dec 2012)
2012-12-31 22:16:46 +01:00
Stefan Seyfried
6e17b3f254 Merge branch 'uncool/dvbsi++' commit 610ce926f5
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)
2012-12-30 21:35:20 +01:00
swing99
4ab0b27f33 cables.xml: update Kabel Deutschland - Offensive 2012
Origin commit data
------------------
Commit: 0ec6859ea9
Author: swing99 <swing0815@googlemail.com>
Date: 2012-12-10 (Mon, 10 Dec 2012)
2012-12-10 16:17:56 +01:00