Commit Graph

10488 Commits

Author SHA1 Message Date
Thilo Graf
c0cc7ef192 Merge branch 'master' into pu/fb-setmode 2017-05-21 18:09:22 +02:00
Thilo Graf
36c8f4c24f CComponentsButton: add missing init of col_body_old
Some changes on runtime were ignored on runtime.
2017-05-21 18:00:21 +02:00
Thilo Graf
9132e7de82 cc_item.h/cc_frm.h/cc_frm_button.h: use pre defined frame color as default 2017-05-21 18:00:21 +02:00
Thilo Graf
37387a3e69 CMsgBox: fix paint of footer buttons
Only paint of button container is required.
2017-05-21 18:00:21 +02:00
Thilo Graf
8c29b8e68f CHintBox: use less colors time scale mode for visual timeout
Otherwise probably in this context to much colored with default settings.
2017-05-21 18:00:21 +02:00
Jacek Jendrzej
ffe986f36b src/gui/lua/lua_cc_text.cpp avoid segfault 2017-05-17 22:15:15 +02:00
Thilo Graf
e48cc87b6f CHintBox: fix position in case of missing text
Without text, position was not complete calculated.
Only default position was used.
2017-05-17 20:11:28 +02:00
svenhoefer
bf852064bc - buttons: use OFFSET defines 2017-05-16 10:31:25 +02:00
Jacek Jendrzej
152c4e3fe4 Merge branch 'master' into pu/mp 2017-05-11 16:44:05 +02:00
Thilo Graf
aaa34d8887 Merge branch 'master' into pu/fb-setmode
# Conflicts:
#	src/gui/components/cc_frm_window.h
2017-05-11 12:18:38 +02:00
Thilo Graf
942a27e3ef cc_frm_header.cpp/h: remove CTextBox types for title allignment
Title object has only width of current text content. This causes CTextBox
types have not a really visible effect. Now we have only three align types for title
and these are related to cc-text object position.

