Commit Graph

953 Commits

Author SHA1 Message Date
vanhofen
9c34743b16 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: c38b361655
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-21 (Tue, 21 Mar 2017)
2017-03-21 14:00:05 +01:00
Thilo Graf
c7fc3dcf34 CComponentsButton: simplify assignment of button message values
Count of alternate message values was limited to 1 value. Now it is
possible to add any count of message values.

directKey and directKeyAlt were removed from struct type 'button_label_cc'
and directKeys was added as container for possible message values.

Some methods of CComponentsFooter had to be adapted for that.


Origin commit data
------------------
Commit: 4eb6a315fc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)
2017-03-20 22:55:05 +01:00
vanhofen
3daf7a9792 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/components/cc_detailsline.cpp


Origin commit data
------------------
Commit: 653e6d3dd3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
2017-03-15 23:37:37 +01:00
Thilo Graf
409d5dc575 CComponentsExtTextForm: use scaled default dimension values
Origin commit data
------------------
Commit: e498cc6b09
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
2017-03-15 09:58:28 +01:00
Thilo Graf
451f560459 CComponentsExtTextForm: fix label width calculation
Origin commit data
------------------
Commit: 81cde4836f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
2017-03-15 09:58:10 +01:00
Thilo Graf
c591f1091c CComponentsDetailsLine: add scale to details line width
Also added correction for odd line width values and added
method to change details line width.


Origin commit data
------------------
Commit: f5f2bf92ba
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-14 (Tue, 14 Mar 2017)
2017-03-14 09:41:19 +01:00
Thilo Graf
d913d04880 cc_types.h: add scale to CC_WIDTH_MIN/CC_HEIGHT_MIN
Origin commit data
------------------
Commit: df48434092
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-14 (Tue, 14 Mar 2017)
2017-03-14 09:41:10 +01:00
Michael Liebmann
bbaad5b19d Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 2677543cc4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
2017-03-13 21:55:50 +01:00
vanhofen
30fd965086 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
2017-03-13 12:45:30 +01:00
vanhofen
9c009ade29 unify DetailsLine-names; move define to settings.h
Origin commit data
------------------
Commit: 5b0faeab8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)

Origin message was:
------------------
- unify DetailsLine-names; move define to settings.h
2017-03-13 12:40:04 +01:00
vanhofen
504194f201 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 9c808309b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
2017-03-13 11:40:24 +01:00
Michael Liebmann
e3076746d4 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: fa2fd94f77
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
2017-03-13 09:56:04 +01:00
Thilo Graf
6b0d4ed2c0 cc_types.h: expand button_label_cc with hint as descrpition for button
Origin commit data
------------------
Commit: 3fa097ebb9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
2017-03-13 09:45:38 +01:00
Thilo Graf
fbe5200b0c cc_types: move struct button_label_cc into cc_types.h
Origin commit data
------------------
Commit: e777ecdfdb
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
2017-03-13 09:45:38 +01:00
Thilo Graf
e23f4e1db5 CComponentsFooter: add bg_image to button_label_cc type
Origin commit data
------------------
Commit: e2ca965ee9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
2017-03-13 09:45:38 +01:00
vanhofen
d259a7fa79 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 6d784e8fb0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
2017-03-12 21:59:02 +01:00
Michael Liebmann
6e32a631bd Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 828329452e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-12 (Sun, 12 Mar 2017)
2017-03-12 06:37:10 +01:00
Thilo Graf
616904958c CComponentsFooter: simplify implementation of button labels
button_label_l and button_label_s are now
merged to button_label_cc with prepared default values for text and locales.This type contains all possible
button label properties. Values for locales and string
are evaluated in setButtonLabels(), so it's possible to remove some
overloaded methodes.


Origin commit data
------------------
Commit: c766a970dc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-11 (Sat, 11 Mar 2017)
2017-03-11 00:45:25 +01:00
Thilo Graf
002a3ab7d2 CCDraw: add possibility to use background images as item background
Provides functionality to use a backround image instead to render
usual box. If an image is defined, box render is disabled, but behavior
for hide, kill, cache... is not changed.

TODO:
- maybe needs global caching because images are not yet managed like icons in framebuffer class


Origin commit data
------------------
Commit: ccb82083e2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-11 (Sat, 11 Mar 2017)
2017-03-11 00:45:25 +01:00
vanhofen
71d742e126 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: b47a570fd2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
2017-03-03 10:34:35 +01:00
vanhofen
1bf92d5fdd fix funny typo
Origin commit data
------------------
Commit: 8862ef621b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- fix funny typo
2017-03-03 09:52:57 +01:00
Thilo Graf
8effbfe1cf CComponentsWindow: use negative values for discret percental dimensions
Also add possibility to use placeholder for better readability and
better compatibilty with previous implementations.
See doc in source files for more details


Origin commit data
------------------
Commit: cf9a953b59
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
2017-03-03 09:22:08 +01:00
vanhofen
f37a36da3c Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: db2a8c021b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)
2017-02-26 22:31:51 +01:00
Thilo Graf
a461b75eb0 CComponentsWindow: add more tags for doxygen
Origin commit data
------------------
Commit: 9b6893ee34
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-25 (Sat, 25 Feb 2017)
2017-02-26 21:29:53 +01:00
Thilo Graf
a0d00bb34d CComponentsWindow: use percentage conversion for dimension values
Dimension values for windows below a certain size are often not really
useful, even with regard to different resolutions.
Usage of percent values could be easier to handle.
In the constructor, the argument values für dimesions must be only
between 1 and 100 to achieve this.

