Commit Graph

10120 Commits

Author SHA1 Message Date
gixxpunk
c43e77c038 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ad61c7e183
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-12 (Fri, 12 May 2017)


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

------------------
This commit was generated by Migit
2017-05-12 08:42:16 +02:00
Thilo Graf
a8f3d88872 Merge branch 'master' into pu/fb-setmode
# Conflicts:
#	src/gui/components/cc_frm_window.h


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



------------------
This commit was generated by Migit
2017-05-11 12:18:38 +02:00
Thilo Graf
064b2cc588 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.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 942a27e3ef
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-11 (Thu, 11 May 2017)



------------------
This commit was generated by Migit
2017-05-11 12:15:16 +02:00
Thilo Graf
babdee806b EpgPlus: use default parameter for titel arrangement
Origin commit data
------------------
Branch: ni/coolstream
Commit: 100a1606f0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-11 (Thu, 11 May 2017)


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

------------------
This commit was generated by Migit
2017-05-11 11:28:06 +02:00
Thilo Graf
f6e2507451 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: a26c1bc868
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-11 (Thu, 11 May 2017)


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

------------------
This commit was generated by Migit
2017-05-11 08:43:29 +02:00
Thilo Graf
d831b0659a CComponentsHeader: fix brace error
suggest explicit braces to avoid ambiguous ‘else’


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b2f1d320d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-11 (Thu, 11 May 2017)



------------------
This commit was generated by Migit
2017-05-11 08:39:20 +02:00
Jacek Jendrzej
25645799c5 use lua_Integer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 843703b175
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-10 (Wed, 10 May 2017)


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

------------------
This commit was generated by Migit
2017-05-10 15:35:44 +02:00
Thilo Graf
d5bc5bd22c Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 60fed9cc02
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)


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

------------------
This commit was generated by Migit
2017-05-10 10:45:28 +02:00
Thilo Graf
1fe98a3e4d 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.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 27eb80eb5b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)



------------------
This commit was generated by Migit
2017-05-10 10:42:08 +02:00
Thilo Graf
22bff2865b CComponentsHeader: Try to adopt different logo/title alignments
Not all constellations are tested. Please report.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5b541571f9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)



------------------
This commit was generated by Migit
2017-05-10 10:42:08 +02:00
Thilo Graf
e0b4ef9cf3 CComponentsHeader: fix centering of header title
Origin commit data
------------------
Branch: ni/coolstream
Commit: 178bf6f596
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)


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

------------------
This commit was generated by Migit
2017-05-10 10:42:08 +02:00
Thilo Graf
2564b17c7a CComponentsHeader: remove double text color assignment
Origin commit data
------------------
Branch: ni/coolstream
Commit: c320dbf8ec
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)


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

------------------
This commit was generated by Migit
2017-05-10 10:42:08 +02:00
Thilo Graf
d50c8ef4f8 CComponentsHeader: fix order of width calculation
Required for following position calculation


Origin commit data
------------------
Branch: ni/coolstream
Commit: 107db09299
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)



------------------
This commit was generated by Migit
2017-05-10 10:42:08 +02:00
gixxpunk
bdf96065fb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c0d6c0930
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-09 (Tue, 09 May 2017)


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

------------------
This commit was generated by Migit
2017-05-09 18:36:27 +02:00
vanhofen
631df29056 locale: small changes in EPG Plus titles
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3b53914eba
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)

Origin message was:
------------------
- locale: small changes in EPG Plus titles

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

------------------
This commit was generated by Migit
2017-05-09 14:05:32 +02:00
vanhofen
c7a44bf07f clearify comment
Origin commit data
------------------
Branch: ni/coolstream
Commit: c08144a9d9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)

Origin message was:
------------------
- clearify comment

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

------------------
This commit was generated by Migit
2017-05-09 13:31:59 +02:00
vanhofen
355698c6f4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale


