Commit Graph

1336 Commits

Author SHA1 Message Date
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
Thilo Graf
a772976c71 CComponentsFooter: fix force re init of button container
clear() removes only items and their instances inside button container, but all
other properties (e.g. width) are not touched. Re init should avoids this.


Origin commit data
------------------
Commit: 39fb9f47f4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-15 (Fri, 15 Dec 2017)
2017-12-15 18:40:51 +01:00
vanhofen
90eacd890c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Origin commit data
------------------
Commit: c7c94fdf2e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-10 (Sun, 10 Dec 2017)
2017-12-10 22:50:42 +01:00
Thilo Graf
eb86cf8a84 CComponentsInfoBox: add possibility for scalable picons
Origin commit data
------------------
Commit: 2a2d51d255
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-09 (Sat, 09 Dec 2017)
2017-12-10 22:03:41 +01:00
vanhofen
8f49959f45 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Origin commit data
------------------
Commit: 09559c1385
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-04 (Mon, 04 Dec 2017)
2017-12-04 09:55:06 +01:00
Thilo Graf
f0c38d697d cc_item_picture.h: remove virtual declaration from setPicture()
Is not really required.
Avoids possible compile/linker errors like "...no reference..." for some
coming changes.


Origin commit data
------------------
Commit: e9883cbd2d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-03 (Sun, 03 Dec 2017)
2017-12-04 09:35:57 +01:00
vanhofen
7501f7db04 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	src/Makefile.am
	src/driver/scanepg.cpp
	src/gui/audioplayer.cpp
	src/gui/infoviewer.cpp
	src/gui/movieplayer.cpp
	src/neutrino.cpp
	src/neutrino.h
	src/nhttpd/tuxboxapi/controlapi.cpp


Origin commit data
------------------
Commit: 265771c9a2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-23 (Thu, 23 Nov 2017)
2017-11-23 17:31:02 +01:00
Thilo Graf
23732f0bac CComponentsTimer: try to fix timing on non cst hardware
On hd51 and pc hardware was observed full visual timeout progress in message boxes.
Timeoout was displayed always without visible progress.
This should fix this.


Origin commit data
------------------
Commit: caface0a88
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-11-23 (Thu, 23 Nov 2017)
2017-11-23 16:37:48 +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
dff79725de Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Origin commit data
------------------
Commit: c7b4538921
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-19 (Sun, 19 Nov 2017)
2017-11-19 21:59:10 +01:00
Thilo Graf
96ff115b71 src/gui/components/cc_frm_window.cpp: fix too small left bottom corner
radius is allready calculatetd in base class src/gui/components/cc_frm.cpp
in member CComponentsForm::paintCCItems()

NOTE:
It seems the radius calculation inside framebuffer don't working correct
for corners on the right site on top and bottom.
Seen on hd51 hardware on osd-boxes with shadow
(e.g. infobar) or Boxes with frames e.g. on error message windows, buttons.
There are pixel errors like minimal holes on osd or displaced pixels.
On CST hardware evreything is ok.


Origin commit data
------------------
Commit: 94517d3404
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-11-19 (Sun, 19 Nov 2017)

Origin message was:
------------------
src/gui/components/cc_frm_window.cpp: fix too small left bottom corner

radius is allready calculatetd in base class src/gui/components/cc_frm.cpp
in member CComponentsForm::paintCCItems()

NOTE:
It seems the radius calculation inside framebuffer don't working correct
for corners on the right site on top and bottom.
Seen on hd51 hardware on osd-boxes with shadow
(e.g. infobar) or Boxes with frames e.g. on error message windows, buttons.
There are pixel errors like minimal holes on osd or displaced pixels.
On CST hardware evreything is ok.
2017-11-19 21:12:42 +01:00
vanhofen
c557a6bf06 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	src/driver/simple_display.cpp


Origin commit data
------------------
Commit: db0efcca40
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
2017-11-03 22:40:43 +01:00
Jacek Jendrzej
03b2b13758 silence -Wparentheses-equality warning
Origin commit data
------------------
Commit: 75fd96f6b7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)
2017-11-03 20:14:37 +01:00
Thilo Graf
fcd9d06d45 Merge branch 'pu/mp' into 'master'
Origin commit data
------------------
Commit: ccb19a8880
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-17 (Tue, 17 Oct 2017)
2017-10-17 20:38:58 +02:00
Thilo Graf
68ea18ecbf CComponentsPIP: use default background image as default image
Origin commit data
------------------
Commit: e169a76ff9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)
2017-10-17 20:02:23 +02:00
Jacek Jendrzej
041101db81 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 4b8cf23d70
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-16 (Mon, 16 Oct 2017)
2017-10-16 13:17:17 +02:00
vanhofen
36e82eb293 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 14f190ac6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)
2017-10-14 08:41:42 +02:00
vanhofen
944cd0ec0f cc-footer: remove our calcation of label-width; should now work automatically
Origin commit data
------------------
Commit: 8aad36ed83
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)