TODO: behavior inside parents


Origin commit data
------------------
Commit: 055fef8b58
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-25 (Sat, 25 Feb 2017)
2017-02-26 21:29:53 +01:00
vanhofen
eff3409675 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 33525aeafd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-25 (Sat, 25 Feb 2017)
2017-02-25 00:15:45 +01:00
Thilo Graf
fe9a6338b1 CComponentsScrollBar: remove unnecessary debug output
Origin commit data
------------------
Commit: 803253e3d4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-25 00:01:29 +01:00
vanhofen
298fdbfe36 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/driver/fb_generic.h


Origin commit data
------------------
Commit: 3ff64707df
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
2017-02-15 21:52:59 +01:00
Stefan Seyfried
ee986e0e2f remove hardware specific code from gui
Use the framebuffer's getWidth4FB_HW_ACC() instead of system/helpers.
The use in cc_item_picture was guarded by a hardware #ifdef, use
needAlign4Blit() instead.

This needs testing on the affected hardware, which I do not have :-)


Origin commit data
------------------
Commit: c9e1072b94
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)
2017-02-14 20:01:55 +01:00
vanhofen
999b2cf2ce Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: af8c4b8d97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 23:01:15 +01:00
Stefan Seyfried
8107c333eb set useful thread names for all spawned threads
Origin commit data
------------------
Commit: 5188f721c4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 22:55:36 +01:00
Stefan Seyfried
10f50617ba CComponentsTimer: allow to set a thread name
Origin commit data
------------------
Commit: 6fdd920e42
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 22:51:01 +01:00
Stefan Seyfried
30fd1a003c cc: reduce impact of cc_draw header from 161 to 4 files
Origin commit data
------------------
Commit: 58c6dbf469
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 22:50:44 +01:00
vanhofen
5df8b0409e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/fonts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 21:54:48 +01:00
Michael Liebmann
3b018febe6 Merge branch 'master' into pu/fb-modules
Origin commit data
------------------
Commit: 0cb26e6e98
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 09:24:08 +01:00
Michael Liebmann
7e9107c8a8 neutrino: Rename hardware defined macros for coolstream stb
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


Origin commit data
------------------
Commit: 0d66899cbd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
neutrino: Rename hardware defined macros for coolstream stb

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2
2017-02-12 09:21:04 +01:00
vanhofen
53a4a8dd85 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 728959949b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-08 20:35:37 +01:00
Michael Liebmann
534d1b315e Merge branch 'master' into pu/fb-modules
Origin commit data
------------------
Commit: ef61905a2d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-08 20:16:41 +01:00
vanhofen
0707fef642 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.h


Origin commit data
------------------
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-08 08:02:39 +01:00
Stefan Seyfried
b68b8fc4fb reduce impact of zapit/frontend_c.h header
down from ~217 files to ~57...


Origin commit data
------------------
Commit: 98b2461da7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)
2017-02-07 18:38:45 +01:00
Stefan Seyfried
f8d62bdf40 reduce impact of driver/pictureviewer.h header file
before, more than 175 files depended on it, now it's about 35


Origin commit data
------------------
Commit: 47b1a8b642
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)
2017-02-07 18:38:45 +01:00
Stefan Seyfried
f6d5a96838 replace fontrenderer.h include with forward declaration
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough


Origin commit data
------------------
Commit: 2303d94300
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
8b4c30e093 replace framebuffer.h include with forward declaration
instead of including framebuffer.h almost everywhere, replace it with
class CFrameBuffer forward declarations and/or generic system includes.
Add a hack to define fb_pixel_t to config.h (one reason for
framebuffer.h includes was the fb_pixel_t define)


Origin commit data
------------------
Commit: e490f84ea8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Thilo Graf
680970ff29 CComponentsForm: move slots into base classes
Usable for all form classes


Origin commit data
------------------
Commit: 06fa3f2488
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)
2017-02-07 17:12:25 +01:00
Thilo Graf
1e3da560ed signals: reduce multiple includes for sigc++/bind.h
Origin commit data
------------------
Commit: e4d0abc7dc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)
2017-02-07 17:12:25 +01:00
vanhofen
26dae069c7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: e0084d8913
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)
2017-02-02 13:13:34 +01:00
Thilo Graf
b0295112ba Forms/header/clock: implement slot into OnBeforeRePaint
Origin commit data
------------------
Commit: 1c217b404f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)
2017-02-02 11:18:27 +01:00
Thilo Graf
9c4ad3ab76 CComponentsSignals: add signal OnBeforeRePaint
Origin commit data
------------------
Commit: be8588a4a5
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)
2017-02-02 11:18:27 +01:00
vanhofen
550611ef8c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	src/gui/screensaver.cpp
	src/gui/volumebar.cpp


Origin commit data
------------------
Commit: 0cfb59b4bd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-31 (Tue, 31 Jan 2017)
2017-01-31 16:48:40 +01:00
Thilo Graf
7647ad58fb CComponentsText: add signal OnBeforePaint into text paint() methode
Origin commit data
------------------
Commit: 53f956c0f9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)
2017-01-31 16:36:42 +01:00