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

..

.gitignore

…

cc_base.cpp

…

cc_base.h

…

cc_button_select.cpp

…

cc_button_select.h

…

cc_detailsline.cpp

detailsline: reduce two times the shadow width from the h_marks

2017-09-26 12:41:05 +02:00

cc_detailsline.h

detailsline: reduce two times the shadow width from the h_marks

2017-09-26 12:41:05 +02:00

cc_draw.cpp

remove "using namespace std" from header files

2017-10-02 13:43:57 +02:00

cc_draw.h

comments: fix copy paste errors

2017-08-28 12:16:45 +02:00

cc_extra.cpp

…

cc_extra.h

…

cc_frm_button.cpp

Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

2017-08-30 18:11:59 +02:00

cc_frm_button.h

comments: fix copy paste errors

2017-08-28 12:16:45 +02:00

cc_frm_chain.cpp

…

cc_frm_chain.h

…

cc_frm_clock.cpp

CComponentsFrmClock: fix wrong initialization of w_tmp

2017-08-28 12:16:45 +02:00

cc_frm_clock.h

CComponentsFrmClock: Using less chars for time string.

2017-09-20 21:29:53 +02:00

cc_frm_ext_text.cpp

…

cc_frm_ext_text.h

…

cc_frm_footer.cpp

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

2017-12-15 23:19:49 +01:00

cc_frm_footer.h

…

cc_frm_header.cpp

Merge branch 'master' into pu/mp

2017-08-29 11:26:54 +02:00

cc_frm_header.h

Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

2017-08-30 18:11:59 +02:00

cc_frm_icons.cpp

…

cc_frm_icons.h

…

cc_frm_scrollbar.cpp

add and use FRAME_WIDTH defines; ...

2017-09-20 21:29:53 +02:00

cc_frm_scrollbar.h

comments: fix copy paste errors

2017-08-28 12:16:45 +02:00

cc_frm_signalbars.cpp

…

cc_frm_signalbars.h

…

cc_frm_slider.cpp

rename SLIDER defines

2017-09-15 20:17:48 +02:00

cc_frm_slider.h

…

cc_frm_window.cpp

src/gui/components/cc_frm_window.cpp: fix too small left bottom corner

2017-11-19 21:12:42 +01:00

cc_frm_window.h

…

cc_frm.cpp

src/gui/components/cc_frm_window.cpp: fix too small left bottom corner

2017-11-19 21:12:42 +01:00

cc_frm.h

CComponentsForm: add functions to get used or free space of form dimensions

2017-08-08 14:25:12 +02:00

cc_item_infobox.cpp

CComponentsInfoBox: add possibility for scalable picons

2017-12-10 22:03:41 +01:00

cc_item_infobox.h

CComponentsInfoBox: add possibility for scalable picons

2017-12-10 22:03:41 +01:00

cc_item_picture.cpp

CComponentsPicture: remove benchmark lines

2017-08-28 12:16:45 +02:00

cc_item_picture.h

cc_item_picture.h: remove virtual declaration from setPicture()

2017-12-04 09:35:57 +01:00

cc_item_progressbar.cpp

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-10-02 23:21:37 +02:00

cc_item_progressbar.h

…

cc_item_shapes.cpp

cc_item_shapes.cpp/h: Add method to create draw boxes without explicit objects

2017-08-28 12:16:45 +02:00

cc_item_shapes.h

cc_item_shapes.cpp/h: Add method to create draw boxes without explicit objects

2017-08-28 12:16:45 +02:00

cc_item_text.cpp

…

cc_item_text.h

…

cc_item_tvpic.cpp

neutrino: unify modes handling; ...

2017-11-22 15:42:09 +01:00

cc_item_tvpic.h

…

cc_item.cpp

silence -Wparentheses-equality warning

2017-11-03 20:14:37 +01:00

cc_item.h

CComponentsItem: move real position methods from draw class into item class

2017-08-08 14:25:12 +02:00

cc_signals.h

…

cc_text_screen.h

…

cc_timer.cpp

CComponentsTimer: try to fix timing on non cst hardware

2017-11-23 16:37:48 +01:00

cc_timer.h

CComponentsTimer: try to fix timing on non cst hardware

2017-11-23 16:37:48 +01:00

cc_types.h

cc_types.h: add more shadow defines

2017-06-21 10:31:22 +02:00

cc.h

…

Doxyfile

…

Makefile.am

add LUA_CFLAGS everywhere widget/menue.h is used

2017-09-26 12:41:05 +02:00