Origin message was:
------------------
- cc-footer: remove our calcation of label-width; should now work automatically
2017-10-14 08:40:11 +02:00
vanhofen
d8355fe5e4 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Commit: 33857873dc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)
2017-10-14 07:15:30 +02:00
vanhofen
a11d152062 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 84484832c3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)
2017-10-14 07:10:33 +02:00
Thilo Graf
1861d5710c CComponentsFooter: rework uniformed arrangement
Some parts were incomplete treated with defined parameter
'label_width' and/or 'chain_width'.


Origin commit data
------------------
Commit: c7a2dd70fc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
2017-10-13 12:35:59 +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
Jacek Jendrzej
079772e63d Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: b7ceb705a0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)
2017-09-26 12:52:04 +02:00
vanhofen
937cddf6e5 detailsline: reduce two times the shadow width from the h_marks
Otherwise shadows will be painted lower then the height of the object
the detailsline is docked to.


Origin commit data
------------------
Commit: 95ab4ac708
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- detailsline: reduce two times the shadow width from the h_marks

Otherwise shadows will be painted lower then the height of the object
the detailsline is docked to.
2017-09-26 12:41:05 +02:00
Stefan Seyfried
89cd4ce8a4 add LUA_CFLAGS everywhere widget/menue.h is used
Origin commit data
------------------
Commit: 9e2a7d7f79
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)
2017-09-26 12:41:05 +02:00
vanhofen
0d9a80486a Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/rcinput.cpp
	src/gui/audioplayer.cpp
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: a58f2cc447
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:36:34 +02:00
Stefan Seyfried
13d333e3e1 add LUA_CFLAGS everywhere widget/menue.h is used
Origin commit data
------------------
Commit: 32e4947ec7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:50 +02:00
vanhofen
4681ed01cb Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 2a787fe28b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 08:45:42 +02:00
vanhofen
bb5a6f7083 detailsline: reduce two times the shadow width from the h_marks
Otherwise shadows will be painted lower then the height of the object
the detailsline is docked to.


Origin commit data
------------------
Commit: 0abccfac8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- detailsline: reduce two times the shadow width from the h_marks

Otherwise shadows will be painted lower then the height of the object
the detailsline is docked to.
2017-09-25 08:44:21 +02:00
vanhofen
9530aa8744 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 4506f3f466
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 08:43:54 +02:00
vanhofen
3a2e241870 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/bedit/bouqueteditor_channels.cpp


Origin commit data
------------------
Commit: 736c1969fc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-24 (Sun, 24 Sep 2017)
2017-09-24 22:37:37 +02:00
Thilo Graf
3001ba022f cc_detailsline.cpp: fix possible unintended reduced height of bottom marker
Decrement value removed.

Height of bottom marker was decreased on every new repaint if no new
height was assigned. Was to see in bouqueteditor while scrolling with bouqets or
channel select window.

comes in with e534457250


Origin commit data
------------------
Commit: dca7e10179
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-24 (Sun, 24 Sep 2017)
2017-09-24 22:27:46 +02:00
gixxpunk
dca551b0a0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: ef7cf04dd7
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-21 (Thu, 21 Sep 2017)
2017-09-21 19:54:02 +02:00
Jacek Jendrzej
56b7cb31a6 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 17afd5c87a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-21 (Thu, 21 Sep 2017)
2017-09-21 18:47:32 +02:00
Jacek Jendrzej
8337c2402b fix stack buffer underflow
Origin commit data
------------------
Commit: bdd23e0ece
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-21 (Thu, 21 Sep 2017)
2017-09-21 18:46:21 +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
vanhofen
1176d4169e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp
	src/gui/widget/menue.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: 8d4677a319
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-21 (Thu, 21 Sep 2017)
2017-09-21 10:32:33 +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
Thilo Graf
f57d1e80b7 CComponentsFrmClock: Using less chars for time string.
Current count of chars could be not enough in some cases.


Origin commit data
------------------
Commit: ecdc1acb9f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)
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
8d642a4d57 fix compiler warnings in several console outputs
Origin commit data
------------------
Commit: 4b2e03d348
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)

Origin message was:
------------------
- fix compiler warnings in several console outputs
2017-09-20 11:53:02 +02:00
vanhofen
b7af37cf1d Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 08231c17bf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-19 (Tue, 19 Sep 2017)
2017-09-19 21:31:46 +02:00
gixxpunk
2723dbdcba Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 1875ced1c5
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)
2017-09-19 18:37:22 +02:00
Jacek Jendrzej
79d9f7965e Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 756f464a3f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)
2017-09-19 12:40:58 +02:00
Jacek Jendrzej
462626f9eb fix start clock supplement to 0f9284bf91
Origin commit data
------------------
Commit: b1f820aa44
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)
2017-09-19 12:40:02 +02:00