Origin commit data
------------------
Branch: ni/coolstream
Commit: 66e3c79ee1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)



------------------
This commit was generated by Migit
2017-05-09 13:19:56 +02:00
Thilo Graf
aab9c8df90 CLuaInstCCWindow: fix passed shadow paramater
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1f978f01ad
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-09 (Tue, 09 May 2017)


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

------------------
This commit was generated by Migit
2017-05-09 12:09:20 +02:00
vanhofen
ab7e287bdf locale: minor changes in EPG-Plus locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: 468fbcd79c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)

Origin message was:
------------------
- locale: minor changes in EPG-Plus locales

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

------------------
This commit was generated by Migit
2017-05-09 11:40:32 +02:00
Thilo Graf
7c341be809 CBuildInfo: fix shadow parameter
Type is int not bool


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1d5bb7cd8e
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-09 (Tue, 09 May 2017)



------------------
This commit was generated by Migit
2017-05-09 11:34:11 +02:00
vanhofen
805d3f56b5 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b213316d44
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 23:48:19 +02:00
vanhofen
6184ac5eea Revert "HD1 compat #1; master"
This reverts commit c67039135f.


Origin commit data
------------------
Branch: ni/coolstream
Commit: ebc3ce2e43
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)



------------------
This commit was generated by Migit
2017-05-08 23:47:51 +02:00
vanhofen
e5597de24d Revert "HD1 compat #2; pu/fb-setmode"
This reverts commit b2e11a0f61.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 48480e94d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)



------------------
This commit was generated by Migit
2017-05-08 23:47:39 +02:00
vanhofen
439655d0e1 Revert "Revert "- remove obsolete ifdef's""
This reverts commit 5dd9d3ccd5.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c3707b119
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)



------------------
This commit was generated by Migit
2017-05-08 23:47:26 +02:00
vanhofen
ff37c99f40 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 71b9627b6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)



------------------
This commit was generated by Migit
2017-05-08 23:46:54 +02:00
vanhofen
4ded8abb12 neutrino: fix hw_caps init; it must be initialized after zapit start
Origin commit data
------------------
Branch: ni/coolstream
Commit: edb0a5937e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)

Origin message was:
------------------
- neutrino: fix hw_caps init; it must be initialized after zapit start

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

------------------
This commit was generated by Migit
2017-05-08 23:44:45 +02:00
vanhofen
248fca8a7a eventlist: minor cosmetics;
rename getPrvNextChannelName() to getChannelNames()


Origin commit data
------------------
Branch: ni/coolstream
Commit: edb4ce3e4f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)

Origin message was:
------------------
- eventlist: minor cosmetics;

rename getPrvNextChannelName() to getChannelNames()


------------------
This commit was generated by Migit
2017-05-08 21:08:23 +02:00
vanhofen
49601b7909 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: bfe33826c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 20:51:21 +02:00
Jacek Jendrzej
f35bc8f430 supplement 2 to bdb2607b8e
Origin commit data
------------------
Branch: ni/coolstream
Commit: d051691f89
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-08 (Mon, 08 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 19:43:36 +02:00
Jacek Jendrzej
cdd0bec2c7 supplement to bdb2607b8e
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5dc4424d96
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-08 (Mon, 08 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 18:02:04 +02:00
vanhofen
413a019430 eventlist: add new button for epg-plus
Origin commit data
------------------
Branch: ni/coolstream
Commit: caf0c9a166
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)

Origin message was:
------------------
- eventlist: add new button for epg-plus

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

------------------
This commit was generated by Migit
2017-05-08 17:51:18 +02:00
vanhofen
58f78c306b icons: add new icons for epg-button
Origin commit data
------------------
Branch: ni/coolstream
Commit: b44a047e7e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)

Origin message was:
------------------
- icons: add new icons for epg-button

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

