Commit Graph

3630 Commits

Author SHA1 Message Date
[CST] Focus
00dba32ece merge dvbsi++
Origin commit data
------------------
Commit: 46657a1c6b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-11 (Mon, 11 Feb 2013)
2013-02-11 13:29:09 +04:00
[CST] Focus
887aedb9da neutrino.cpp: change led defaults for trinity
Origin commit data
------------------
Commit: 0fd4d4f439
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-11 (Mon, 11 Feb 2013)
2013-02-11 13:12:49 +04:00
[CST] Focus
d0e8588cbb Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 5e054fc719
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-11 (Mon, 11 Feb 2013)
2013-02-11 13:09:39 +04:00
vanhofen
aa4620cadf yweb: supplement to 35c313d90e
* add a background-image to zoomshot-button


Origin commit data
------------------
Commit: e2b22e656e
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-10 (Sun, 10 Feb 2013)

Origin message was:
------------------
- yweb: supplement to 35c313d90e

* add a background-image to zoomshot-button
2013-02-10 23:25:16 +01:00
vanhofen
b474116b2c neutrino.cpp: remove double determination of g_info.delivery_system
Origin commit data
------------------
Commit: c4f8bf17a9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-10 (Sun, 10 Feb 2013)

Origin message was:
------------------
- neutrino.cpp: remove double determination of g_info.delivery_system
2013-02-10 22:00:22 +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
Michael Liebmann
b6eb1f2f6b update_ext.cpp: Fix wildcard handling for delete list
Origin commit data
------------------
Commit: de36ce60c4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-02-10 (Sun, 10 Feb 2013)
2013-02-10 17:26:51 +01:00
TangoCash
30a218c9ca channellist.cpp: add epg-desc to blue button ...
... if g_settings.channellist_additional is not off.

initially patch by TangoCash with marginal modifications


Origin commit data
------------------
Commit: 31080fa98c
Author: TangoCash <eric@loxat.de>
Date: 2013-02-09 (Sat, 09 Feb 2013)

Origin message was:
------------------
- channellist.cpp: add epg-desc to blue button ...

... if g_settings.channellist_additional is not off.

initially patch by TangoCash with marginal modifications
2013-02-09 10:36:11 +01:00
[CST] Focus
9ac317723e src/Makefile.am: add libca-cs
Origin commit data
------------------
Commit: f2a1895eeb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-07 (Thu, 07 Feb 2013)
2013-02-07 15:26:10 +04:00
[CST] Focus
c3714f009c zapit/src/femanager.cpp: skip unused and linked fe for scan
Origin commit data
------------------
Commit: 57da0181d2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-07 (Thu, 07 Feb 2013)
2013-02-07 11:45:21 +04:00
[CST] Focus
807055f9b4 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 8ea5d013ab
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-07 (Thu, 07 Feb 2013)
2013-02-07 08:50:56 +04:00
vanhofen
35c313d90e yweb: rework Y_Tools_remote_osd.yhtm
* use only one file to make osd-shots
* add a (not really) zoom-function
* add posibility to change filename
* add needed locals
* remove Y_Tools_fbshot.yhtm


Origin commit data
------------------
Commit: c2668d2f2c
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-06 (Wed, 06 Feb 2013)

Origin message was:
------------------
- yweb: rework Y_Tools_remote_osd.yhtm

* use only one file to make osd-shots
* add a (not really) zoom-function
* add posibility to change filename
* add needed locals
* remove Y_Tools_fbshot.yhtm
2013-02-06 22:14:10 +01:00
vanhofen
8391e6c72e channellist.cpp: fix restore to fullTV
... when turning miniTV off from the menu inside the channellist