Involved classes adjusted too.
2017-05-11 12:15:16 +02:00
Thilo Graf
100a1606f0 EpgPlus: use default parameter for titel arrangement 2017-05-11 11:28:06 +02:00
Thilo Graf
a26c1bc868 Merge branch 'master' into pu/fb-setmode 2017-05-11 08:43:29 +02:00
Thilo Graf
1b2f1d320d CComponentsHeader: fix brace error
suggest explicit braces to avoid ambiguous ‘else’
2017-05-11 08:39:20 +02:00
Jacek Jendrzej
fb23ac0126 Merge branch 'master' into pu/mp
except c08144a9d9 edb0a5937e
2017-05-10 15:37:31 +02:00
Jacek Jendrzej
843703b175 use lua_Integer 2017-05-10 15:35:44 +02:00
Thilo Graf
60fed9cc02 Merge branch 'master' into pu/fb-setmode 2017-05-10 10:45:28 +02:00
Thilo Graf
27eb80eb5b CLuaInstCCWindow: try to fix window title align parameter
Additional (lua_Integer)CTextBox::NO_AUTO_LINEBREAK) overwrites
passed parameter and has no effect, because NO_AUTO_LINEBREAK is
already default.
2017-05-10 10:42:08 +02:00
Thilo Graf
5b541571f9 CComponentsHeader: Try to adopt different logo/title alignments
Not all constellations are tested. Please report.
2017-05-10 10:42:08 +02:00
Thilo Graf
178bf6f596 CComponentsHeader: fix centering of header title 2017-05-10 10:42:08 +02:00
Thilo Graf
c320dbf8ec CComponentsHeader: remove double text color assignment 2017-05-10 10:42:08 +02:00
Thilo Graf
107db09299 CComponentsHeader: fix order of width calculation
Required for following position calculation
2017-05-10 10:42:08 +02:00
svenhoefer
c08144a9d9 - clearify comment 2017-05-09 13:31:59 +02:00
Thilo Graf
1f978f01ad CLuaInstCCWindow: fix passed shadow paramater 2017-05-09 12:09:20 +02:00
Thilo Graf
1d5bb7cd8e CBuildInfo: fix shadow parameter
Type is int not bool
2017-05-09 11:34:11 +02:00
svenhoefer
edb0a5937e - neutrino: fix hw_caps init; it must be initialized after zapit start 2017-05-08 23:44:45 +02:00
svenhoefer
edb4ce3e4f - eventlist: minor cosmetics;
rename getPrvNextChannelName() to getChannelNames()
2017-05-08 21:08:23 +02:00
Jacek Jendrzej
2df5e0f1e7 Merge branch 'master' into pu/mp 2017-05-08 19:44:20 +02:00
Jacek Jendrzej
d051691f89 supplement 2 to 5f9f82b8e6 2017-05-08 19:43:36 +02:00
Jacek Jendrzej
beb9d97004 Merge branch 'master' into pu/mp 2017-05-08 18:04:04 +02:00
Jacek Jendrzej
5dc4424d96 supplement to 5f9f82b8e6 2017-05-08 18:02:04 +02:00
Jacek Jendrzej
5f9f82b8e6 src/gui/eventlist.cpp show prev next channel name on start 2017-05-08 17:39:30 +02:00
Jacek Jendrzej
020f044c07 Merge branch 'master' into pu/mp 2017-05-08 12:57:22 +02:00
Thilo Graf
07c72026ed Merge branch 'master' into pu/fb-setmode 2017-05-08 12:25:42 +02:00
Thilo Graf
f1779d0a97 movieplayer.cpp: prevent build error
Avoid build error if build not configured with -D__STDC_LIMIT_MACROS
2017-05-08 12:18:52 +02:00
svenhoefer
7b9f8e9720 - epgplus: fix progressbar's type 2017-05-08 08:41:28 +02:00
Thilo Graf
e35acf2e2f Merge branch 'master' into pu/fb-setmode 2017-05-08 08:28:20 +02:00
Thilo Graf
9fd3b27d61 CChannelList: fix code indentation 2017-05-08 08:26:21 +02:00
Thilo Graf
970390a320 CNaviBar: prevent compiler warning -Wshadow 2017-05-08 08:26:17 +02:00
Thilo Graf
65b09044c5 movieplayer.cpp: remove possible compile issue
"__STDC_LIMIT_MACROS" redefined
2017-05-08 08:26:14 +02:00
Thilo Graf
9c4e0d1737 Merge branch 'master' into pu/fb-setmode 2017-05-07 18:36:16 +02:00
Thilo Graf
c8f6888d8f CChannelList: change scope of bool unlocked
Scope of the variable 'unlocked' can be reduced.
2017-05-07 18:33:25 +02:00
Thilo Graf
761bac8ca1 CChannelList: use enums for additional modes
Readability
2017-05-07 18:33:25 +02:00
Thilo Graf
5778d9295a SNeutrinoSettings: add missing enums for channellist additional modes 2017-05-07 18:33:25 +02:00
Jacek Jendrzej
c926f1ea91 Merge branch 'master' into pu/mp 2017-05-07 18:27:59 +02:00
Thilo Graf
66c109f8f9 CChannelList: ensure disconnect signal/slot on delete of channellist ojects 2017-05-07 18:26:51 +02:00
Thilo Graf
2b17db46ee Merge branch 'master' into pu/fb-setmode 2017-05-07 14:21:19 +02:00
Thilo Graf
cf7a21032c CChannelList: delete and reset minitv object inside unified scope 2017-05-07 14:18:47 +02:00
Thilo Graf
1359248f72 CChannelList: add connection to ResetModuls()
Ensures re init after font changes.
2017-05-07 14:18:47 +02:00
Thilo Graf
d7f839dcc9 CChannelList: remove init of cc_minitv from constructor.
Is not a member of CChannelList and already inititialized
as static outside of constructor.
2017-05-06 23:18:43 +02:00