Commit Graph

224 Commits

Author SHA1 Message Date
GetAway
7091c7c096 infoviewer_bb.cpp: suppress tuner icon in ts mode
Origin commit data
------------------
Commit: 766e65b54f
Author: GetAway <get-away@t-online.de>
Date: 2018-10-25 (Thu, 25 Oct 2018)
2018-10-26 00:23:47 +02:00
vanhofen
dc9ab946ad infoviewer_bb: update ca-bar
Origin commit data
------------------
Commit: 99cad42f4a
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-09-02 (Sun, 02 Sep 2018)

Origin message was:
------------------
- infoviewer_bb: update ca-bar
2018-09-02 21:21:03 +02:00
vanhofen
be4b4dae2b infoviewer_bb: fix ecm parsing
Origin commit data
------------------
Commit: 2539cfd36d
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-03-17 (Sat, 17 Mar 2018)

Origin message was:
------------------
- infoviewer_bb: fix ecm parsing
2018-03-17 22:05:52 +01:00
vanhofen
96b3e115f1 fix 116a1317ec
Origin commit data
------------------
Commit: c2b76ae39f
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-03-16 (Fri, 16 Mar 2018)

Origin message was:
------------------
- fix 116a1317ec
2018-03-16 15:28:02 +01:00
vanhofen
efcb427f1a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	data/icons/status/ca/Makefile.am
	data/icons/status/ca/biss_green.png
	data/icons/status/ca/biss_white.png
	data/icons/status/ca/biss_yellow.png
	data/icons/status/ca/conax_green.png
	data/icons/status/ca/conax_white.png
	data/icons/status/ca/conax_yellow.png
	data/icons/status/ca/cw_green.png
	data/icons/status/ca/cw_white.png
	data/icons/status/ca/cw_yellow.png
	data/icons/status/ca/d_green.png
	data/icons/status/ca/d_white.png
	data/icons/status/ca/d_yellow.png
	data/icons/status/ca/ird_green.png
	data/icons/status/ca/ird_white.png
	data/icons/status/ca/ird_yellow.png
	data/icons/status/ca/nagra_green.png
	data/icons/status/ca/nagra_white.png
	data/icons/status/ca/nagra_yellow.png
	data/icons/status/ca/nds_green.png
	data/icons/status/ca/nds_white.png
	data/icons/status/ca/nds_yellow.png
	data/icons/status/ca/powervu_green.png
	data/icons/status/ca/powervu_white.png
	data/icons/status/ca/powervu_yellow.png
	data/icons/status/ca/seca_green.png
	data/icons/status/ca/seca_white.png
	data/icons/status/ca/seca_yellow.png
	data/icons/status/ca/tan_green.png
	data/icons/status/ca/tan_white.png
	data/icons/status/ca/tan_yellow.png
	data/icons/status/ca/via_green.png
	data/icons/status/ca/via_white.png
	data/icons/status/ca/via_yellow.png
	data/icons/status/ca/x_green.png
	data/icons/status/ca/x_white.png
	data/icons/status/ca/x_yellow.png
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: 1322c2de67
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-15 (Fri, 15 Dec 2017)
2017-12-15 23:19:49 +01:00
vanhofen
70550ada22 infoviewer_bb: small renamings to get more logic in function names
showOne_CAIcon() => showIcon_CA()
paint_ca_icons() => paint_ca_icon()
showIcon_CA_Status() => paint_ca_icons()

 Conflicts:
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: ce0aa768b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-13 (Wed, 13 Dec 2017)

Origin message was:
------------------
- infoviewer_bb: small renamings to get more logic in function names

showOne_CAIcon()   => showIcon_CA()
paint_ca_icons()   => paint_ca_icon()
showIcon_CA_Status() => paint_ca_icons()

 Conflicts:
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-15 18:42:18 +01:00
TangoCash
04195c2b26 fix icon alignment
Conflicts:
	src/gui/infoviewer_bb.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 2f5f5f70c3
Author: TangoCash <eric@loxat.de>
Date: 2017-12-12 (Tue, 12 Dec 2017)
2017-12-15 18:42:16 +01:00
vanhofen
5a890e3a25 infoviewer_bb: add gradient to ca-bar; ...
use always CComponentsShapeSquare to paint ca-bar

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 5e2fe0a195
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-11 (Mon, 11 Dec 2017)

Origin message was:
------------------
- infoviewer_bb: add gradient to ca-bar; ...

use always CComponentsShapeSquare to paint ca-bar

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-15 18:42:10 +01:00
vanhofen
6004ed4ad7 infoviewer_bb: always show hdd fill level for a more uniform view; ...
mark undetected hdd fill level with a small line over the progressbar.
this avoids a "whole" in footer when gradient is active

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 129f9db0ab
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-11 (Mon, 11 Dec 2017)

Origin message was:
------------------
- infoviewer_bb: always show hdd fill level for a more uniform view; ...