Origin commit data
------------------
Commit: c6155f29b4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-06 (Wed, 06 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix restore to fullTV

... when turning miniTV off from the menu inside the channellist
2013-02-06 21:19:49 +01:00
vanhofen
f0984d714a channellist.cpp: 'fix' the double determination of dimensions/coordinates
Origin commit data
------------------
Commit: d4635b690f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: 'fix' the double determination of dimensions/coordinates
2013-02-05 23:56:48 +01:00
vanhofen
6e469316bf channellist.cpp: determinate startTimeWidth from a fixed value
Origin commit data
------------------
Commit: d6f4ea5baa
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: determinate startTimeWidth from a fixed value
2013-02-05 17:01:18 +01:00
vanhofen
57278e418f channellist.cpp: remove time for no further events
thx to TangoCash.


Origin commit data
------------------
Commit: 54ed166d1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: remove time for no further events

thx to TangoCash.
2013-02-05 01:36:28 +01:00
vanhofen
4d0b4e3f19 channellist.cpp: fix wrong time for no further events
patch by TangoCash. thx!


Origin commit data
------------------
Commit: 3bdb3bbc07
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix wrong time for no further events

patch by TangoCash. thx!
2013-02-05 00:58:31 +01:00
vanhofen
13584ec686 osd_setup.cpp: fix color-hotkey for channellist-submenu and add a seperator line
Origin commit data
------------------
Commit: e07e95bfb2
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- osd_setup.cpp: fix color-hotkey for channellist-submenu and add a seperator line
2013-02-05 00:44:13 +01:00
vanhofen
48d8583fc8 channellist.cpp: fix shortcuts in submenu and add a seperator line
Origin commit data
------------------
Commit: ee0cb25258
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix shortcuts in submenu and add a seperator line
2013-02-05 00:30:16 +01:00
vanhofen
7ecdaf4a01 osd_setup.cpp: add 'channellist.additional' to channellist's submenu
very ugly: same code two times


Origin commit data
------------------
Commit: ce0025c7cd
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-04 (Mon, 04 Feb 2013)

Origin message was:
------------------
- osd_setup.cpp: add 'channellist.additional' to channellist's submenu

very ugly: same code two times
2013-02-04 23:43:16 +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
vanhofen
921be8d2a6 yweb: disable horizontal scrolling in screenshot-pages
Origin commit data
------------------
Commit: 01c6cf0104
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-04 (Mon, 04 Feb 2013)

Origin message was:
------------------
- yweb: disable horizontal scrolling in screenshot-pages
2013-02-04 15:07:27 +01:00
[CST] Focus
caa8b0a745 Merge branch 'next' of 109.75.98.228:cst-private-neutrino into next
Origin commit data
------------------
Commit: 752f404654
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-04 (Mon, 04 Feb 2013)
2013-02-04 11:02:51 +04:00
[CST] Focus
ae5eb45a45 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Commit: d7f4535207
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-04 (Mon, 04 Feb 2013)
2013-02-04 11:02:31 +04:00
[CST] Focus
f66bc6c701 Merge branch 'dvbsi++' of 109.75.98.228:cst-private-neutrino into dvbsi++
Origin commit data
------------------
Commit: 3727b0ea53
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-04 (Mon, 04 Feb 2013)
2013-02-04 11:02:00 +04:00
[CST] Bas
4eaee38ab6 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into dvbsi++
Origin commit data
------------------
Commit: 23257d5bae
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-02-04 (Mon, 04 Feb 2013)
2013-02-04 14:46:44 +08:00
[CST] Bas
63aa048e97 cam_menu.cpp: handle ENQ objects correctly.
Origin commit data
------------------
Commit: 3ffe8b1d23
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-02-04 (Mon, 04 Feb 2013)
2013-02-04 14:43:55 +08:00
[CST] Bas
a0f07673d8 neutrino: add a input object for Enquiry Objects from CI. They specify if the
input has to be blind.


Origin commit data
------------------
Commit: 02b649a6f4
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-02-04 (Mon, 04 Feb 2013)

Origin message was:
------------------
neutrino: add a input object for Enquiry Objects from CI. They specify if the
     input has to be blind.
2013-02-04 14:42:40 +08:00
[CST] Focus
74e0c756b8 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Commit: 43d825b62e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-04 (Mon, 04 Feb 2013)
2013-02-04 10:06:00 +04:00
[CST] Focus
f915fcf3fe Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 9c4065257c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-04 (Mon, 04 Feb 2013)
2013-02-04 10:04:05 +04: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
f6386ce110 channellist.cpp: rework header and buttonbar
* paint channellogo in mini-tv-mode
* strech the positions of right elements in header marginally
* paint buttonbar over the full width


Origin commit data
------------------
Commit: 77bbdfa0c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-02 (Sat, 02 Feb 2013)

Origin message was:
------------------
- channellist.cpp: rework header and buttonbar

* paint channellogo in mini-tv-mode
* strech the positions of right elements in header marginally
* paint buttonbar over the full width
2013-02-02 02:10:35 +01:00
vanhofen
01644b362f channellist.cpp: change color for infozone
Origin commit data
------------------
Commit: 1e45607ae1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-01 (Fri, 01 Feb 2013)

Origin message was:
------------------
- channellist.cpp: change color for infozone
2013-02-01 23:26:33 +01:00
vanhofen
563406bf59 channellist.cpp: fix round borders for infozone
Origin commit data
------------------
Commit: ec4a5bf3c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-01 (Fri, 01 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix round borders for infozone
2013-02-01 22:59:07 +01:00
Michael Liebmann
f59b1d029b src/gui/channellist.cpp: miniTV osd fix
- Screen coordinate x could possibly receive a value under 0


Origin commit data
------------------
Commit: 49667088f7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)

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

- Screen coordinate x could possibly receive a value under 0
2013-01-31 20:05:03 +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
Stefan Seyfried
57769a304d getservices: fix FindChannelFuzzy()
* for services with duplicate tsid/onid/sid, not all channels were found
 (function returned NULL if the first match was not the correct one)
* add compatibility with "wrong" ubouquets.xml for non-sat boxes: the
 position parameter was ignored before and is not too useful outside
 sat anyway


Origin commit data
------------------
Commit: 0995ff5042
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-31 (Thu, 31 Jan 2013)

Origin message was:
------------------
getservices: fix FindChannelFuzzy()

* for services with duplicate tsid/onid/sid, not all channels were found
 (function returned NULL if the first match was not the correct one)
* add compatibility with "wrong" ubouquets.xml for non-sat boxes: the
 position parameter was ignored before and is not too useful outside
 sat anyway
2013-01-31 16:51:43 +01:00
Jacek Jendrzej
58f8dadd0f src/gui/channellist.cpp: fix possible segfault
Origin commit data
------------------
Commit: 2e5b54c509
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)
2013-01-31 16:18:05 +01:00
[CST] Focus
2c09ba56ef gui/scan_setup.cpp: fix old merge
Origin commit data
------------------
Commit: 72d53fa44d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)
2013-01-31 18:01:19 +04:00
[CST] Focus
75d5db52e4 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Commit: bcd02435dd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)
2013-01-31 17:40:19 +04:00
[CST] Focus
0685ab60e3 gui/scan_setup.cpp: fix old merge
Origin commit data
------------------
Commit: 827a0fa5d7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)
2013-01-31 17:21:21 +04:00
[CST] Focus
47f327accf Revert "configure scripts: add boxmodel"
This reverts commit 9c033b665d.


