Commit Graph

550 Commits

Author SHA1 Message Date
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
vanhofen
5bc6b7c1a1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c12bba6e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-13 (Thu, 13 Apr 2017)



------------------
This commit was generated by Migit
2017-04-13 10:02:31 +02:00
vanhofen
09237ad821 channelist: rename bool pig_on_win to minitv_is_active
Origin commit data
------------------
Branch: ni/coolstream
Commit: 42aca4a4c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-12 (Wed, 12 Apr 2017)

Origin message was:
------------------
- channelist: rename bool pig_on_win to minitv_is_active

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

------------------
This commit was generated by Migit
2017-04-12 10:04:04 +02:00
vanhofen
cd40e9c6a7 channellist: one more missing OFFSET define
Origin commit data
------------------
Branch: ni/coolstream
Commit: 31979a4f87
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-12 (Wed, 12 Apr 2017)

Origin message was:
------------------
- channellist: one more missing OFFSET define

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

------------------
This commit was generated by Migit
2017-04-12 10:04:03 +02:00
vanhofen
d1ebb01719 channelist: use OFFSET defines for bottom detailsbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: f4a0e8faf1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-12 (Wed, 12 Apr 2017)

Origin message was:
------------------
- channelist: use OFFSET defines for bottom detailsbox

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

------------------
This commit was generated by Migit
2017-04-12 09:31:21 +02:00
vanhofen
788e238750 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a14dfd8edd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-11 23:28:30 +02:00
vanhofen
f50172b2fb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fca2de73e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)



------------------
This commit was generated by Migit
2017-04-11 23:14:03 +02:00
vanhofen
c03b2777cd channellist: a bit more offset for item; fix progressbar's width
use OFFSET defines for logo in header and in right infozone


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e6746e2aa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)

Origin message was:
------------------
- channellist: a bit more offset for item; fix progressbar's width

use OFFSET defines for logo in header and in right infozone


------------------
This commit was generated by Migit
2017-04-11 23:12:41 +02:00
vanhofen
d291aa3c22 channellist: simplify MaxChanNr() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 763f16ccca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)

Origin message was:
------------------
- channellist: simplify MaxChanNr() function

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

------------------
This commit was generated by Migit
2017-04-11 23:12:41 +02:00
vanhofen
45f0ad7d7e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 55743aff0c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)



------------------
This commit was generated by Migit
2017-03-15 23:39:43 +01:00
vanhofen
7dcc90f09f 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
------------------
Branch: ni/coolstream
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)



------------------
This commit was generated by Migit
2017-03-13 12:45:30 +01:00
vanhofen
51c85e1c58 unify DetailsLine-names; move define to settings.h
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-03-13 12:40:04 +01:00
vanhofen
dff4ea2892 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/movieplayer.cpp


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



------------------
This commit was generated by Migit
2017-02-26 22:35:47 +01:00
vanhofen
4ec9941db6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5442173af0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-26 22:31:40 +01:00
vanhofen
abff232156 channelist: use OFFSET-defines for channels w/o EPG too
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1aa5e929db
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)

Origin message was:
------------------
- channelist: use OFFSET-defines for channels w/o EPG too

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

------------------
This commit was generated by Migit
2017-02-26 01:01:15 +01:00
vanhofen
afda007d95 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/Makefile.am
	src/gui/imageinfo_ni.cpp
	src/gui/movieplayer.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 22:17:17 +01:00
vanhofen
4ac4e963ad 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
------------------
Branch: ni/coolstream
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 21:54:48 +01:00
Michael Liebmann
54e97c7544 Merge branch 'master' into pu/fb-modules
Origin commit data
------------------
Branch: ni/coolstream
Commit: db8ea57da2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-09 (Thu, 09 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-09 22:58:09 +01:00
Thilo Graf
74765cea23 Revert "CChannelList: delete with red yes button"
This reverts commit d7a37f65d0.

User request: Is not desired


Origin commit data
------------------
Branch: ni/coolstream
Commit: a56bb97b50
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)



------------------
This commit was generated by Migit
2017-02-09 22:43:00 +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
vanhofen
54d7d92401 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.h


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



------------------
This commit was generated by Migit
2017-02-08 08:02:39 +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
2f63d963eb Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 81485b1cb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-02 13:13:56 +01:00
vanhofen
adaf63dd74 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e0084d8913
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-02 13:13:34 +01:00
vanhofen
659e55fd39 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac


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