mark undetected hdd fill level with a small line over the progressbar.
this avoids a "whole" in footer when gradient is active

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-15 18:42:08 +01:00
TangoCash
95d1ddd7be update cryptsystems
Origin commit data
------------------
Commit: ac696e9ba3
Author: TangoCash <eric@loxat.de>
Date: 2017-12-11 (Mon, 11 Dec 2017)
2017-12-15 18:42:00 +01:00
vanhofen
fbcd8ed13c infoviewer_bb: small renamings to get more logic in function names
showOne_CAIcon() => showIcon_CA()
paint_ca_icons() => paint_ca_icon()
showIcon_CA_Status() => paint_ca_icons()


Origin commit data
------------------
Commit: 9389e78318
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-13 (Wed, 13 Dec 2017)

Origin message was:
------------------
- infoviewer_bb: small renamings to get more logic in function names

showOne_CAIcon()   => showIcon_CA()
paint_ca_icons()   => paint_ca_icon()
showIcon_CA_Status() => paint_ca_icons()
2017-12-13 09:39:12 +01:00
TangoCash
5d413276f0 fix icon alignment
Origin commit data
------------------
Commit: 198c8f4f37
Author: TangoCash <eric@loxat.de>
Date: 2017-12-12 (Tue, 12 Dec 2017)
2017-12-12 21:09:59 +01:00
vanhofen
bebf91c8fd infoviewer_bb: add gradient to ca-bar; ...
use always CComponentsShapeSquare to paint ca-bar


Origin commit data
------------------
Commit: ef1a760063
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-11 (Mon, 11 Dec 2017)

Origin message was:
------------------
- infoviewer_bb: add gradient to ca-bar; ...

use always CComponentsShapeSquare to paint ca-bar
2017-12-11 22:26:22 +01:00
vanhofen
ac805d4a51 infoviewer_bb: always show hdd fill level for a more uniform view; ...
mark undetected hdd fill level with a small line over the progressbar.
this avoids a "whole" in footer when gradient is active


Origin commit data
------------------
Commit: 96cb7f8b9b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-11 (Mon, 11 Dec 2017)

Origin message was:
------------------
- infoviewer_bb: always show hdd fill level for a more uniform view; ...

mark undetected hdd fill level with a small line over the progressbar.
this avoids a "whole" in footer when gradient is active
2017-12-11 21:59:44 +01:00
TangoCash
09fe95ebec update cryptsystems
Origin commit data
------------------
Commit: 78a7c344c2
Author: TangoCash <eric@loxat.de>
Date: 2017-12-11 (Mon, 11 Dec 2017)
2017-12-11 21:00:17 +01:00
vanhofen
07bc541c29 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: bf43ce3643
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-02 (Sat, 02 Dec 2017)
2017-12-02 20:19:08 +01:00
vanhofen
7f3527e349 infoviewer_bb: use OFFSET defines; ...
height of ca-bar now depends on height of ca-icons
cleanup from commented code


Origin commit data
------------------
Commit: 77db4a63e3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-01 (Fri, 01 Dec 2017)

Origin message was:
------------------
- infoviewer_bb: use OFFSET defines; ...