Origin commit data
------------------
Commit: 6f00785528
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)
2013-01-31 16:59:50 +04:00
[CST] Focus
5500935ea1 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 3517bba9d6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)
2013-01-31 16:57:32 +04:00
Jacek Jendrzej
24df83b2c9 add .rej ~ to .gitignore
Origin commit data
------------------
Commit: 43aaec7cfc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)

Origin message was:
------------------
-add .rej ~ to .gitignore
2013-01-31 12:24:34 +01:00
Jacek Jendrzej
97d55b8e2d src/gui/channellist.cpp: minitv osd fix
Origin commit data
------------------
Commit: 17cfb97f9e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)
2013-01-31 11:14:38 +01:00
Jacek Jendrzej
9035cc0a81 delete src/neutrino.cpp.~ .rej
Origin commit data
------------------
Commit: 15623981df
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 23:52:31 +01:00
Jacek Jendrzej
a597c84fc7 delete src/gui/channellist.cpp.rej
Origin commit data
------------------
Commit: 1d1f1e3ae9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 23:49:43 +01:00
Jacek Jendrzej
e6a274218b delete src/gui/channellist.cpp~
Origin commit data
------------------
Commit: 8c0ac9e724
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 23:47:25 +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
f1144f8192 src/gui/channellist.cpp: fix minitv gui & segfault
Origin commit data
------------------
Commit: e509f19361
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 23:37:11 +01:00