Commit Graph

1345 Commits

Author SHA1 Message Date
Thilo Graf
c2f6fc5539 CComponentsFrmClock: disable digit height
Using of digit height is not really required here.
eg. better centering


Origin commit data
------------------
Commit: d0aa901d70
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-09 (Mon, 09 Jan 2017)
2017-01-09 20:47:46 +01:00
vanhofen
ce009e0aca Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: bf59c67547
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-08 (Sun, 08 Jan 2017)
2017-01-08 21:19:45 +01:00
Thilo Graf
0a8605fbd4 CComponentsFrmClock/CInfoClock: simplify font init
Origin commit data
------------------
Commit: ffeb2d6459
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-08 (Sun, 08 Jan 2017)
2017-01-08 14:39:38 +01:00
vanhofen
edb884e756 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: eee55893c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)
2017-01-05 23:07:16 +01:00
Thilo Graf
8d6fb1e022 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
------------------
Commit: a9b8b22339
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)
2017-01-05 22:53:31 +01:00
Thilo Graf
da941689f0 CComponentsFooter: fix default button font type
Deafult buttonfont is FONT_TYPE_BUTTON_TEXT not FONT_TYPE_MENU_FOOT


Origin commit data
------------------
Commit: 60a77d38b3
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-03 (Tue, 03 Jan 2017)
2017-01-05 22:19:18 +01:00
Thilo Graf
35166dadce CComponentsButton: try to fix fallback for font size
Some conditions were not catched.


Origin commit data
------------------
Commit: a5d2c2cb1d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-03 (Tue, 03 Jan 2017)
2017-01-05 22:19:18 +01:00
Thilo Graf
18b9d54586 CComponentsButton: fix height comparsion
comparsion with itself


Origin commit data
------------------
Commit: 4a03eb6980
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)
2017-01-05 22:19:18 +01:00
vanhofen
8c27915df5 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 2733e0f260
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-02 (Mon, 02 Jan 2017)
2017-01-02 23:55:23 +01:00
vanhofen
9eb559aa8f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: c2506804b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-30 (Fri, 30 Dec 2016)
2016-12-30 21:54:46 +01:00
Thilo Graf
a1356ceff6 CComponentsButton: try to fix font size in buttons
Some text in button chains had different font sizes. To see in some
Messageboxes.


Origin commit data
------------------
Commit: b335408913
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
2016-12-30 20:33:26 +01:00
Thilo Graf
476641a626 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
------------------
Commit: b98319cb91
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
2016-12-30 20:33:26 +01:00
Thilo Graf
7072471b76 CComponentsWindow: use FONT_TYPE_BUTTON_TEXT instead FONT_TYPE_MENU_FOOT
Buttton text is not the same like footer text.


Origin commit data
------------------
Commit: 6a3b07152f
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
2016-12-30 20:33:26 +01:00
Thilo Graf
ddb8e2f397 CComponentsTimer: try to fix possible uncanceled thread
Origin commit data
------------------
Commit: e9122fbc4b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
2016-12-30 20:33:26 +01:00
Thilo Graf
64e72db3a4 CComponentsHeader: declare l_font, s_font as global
Useful for init in header sub classes. So its possible to use
other prefined size mode fonts


Origin commit data
------------------
Commit: 4cdae3fdf6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-27 (Tue, 27 Dec 2016)
2016-12-30 20:33:26 +01:00
Thilo Graf
de7feba890 CComponentsButton: rename cc_btn_capt -> cc_btn_text
More plausible


Origin commit data
------------------
Commit: 2889fbd70d
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
2016-12-30 20:33:26 +01:00
vanhofen
62772c2c5d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/streaminfo2.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: cc07333926
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-30 (Fri, 30 Dec 2016)
2016-12-30 08:25:42 +01:00
Jacek Jendrzej
542feb926c some dead assignment
Origin commit data
------------------
Commit: c0564ec574
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-29 (Thu, 29 Dec 2016)
2016-12-29 18:51:06 +01:00
vanhofen
b554e7801c Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: d39dc75c6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
2016-12-29 15:15:34 +01:00
vanhofen
65cf83258c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/themes.cpp
	src/neutrino.cpp
	src/system/settings.h
	version_pseudo.h


Origin commit data
------------------
Commit: 4f2d36fe3e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
2016-12-29 00:59:00 +01:00
vanhofen
ff22643691 themes: allow progressbar-settings in themes
Origin commit data
------------------
Commit: 888bfb6687
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)

Origin message was:
------------------
- themes: allow progressbar-settings in themes
2016-12-29 00:47:34 +01:00
vanhofen
465c6ce561 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: c7fa4276e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-28 (Wed, 28 Dec 2016)
2016-12-28 20:24:39 +01:00
Thilo Graf
60ed437f3e CComponentsTimer: disconnecting slots before stop timer thread, show error
Disconnecting of slots before stop threads ensures disconnecting
also on thread errors and keeps timer slots clear.


Origin commit data
------------------
Commit: 3cd509aa2d
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-27 (Tue, 27 Dec 2016)
2016-12-27 18:18:00 +01:00
vanhofen
f62bddc57b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 116e4325c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-22 (Thu, 22 Dec 2016)
2016-12-22 10:34:59 +01:00
Thilo Graf
9b76cf01e6 partial revert: "CTextBox: expand parameters of member setTextBorderWidth()"
related commit: 43a759358d

Since this commit, TextBox received a lot of optimizations, so it is possible
we have no described side effects.