height of ca-bar now depends on height of ca-icons
cleanup from commented code
2017-12-02 15:23:19 +01:00
vanhofen
07bcc0705a infoviewer_bb: fix offset for first status-icon
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 04eeb5d65b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-29 (Wed, 29 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: fix offset for first status-icon

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-01 14:26:41 +01:00
vanhofen
fad721c02c infoviewer_bb: take footer height from CComponentsFooter ...
to get this footer in sync with the footers of other gui elements

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 3276b5358a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-28 (Tue, 28 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: take footer height from CComponentsFooter ...

to get this footer in sync with the footers of other gui elements

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-01 14:26:40 +01:00
vanhofen
32b9af3d96 infoviewer_bb: fix offset for first status-icon
Origin commit data
------------------
Commit: 1751a00cc3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-29 (Wed, 29 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: fix offset for first status-icon
2017-11-29 10:47:34 +01:00
vanhofen
c792b497c3 infoviewer_bb: use OFFSET defines; ...
height of ca-bar now depends on height of ca-icons
cleanup from commented code


Origin commit data
------------------
Commit: 866a2c3a4a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-28 (Tue, 28 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: use OFFSET defines; ...

height of ca-bar now depends on height of ca-icons
cleanup from commented code
2017-11-28 14:41:42 +01:00
vanhofen
5ee250c9e9 infoviewer_bb: take footer height from CComponentsFooter ...
to get this footer in sync with the footers of other gui elements


Origin commit data
------------------
Commit: 2e4b0023ab
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-28 (Tue, 28 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: take footer height from CComponentsFooter ...

to get this footer in sync with the footers of other gui elements
2017-11-28 14:41:42 +01:00
vanhofen
49b29a81a9 neutrino: unify modes handling; ...
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 0fc3e793a4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: unify modes handling; ...

remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-22 15:42:09 +01:00
vanhofen
8729b26638 neutrino: unify modes handling; ...
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


Origin commit data
------------------
Commit: 028ec3cf3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: unify modes handling; ...

remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes
2017-11-20 15:19:06 +01:00
vanhofen
144c7adf5e infoviewer_bb: fix wrong mode-logic for radiotext icon
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 1ba4533618
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-09 (Thu, 09 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: fix wrong mode-logic for radiotext icon

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
vanhofen
c116c65394 infoviewer_bb: fix display of icons in radio/webradio mode
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 6b470be470
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-05 (Sun, 05 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: fix display of icons in radio/webradio mode

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
vanhofen
ab30c38463 rename IS_WEBTV => IS_WEBCHAN
Conflicts:
	src/zapit/src/capmt.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 740fd3ac0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN

 Conflicts:
	src/zapit/src/capmt.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-16 19:43:26 +01:00
vanhofen
40732c1181 infoviewer_bb: minor change in icon handling
Origin commit data
------------------
Commit: ca9639ba54
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-14 (Tue, 14 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: minor change in icon handling
2017-11-14 21:27:43 +01:00
vanhofen
3b417b9fc2 infoviewer_bb: fix wrong mode-logic for radiotext icon
Origin commit data
------------------
Commit: d084f24e52
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-09 (Thu, 09 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: fix wrong mode-logic for radiotext icon
2017-11-09 08:23:44 +01:00
vanhofen
ab14f705c2 infoviewer_bb: minor change in icon handling
Origin commit data
------------------
Commit: 5f680879f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: minor change in icon handling
2017-11-06 21:55:29 +01:00
vanhofen
ba849a5aac infoviewer_bb: fix display of icons in radio/webradio mode
Origin commit data
------------------
Commit: 7c7dcec0af
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-05 (Sun, 05 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: fix display of icons in radio/webradio mode
2017-11-05 01:30:16 +01:00
vanhofen
268e94d9e3 rename IS_WEBTV => IS_WEBCHAN
Origin commit data
------------------
Commit: ebcd15da41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN
2017-11-03 09:36:19 +01:00
TangoCash
ba243eca6e fix resolution icon in infoviewer
Origin commit data
------------------
Commit: 6a1b0c1c73
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
2017-10-29 18:31:56 +01:00
vanhofen
665f147313 add UHD icons to infoviewer
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 23711b0635
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- add UHD icons to infoviewer

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-10-29 18:27:14 +01:00
TangoCash
9b8e581398 remove defines, fix is in stbhal !
Origin commit data
------------------
Commit: 96a2d5945c
Author: TangoCash <eric@loxat.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)
2017-10-28 22:37:35 +02:00
vanhofen
68c3d20998 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: ccb70fd1b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-13 (Fri, 13 Oct 2017)
2017-10-13 14:13:22 +02:00
vanhofen
e41ad78e8f add UHD icons to infoviewer
Conflicts:
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: db184e3abe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- add UHD icons to infoviewer

Conflicts:
	src/gui/infoviewer_bb.cpp
2017-10-13 14:10:34 +02:00
vanhofen
8045ab1dd5 add UHD icons to infoviewer
Origin commit data
------------------
Commit: d367c33842
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- add UHD icons to infoviewer
2017-10-12 00:36:45 +02:00
TangoCash
8ab431151d fix resolution icon in infoviewer
Origin commit data
------------------
Commit: d2faaec888
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
2017-10-12 00:36:45 +02:00
vanhofen
c2cc8c434f Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
2017-10-02 23:21:37 +02:00
vanhofen
583f45fad7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
2017-10-02 23:19:49 +02:00
Jacek Jendrzej
f4c51e829b Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 7ad4a0e6cc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)
2017-10-02 13:56:25 +02:00
Stefan Seyfried
c9d4fdd9cc remove "using namespace std" from header files
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)


Origin commit data
------------------
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
2017-10-02 13:43:57 +02:00
vanhofen
0e3522fc52 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 2b7afc5b38
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-21 (Thu, 21 Sep 2017)
2017-09-21 10:33:00 +02:00
Michael Liebmann
e137542efe Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: abfb02aa47
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-21 (Thu, 21 Sep 2017)
2017-09-21 09:07:15 +02:00
vanhofen
402c567fe7 add and use FRAME_WIDTH defines; ...
replace other fixed frame widths with OFFSET defines

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 6ee3e54741
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)

Origin message was:
------------------
- add and use FRAME_WIDTH defines; ...

replace other fixed frame widths with OFFSET defines

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-20 21:29:53 +02:00
vanhofen
619342d89d add and use FRAME_WIDTH defines; ...
replace other fixed frame widths with OFFSET defines


Origin commit data
------------------
Commit: 6d58a3b1c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)

Origin message was:
------------------
- add and use FRAME_WIDTH defines; ...

replace other fixed frame widths with OFFSET defines
2017-09-20 13:46:31 +02:00
vanhofen
c6c61f6b22 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)
2017-09-12 22:32:07 +02:00
vanhofen
ebb13b6951 small adds
Origin commit data
------------------
Commit: 547ad8a491
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)

Origin message was:
------------------
- small adds
2017-09-09 15:33:46 +02:00
vanhofen
c35224ff08 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: 17546e7ba1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-10 (Sat, 10 Jun 2017)
2017-06-10 11:43:50 +02:00