------------------
This commit was generated by Migit
2017-02-02 13:10:10 +01:00
Thilo Graf
1a8a9fef62 Revert "CChannelList: ensure repaint of new header content"
This reverts commit 339167a507.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 296aa5b901
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)



------------------
This commit was generated by Migit
2017-02-02 11:18:27 +01:00
vanhofen
e72ba5d052 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
------------------
Branch: ni/coolstream
Commit: 0cfb59b4bd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-31 (Tue, 31 Jan 2017)



------------------
This commit was generated by Migit
2017-01-31 16:48:40 +01:00
Thilo Graf
339167a507 CChannelList: ensure repaint of new header content
Origin commit data
------------------
Branch: ni/coolstream
Commit: ea700ddf52
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-24 (Tue, 24 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-31 16:36:42 +01:00
Jacek Jendrzej
bc8d25553f some inits
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0056a53321
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-30 19:04:17 +01:00
vanhofen
f70f7df777 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 89beeb2c10
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-27 18:49:24 +01:00
vanhofen
37030339ad Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/screensaver.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 47d0b6efb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-25 (Wed, 25 Jan 2017)



------------------
This commit was generated by Migit
2017-01-25 21:02:22 +01:00
Thilo Graf
c99cf1aa5d CChannelList: ensure repaint of new header content
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2abd60e856
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-24 (Tue, 24 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-25 16:33:47 +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
vanhofen
74cd77abb1 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
------------------
Branch: ni/coolstream
Commit: cc07333926
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-30 (Fri, 30 Dec 2016)



------------------
This commit was generated by Migit
2016-12-30 08:25:42 +01:00
Jacek Jendrzej
c3adf029ac some dead assignment
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0ed24632b7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-29 (Thu, 29 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-29 18:41:25 +01:00
vanhofen
45d33bdf00 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d39dc75c6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-29 15:15:34 +01:00
vanhofen
107026cb75 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
------------------
Branch: ni/coolstream
Commit: 4f2d36fe3e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)



------------------
This commit was generated by Migit
2016-12-29 00:59:00 +01:00
vanhofen
ea250639ac themes: allow progressbar-settings in themes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 888bfb6687
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)

Origin message was:
------------------
- themes: allow progressbar-settings in themes

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

------------------
This commit was generated by Migit
2016-12-29 00:47:34 +01:00
FlatTV
902cc57d77 OSD Menu: Add progressbar color
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2570e06e7d
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-12-26 (Mon, 26 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-26 14:58:51 +01:00
vanhofen
36741264b0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/Makefile.am
	src/gui/user_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 79a2dc262b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)



------------------
This commit was generated by Migit
2016-12-15 11:49:05 +01:00
vanhofen
6d09df76e6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d5dee22b19
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-12 21:40:11 +01:00
Jacek Jendrzej
846c0c554e fix next epginfo and sat/freq info for webtv
Origin commit data
------------------
Branch: ni/coolstream
Commit: af9c914013
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-12 (Mon, 12 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-12 17:20:48 +01:00
vanhofen
2dae9f273a Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: fdb24232f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-12 10:29:42 +01:00
vanhofen
da2213e9b1 channellist: remove obsolete NI-code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 12607338f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- channellist: remove obsolete NI-code

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

------------------
This commit was generated by Migit
2016-12-12 09:21:04 +01:00
vanhofen
cd104f2c8c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e57a35f327
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-12 08:53:05 +01:00
vanhofen
df6fc8313f channellist: try to fix right status-icon alignment
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6b4ef6d3f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- channellist: try to fix right status-icon alignment

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

------------------
This commit was generated by Migit
2016-12-12 08:30:22 +01:00
vanhofen
6b0e887585 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



------------------
This commit was generated by Migit
2016-11-21 12:46:49 +01:00
vanhofen
a413bfb40d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)



------------------
This commit was generated by Migit
2016-11-19 21:11:54 +01:00
Thilo Graf
b39aae929f Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59ae2b52e9
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-17 21:53:06 +01:00
vanhofen
b0f13d51ce Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/sectionsdclient/Makefile.am
	lib/timerdclient/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 93fdd4aa79
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)



------------------
This commit was generated by Migit
2016-11-17 09:52:47 +01:00