Commit Graph

86 Commits

Author SHA1 Message Date
vanhofen
d8dce72383 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f8b855b07
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-30 (Fri, 30 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-30 14:41:42 +02:00
vanhofen
6655f0c124 cc_frm_footer: avoid division by 0
Origin commit data
------------------
Branch: ni/coolstream
Commit: f7a95bd3ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-30 (Fri, 30 Jun 2017)

Origin message was:
------------------
- cc_frm_footer: avoid division by 0

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-30 10:41:24 +02:00
vanhofen
6252c82a18 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 37f6b7a963
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-28 22:51:27 +02:00
vanhofen
817425d877 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/audioplayer.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3f812037a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)



------------------
This commit was generated by Migit
2017-06-28 22:49:34 +02:00
Thilo Graf
6c95840345 CComponentsFooter: remove FIXME tag
fixed since 1b2eea185f
Obsolete wrong types caused this.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 47f7426aa7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)



------------------
This commit was generated by Migit
2017-06-28 20:36:51 +02:00
vanhofen
72745a089b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98edb55233
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-26 22:51:58 +02:00
vanhofen
2dbe13f48b cc_frm_footer: re-add auto-calc label_width by default
Origin commit data
------------------
Branch: ni/coolstream
Commit: bd5602c050
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)

Origin message was:
------------------
- cc_frm_footer: re-add auto-calc label_width by default

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-26 22:43:36 +02:00
vanhofen
1796c6e055 Revert "- cc_frm_footer: auto-calc label_width by default"
This reverts commit d3643623ec.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5cbdf990fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)



------------------
This commit was generated by Migit
2017-06-26 15:32:32 +02:00
vanhofen
1f5b252c74 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e5cf06ec8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-19 23:08:41 +02:00
vanhofen
d3643623ec cc_frm_footer: auto-calc label_width by default
Origin commit data
------------------
Branch: ni/coolstream
Commit: b4fffee31b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)

Origin message was:
------------------
- cc_frm_footer: auto-calc label_width by default

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-19 21:36:10 +02:00
vanhofen
faa10f0ed6 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c68ae57571
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 11:07:32 +02:00
Thilo Graf
f9d5aa4ee6 CCButtonSelect: rename chain to btn_container
more plausible name


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4146a461c1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 01:01:54 +02:00
Thilo Graf
7e3920a42e CCButtonSelect: outsource button select handling into own class
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4d753d7437
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-15 01:01:54 +02:00
vanhofen
6850970ff1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 292d7a2d5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-04-19 23:24:19 +02:00
Thilo Graf
aca54b0401 CComponentsFooter: avoid crash because possible divisions by 0
Origin commit data
------------------
Branch: ni/coolstream
Commit: fb0dc47e35
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-13 (Thu, 13 Apr 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-04-13 23:36:29 +02:00
vanhofen
ebd68daa5e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 30d4d6e7f0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-04-08 14:33:53 +02:00
Thilo Graf
aff38bfe4b CComponentsFooter: add missing member inits
Origin commit data
------------------
Branch: ni/coolstream
Commit: 47fceca188
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-07 (Fri, 07 Apr 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-04-08 08:16:05 +02:00
vanhofen
515913eecd Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 107a8a1b5f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-21 (Tue, 21 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-03-21 14:50:23 +01:00
Thilo Graf
037ad21618 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
------------------
Branch: ni/coolstream
Commit: 4eb6a315fc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)



------------------
This commit was generated by Migit
2017-03-20 22:55:05 +01:00
vanhofen
ca99393430 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit
2017-03-12 22:03:03 +01:00
Thilo Graf
5368732f2f 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
------------------
Branch: ni/coolstream
Commit: c766a970dc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-11 (Sat, 11 Mar 2017)



------------------
This commit was generated by Migit
2017-03-11 00:45:25 +01:00
vanhofen
c80102a917 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/framebuffer.h
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/system/httptool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)



------------------
This commit was generated by Migit
2017-02-09 13:19:03 +01:00
Stefan Seyfried
86f609bc17 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
------------------
Branch: ni/coolstream
Commit: 2303d94300
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)



------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00
vanhofen
6df0618eec Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e4c63f289
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-13 (Fri, 13 Jan 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-01-13 13:27:49 +01:00
Thilo Graf
361f6eea01 CComponentsFooter: optimize button position and size
Buttons are now smaller so it should be enough, to center only, if not
please report.


Origin commit data
------------------
Branch: ni/coolstream
Commit: a9b8b22339
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)



------------------
This commit was generated by Migit
2017-01-05 22:53:31 +01:00
vanhofen
f2b271a823 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2733e0f260
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-02 (Mon, 02 Jan 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-01-02 23:55:23 +01:00
Thilo Graf
624aaed1a8 CComponentsHeader/CComponentsFooter: prevent crash on changed font settings
Default fonts for header and footer must be handled too.
After font settings changes these objects could be invalid.
Default fonts have invalid pointers after font changes too. Extra reset is required.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b98319cb91
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)



------------------
This commit was generated by Migit
2016-12-30 20:33:26 +01:00
Stefan Seyfried
f2ccf30ef6 CCFooter::setButtonLabels: fix format-string warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: f6c183931f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-12-04 18:03:32 +01:00
Stefan Seyfried
776aea7c95 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-12-04 18:02:51 +01:00
Thilo Graf
2dfeba10f0 CComponentsFooter: fix wrong text color with single button in footers
* remove size compare

If only one button exists, possible new text color would be ignored
and wrong Text color was visible with one item.
This behavior was observed in message boxes with
single buttons (eg OK, or Cancel).


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8bf6b7fb3a
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-29 (Tue, 29 Nov 2016)