Origin commit data
------------------
Commit: fad2adffa2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-22 (Thu, 22 Dec 2016)
2016-12-22 09:49:40 +01:00
vanhofen
02880bee17 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: a0d262c596
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-20 (Tue, 20 Dec 2016)
2016-12-20 21:40:42 +01:00
vanhofen
66a2c95b0d cc_frm_scrollbar: use SCROLLBAR_WIDTH define
Origin commit data
------------------
Commit: 52ad1f76c2
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-20 (Tue, 20 Dec 2016)

Origin message was:
------------------
- cc_frm_scrollbar: use SCROLLBAR_WIDTH define
2016-12-20 10:26:59 +01:00
vanhofen
cf7fc39a1a Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 98ed3d9448
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)
2016-12-19 17:23:28 +01:00
Thilo Graf
11983a7220 CComponentsHeader: ensure to have correct font instances after changed font
On possible changed font settings, font objects can be invalid and
we have a crash. With this fix it's possible, that
CNeutrinoApp::setupFont() method clean up header font object itself.


Origin commit data
------------------
Commit: 8292ec84af
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)
2016-12-19 17:21:51 +01:00
Thilo Graf
d8f12fdf35 CCDraw: add overloaded version of paint Blink()
It's useful to have synchronized timer for more than one item.


Origin commit data
------------------
Commit: 8e99d3a7a2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)
2016-12-19 17:21:51 +01:00
Thilo Graf
3069495033 CComponentsHeader: ensure to have correct font instances after changed font
On possible changed font settings, font objects can be invalid and
we have a crash. With this fix it's possible, that
CNeutrinoApp::setupFont() method clean up header font object itself.


Origin commit data
------------------
Commit: 239496c207
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-18 (Sun, 18 Dec 2016)
2016-12-18 20:30:41 +01:00
Thilo Graf
c98374ff73 CCDraw: add overloaded version of paint Blink()
It's useful to have synchronized timer for more than one item.


Origin commit data
------------------
Commit: f7ad79c371
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-17 (Sat, 17 Dec 2016)
2016-12-17 22:39:15 +01:00
vanhofen
b05f7c1df1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 2e1aa8d0d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-16 (Fri, 16 Dec 2016)
2016-12-16 23:18:57 +01:00
vanhofen
a35975a3ee Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: a1ed6bb721
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-16 (Fri, 16 Dec 2016)
2016-12-16 22:38:01 +01:00
vanhofen
77d89d2f0a cc_frm_scrollbar: fix offsets; use OFFSET defines
Origin commit data
------------------
Commit: 38c621ad5e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-16 (Fri, 16 Dec 2016)

Origin message was:
------------------
- cc_frm_scrollbar: fix offsets; use OFFSET defines
2016-12-16 09:03:07 +01:00
vanhofen
e5a5a8b41e cc_frm_scrollbar: set default height to 0
Origin commit data
------------------
Commit: c3439ad09d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-16 (Fri, 16 Dec 2016)

Origin message was:
------------------
- cc_frm_scrollbar: set default height to 0
2016-12-16 09:03:07 +01:00
vanhofen
3665652646 cc_frm: avoid artificially offsets
Origin commit data
------------------
Commit: b46a35cdf4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-16 (Fri, 16 Dec 2016)

Origin message was:
------------------
- cc_frm: avoid artificially offsets
2016-12-16 09:03:07 +01:00
vanhofen
656436a5a4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: ac183e3927
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
2016-12-15 22:40:56 +01:00
Thilo Graf
c0e881773a CCDraw: reduce debug spam
Origin commit data
------------------
Commit: 689866c872
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
2016-12-15 22:02:21 +01:00
Thilo Graf
c6f16e5acf CComponentsScrollBar: fix pos and use current width to set height of arrows
This fix size and position and dimensions of arrows.


Origin commit data
------------------
Commit: 6dda28d612
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
2016-12-15 21:56:41 +01:00
Thilo Graf
c049ef1038 CComponentsScrollBar: use corner settings for scrollbar body
Origin commit data
------------------
Commit: 1d541834b1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
2016-12-15 16:53:32 +01:00
Thilo Graf
d8878ea74a CComponentsScrollBar: add easy to handle scrollbar methode
Origin commit data
------------------
Commit: 728b95ac1c
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
2016-12-15 16:53:25 +01:00
vanhofen
56d77c4901 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/Makefile.am
	src/gui/user_menue.cpp


Origin commit data
------------------
Commit: 79a2dc262b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
2016-12-15 11:49:05 +01:00
vanhofen
6fe01bafca Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: dbefbb33a0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
2016-12-15 11:41:28 +01:00
Thilo Graf
c36053860a CComponentsHeader: fix font and height handling
Font was not changeable. setCaptionFont() was without effect.


Origin commit data
------------------
Commit: ab8aa77687
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-14 (Wed, 14 Dec 2016)
2016-12-14 16:21:15 +01:00
vanhofen
10bf4e8837 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: fdb24232f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)
2016-12-12 10:29:42 +01:00
vanhofen
5a6c50e0bb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: a141bafe7f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-08 (Thu, 08 Dec 2016)
2016-12-08 17:57:11 +01:00
Thilo Graf
6a339c19e2 CCDraw: try to avoid rendering with bad dimensions
Origin commit data
------------------
Commit: bd5e82fdc4
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-08 (Thu, 08 Dec 2016)
2016-12-08 09:33:40 +01:00
vanhofen
cb68f4ff0c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 784a58e6d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)
2016-12-07 15:40:19 +01:00
vanhofen
8f55c83ce0 rename BUTTON_TOP to BUTTON_UP; it isn't a top-button
Origin commit data
------------------
Commit: 0dc0789de8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- rename BUTTON_TOP to BUTTON_UP; it isn't a top-button
2016-12-07 15:37:03 +01:00