------------------
This commit was generated by Migit
2017-05-08 17:39:34 +02:00
Jacek Jendrzej
bdb2607b8e src/gui/eventlist.cpp show prev next channel name on start
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f9f82b8e6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-08 (Mon, 08 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 17:39:30 +02:00
vanhofen
5dd9d3ccd5 Revert "- remove obsolete ifdef's"
This reverts commit 29a00a81ae.


Origin commit data
------------------
Branch: ni/coolstream
Commit: a6814161a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)



------------------
This commit was generated by Migit
2017-05-08 16:45:10 +02:00
Michael Liebmann
b2e11a0f61 HD1 compat #2; pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 894233a9db
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-05-04 (Thu, 04 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 16:44:14 +02:00
Michael Liebmann
c67039135f HD1 compat #1; master
Origin commit data
------------------
Branch: ni/coolstream
Commit: db9d1599ea
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-05-04 (Thu, 04 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 16:39:16 +02:00
vanhofen
d766040099 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgplus.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 429d510ef1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)



------------------
This commit was generated by Migit
2017-05-08 16:23:25 +02:00
Thilo Graf
c0babc0484 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07c72026ed
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 12:25:42 +02:00
Thilo Graf
11b4748125 movieplayer.cpp: prevent build error
Avoid build error if build not configured with -D__STDC_LIMIT_MACROS


Origin commit data
------------------
Branch: ni/coolstream
Commit: f1779d0a97
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)



------------------
This commit was generated by Migit
2017-05-08 12:18:52 +02:00
vanhofen
24b744c79d epgplus: fix progressbar's type
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b9f8e9720
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)

Origin message was:
------------------
- epgplus: fix progressbar's type

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

------------------
This commit was generated by Migit
2017-05-08 08:41:28 +02:00
Thilo Graf
e9e7ea72b8 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: e35acf2e2f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 08:28:20 +02:00
Thilo Graf
0a2db29f3c CChannelList: fix code indentation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9fd3b27d61
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 08:26:21 +02:00
Thilo Graf
46bd5911ee CNaviBar: prevent compiler warning -Wshadow
Origin commit data
------------------
Branch: ni/coolstream
Commit: 970390a320
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)


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

------------------
This commit was generated by Migit
2017-05-08 08:26:17 +02:00
Thilo Graf
1148afc62b movieplayer.cpp: remove possible compile issue
"__STDC_LIMIT_MACROS" redefined


Origin commit data
------------------
Branch: ni/coolstream
Commit: 65b09044c5
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)



------------------
This commit was generated by Migit
2017-05-08 08:26:14 +02:00
vanhofen
fed7126cbc epgview: minor change in navibar's epg_date format
Origin commit data
------------------
Branch: ni/coolstream
Commit: dfd3cdb9a6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-07 (Sun, 07 May 2017)

Origin message was:
------------------
- epgview: minor change in navibar's epg_date format

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

------------------
This commit was generated by Migit
2017-05-07 21:48:16 +02:00
gixxpunk
aba5b0a3e3 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d0357b6850
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-07 (Sun, 07 May 2017)


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

------------------
This commit was generated by Migit
2017-05-07 19:09:04 +02:00
gixxpunk
d60bb70533 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4589862ad3
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-07 (Sun, 07 May 2017)


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

------------------
This commit was generated by Migit
2017-05-07 19:05:56 +02:00
Thilo Graf
e1afd2f686 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9c4e0d1737
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)


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

------------------
This commit was generated by Migit
2017-05-07 18:36:16 +02:00
Thilo Graf
1fd330008d CChannelList: change scope of bool unlocked
Scope of the variable 'unlocked' can be reduced.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c8f6888d8f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)



------------------
This commit was generated by Migit
2017-05-07 18:33:25 +02:00
Thilo Graf
7693bab58b CChannelList: use enums for additional modes
Readability


Origin commit data
------------------
Branch: ni/coolstream
Commit: 761bac8ca1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)



------------------
This commit was generated by Migit
2017-05-07 18:33:25 +02:00