------------------
This commit was generated by Migit
2016-11-29 16:13:47 +01:00
Thilo Graf
192655ed15 CComponentsFooter: disable gradient for footers
This is not really completly implemented for footer at the momemnt, because
button objects are still not prepared or tuned for that.

If it is enabled, currently it could occur unintentionally background behavior
eg.: flickereffects or background display errors in button objects.

NOTE: anyway users can enable gradient in theme files and could override this setting.
Now here it is globally disabled for footers. If it works right,
it will be enabled in future.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 427b65813d
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-27 (Sun, 27 Nov 2016)

Origin message was:
------------------
CComponentsFooter: disable gradient for footers

This is not really completly implemented for footer at the momemnt, because
button objects are still not prepared or tuned for that.

If it is enabled, currently it could occur unintentionally background behavior
eg.: flickereffects or background display errors in button objects.

NOTE: anyway users can enable gradient in theme files and could override this setting.
Now here it is globally disabled for footers. If it works right,
it will be enabled in future.


------------------
This commit was generated by Migit
2016-11-28 21:44:05 +01:00
Thilo Graf
9c47a80d3d CComponentsFooter: add parameter for frame width for selected buttons
Frame width was hard coded.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 696989dcf1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)



------------------
This commit was generated by Migit
2016-11-20 01:33:57 +01:00
Thilo Graf
0c616beb8f CComponentsFooter: optimize select buttons, try to assign better contrast
Now it's possible to set parameters for frames and text.
Parameters are prdefined for better contrasts in select or default mode.

TODO: background modes have no effects at the moment. Here are other things need to be done.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 55ac581523
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:28 +02:00
Thilo Graf
d578a49349 CComponentsFooter: reduce button height inside footer
TODO: more optimization seems required


Origin commit data
------------------
Branch: ni/coolstream
Commit: 542de648f5
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-17 (Mon, 17 Oct 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:27 +02:00
Thilo Graf
59bb7a7324 CComponentsFooter: use different select color for button, if count = 1
TODO: 	should be configurable. Not all theme color combinations
	have matched contrasts.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b3e7e49592
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-07 (Fri, 07 Oct 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:26 +02:00
Thilo Graf
1a8672ac5b CComponentsFooter: remove debug spam
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebf2e65b38
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-05 (Wed, 05 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-24 10:31:26 +02:00
Thilo Graf
5c4a2ac819 cc_frm_button.cpp/cc_frm_footer.cpp: fix passed parameter
were not passed through


Origin commit data
------------------
Branch: ni/coolstream
Commit: e2a1e7dc5b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-30 (Fri, 30 Sep 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:25 +02:00
Thilo Graf
5db54fc647 Try to rework footer
* try to fix enableButtonShadow(), seems an init is missing
* shadow fixed


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e631fd0ce
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-24 (Sat, 24 Sep 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:25 +02:00
Thilo Graf
09ffbdc2a9 CComponentsFooter: add member enableButtonShadow()
Possibility to pass button properties into button objects


Origin commit data
------------------
Branch: ni/coolstream
Commit: 363cf101d1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-21 (Sun, 21 Aug 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:25 +02:00
Thilo Graf
59a4435bfb CComponentsFooter: reduced button height for better optical view into footer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 779c51bd00
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-21 (Sun, 21 Aug 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-24 10:31:25 +02:00
Thilo Graf
cb82b046cb CMsgBox: add option to enable/disable button background
replaces var name btn_contour for better plausibility


Origin commit data
------------------
Branch: ni/coolstream
Commit: be740c1552
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-18 (Thu, 18 Aug 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:24 +02:00
Thilo Graf
36d8d81fa6 CMsgBox: rework msgbox classes with Window class implementation
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details


Origin commit data
------------------
Branch: ni/coolstream
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:24 +02:00
Stefan Seyfried
3f75ef5f47 Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-22 11:37:40 +02:00
vanhofen
bb756163b1 rename customcolor.h -> color_custom.h; reduce unneeded inludes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 104d21e784
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename customcolor.h -> color_custom.h; reduce unneeded inludes

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
5987637998 colors: add COL_FRAME wrapper
Origin commit data
------------------
Branch: ni/coolstream
Commit: 75fe6e407d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_FRAME wrapper

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
Thilo Graf
bc56408083 CComponentsFooter: remove defined font from footer
cch_font has nothing to do with button font and is already
inherited and defined from header class and can be redefined with
setCaptionFont() methode if required.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3af698701b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-24 (Sat, 24 Sep 2016)



------------------
This commit was generated by Migit
2016-09-24 01:08:08 +02:00
Thilo Graf
84d2bac43e CComponentsFooter: rename var for btn icon
is more plausible


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2de3a167e5
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-13 (Tue, 13 Sep 2016)



------------------
This commit was generated by Migit
2016-09-13 09:04:53 +02:00
Thilo Graf
c7fb4c5343 CComponentsFooter: don't use default parameters for privat member
Passed init values are better to see here.
This should fix wrong footer color too. See UPNP-Browser, color was not
applied here.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b9a8d1a78
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-23 (Tue, 23 Aug 2016)



------------------
This commit was generated by Migit
2016-08-23 16:00:48 +02:00
Thilo Graf
a593f3eec3 CComponentsFooter: use background color of footer inside chain object
Ensure pass of bg color from parent into chain object and button objects.
Required by embedded button objects. This prevents "holes" on screen.


Origin commit data
------------------
Branch: ni/coolstream
Commit: a92757697f
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-20 (Sat, 20 Aug 2016)



------------------
This commit was generated by Migit
2016-08-22 21:15:28 +02:00
vanhofen
a8cec5244c fonts: add and use own font for all footers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 54f2ac510f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- fonts: add and use own font for all footers

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-08-15 19:02:42 +02:00