Commit Graph

3659 Commits

Author SHA1 Message Date
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
Jacek Jendrzej
6d3022d182 compil fix for commit eedc2330d9
Origin commit data
------------------
Commit: deeed028d4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 19:31:57 +01:00
TangoCash
eedc2330d9 add optional mini-tv to channellist
Signed-off-by: satbaby <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 1a425308ed
Author: TangoCash <eric@loxat.de>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 19:17:52 +01:00
[CST] Focus
4e31dce23f zapit/src/femanager.cpp: fix cleanup on delete
Origin commit data
------------------
Commit: b0eb071af1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 17:56:44 +04:00
[CST] Focus
fefca6f427 system/setting_helpers.cpp: fix unused warning on apollo
Origin commit data
------------------
Commit: ced8b191b1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 17:53:56 +04:00
[CST] Focus
3fe71fe637 acinclude.m4: set default box type to nevis
Origin commit data
------------------
Commit: 258d2b8666
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 14:28:07 +04:00
[CST] Focus
59febc76c3 nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp: filter channels, show real channel number
Origin commit data
------------------
Commit: 720bfba267
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 13:05:08 +04:00
[CST] Focus
630df297e3 gui/timerlist.cpp: filter bouquets channels
Origin commit data
------------------
Commit: 6fe4b8aad4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 11:54:49 +04:00
[CST] Focus
fb16ff4363 gui/zapit_setup.cpp: filter bouquets channels,
fix return values to close all menus on menu key


Origin commit data
------------------
Commit: 62529ede9c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 11:39:51 +04:00
[CST] Focus
b2deac480d zapit/src/bouquets.cpp: fix copy/paste in getRadioChannels
Origin commit data
------------------
Commit: 55e3db20b8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 11:37:08 +04:00
[CST] Focus
5e93ba0b6b configure.ac: always define HAVE_COOLSTREAM_NEVIS_IR_H, ifdef in rcinput.h decide what to include
Origin commit data
------------------
Commit: 6724414335
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 11:16:24 +04:00
[CST] Focus
0ad47b872c Merge branch 'dvbsi++' into next
Origin commit data
------------------
Commit: e5c032b032
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 11:07:59 +04:00
[CST] Focus
ae6cbaa232 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 1e444d2f61
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
2013-01-30 11:06:54 +04:00
Stefan Seyfried
82c113dfdd bouquets: fix ubouquet generation for broken services
Services with duplicate tsid/onid/sid like found e.g. on "8W Atlantic
Bird 2", "12.5W Atlantic Bird 1", "4.8E Sirius", "7E Eutelsat" caused
wrong bouquet entries because the satellite position and transponder
frequency was not used to distinguish the channels. Use the new
FindChannelFuzzy() function to fix this.


Origin commit data
------------------
Commit: 70b3ef04f9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-29 (Tue, 29 Jan 2013)

Origin message was:
------------------
bouquets: fix ubouquet generation for broken services

Services with duplicate tsid/onid/sid like found e.g. on "8W Atlantic
Bird 2", "12.5W Atlantic Bird 1", "4.8E Sirius", "7E Eutelsat" caused
wrong bouquet entries because the satellite position and transponder
frequency was not used to distinguish the channels. Use the new
FindChannelFuzzy() function to fix this.
2013-01-29 22:50:23 +01:00
Stefan Seyfried
b906d983da getservices: add FindChannelFuzzy() function
Add a function that returns a channel if tsid, onid, sid and
satellite position matches and the frequency matches +-2MHz.
(This frequency tolerance allows ubouquets to be used after
updates to satellites.xml)


Origin commit data
------------------
Commit: 536484f698
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 22:50:23 +01:00
[CST] Focus
eeb539e8e9 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Commit: 5776c67825
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 17:42:19 +04:00
[CST] Focus
9c033b665d configure scripts: add boxmodel
Origin commit data
------------------
Commit: 38461dca6c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 17:41:06 +04:00
[CST] Focus
2d52dca352 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 66a2e68946
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 17:39:13 +04:00
[CST] Focus
ba3ac836bc system/flashtool.cpp: fix buffer size for nor
Origin commit data
------------------
Commit: d1cbff900f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 17:38:39 +04:00
vanhofen
1b297bb909 neutrino.cpp: fix wrong configfile in loadKeys()
Origin commit data
------------------
Commit: 1320462626
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-01-29 (Tue, 29 Jan 2013)

Origin message was:
------------------
- neutrino.cpp: fix wrong configfile in loadKeys()
2013-01-29 13:13:55 +01:00
[CST] Focus
987520bdb1 .gitignore: add generated src/nhttpd/nhttpd.conf
Origin commit data
------------------
Commit: b0e404922a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 14:49:25 +04:00
[CST] Focus
bd43e4ecc8 system/setting_helpers.cpp: use CONFIGDIR to remove xml/conf files
Origin commit data
------------------
Commit: 4b10e2e7c9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 14:48:00 +04:00