mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-12 16:03:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,212 Commits 2 Branches 9 Tags
4e15c2ddfe7c5f5dc5c65c0dca8fa93e9ecd5148
Commit Graph

569 Commits

Author SHA1 Message Date
vanhofen
4e15c2ddfe Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 665e499208
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-03 (Wed, 03 May 2017)
 2017-05-03 23:08:15 +02:00
vanhofen
fc65a7b6cf Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/channellist.cpp
	src/gui/epgview.cpp
	src/gui/epgview.h
	src/gui/eventlist.cpp


Origin commit data
------------------
Commit: 3210b958a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-03 (Wed, 03 May 2017)
 2017-05-03 22:57:24 +02:00
Thilo Graf
2eefbfab7a CChannelList: rework details line handling, fix hide() after setup 
Detailsline is handling hide() by itself.

After channellist setup, eg. switching additional infos and channellist
window has different size, artefacts were possible.


Origin commit data
------------------
Commit: 81001410f3
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-03 (Wed, 03 May 2017)
 2017-05-03 21:29:41 +02:00
vanhofen
9d28e19233 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 7096269f55
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-30 (Sun, 30 Apr 2017)
 2017-04-30 00:21:40 +02:00
Thilo Graf
c898ce7b87 CChannelList: Ensure new initialize of modules on palette changes while runtime. 
Origin commit data
------------------
Commit: 1e4967e114
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-29 (Sat, 29 Apr 2017)
 2017-04-29 22:46:50 +02:00
gixxpunk
78dcea03cc Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 80faa90fa1
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-04-29 (Sat, 29 Apr 2017)
 2017-04-29 16:06:51 +02:00
Jacek Jendrzej
a7595ce3c7 src/gui/channellist.cpp remove unused logo_off 
Origin commit data
------------------
Commit: 6cb58546d8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-27 (Thu, 27 Apr 2017)
 2017-04-27 14:26:27 +02:00
vanhofen
d4196e101f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 7bccd83b07
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)
 2017-04-27 14:02:32 +02:00
vanhofen
55016eb70e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 022b98cb73
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)
 2017-04-27 13:54:59 +02:00
Thilo Graf
1a35e5c955 CChannelList: don't assign logo if disabled 
Origin commit data
------------------
Commit: 85f4992ca8
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)
 2017-04-27 11:26:36 +02:00
vanhofen
ce5078e378 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a34a8992d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)
 2017-04-24 12:56:51 +02:00
vanhofen
ce494cbd38 scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ... 
... outside of CComponentsScrollBar(). Since the color-changes in
9c8c262 the non-CC scrollbars looks weird.


Origin commit data
------------------
Commit: fe5f84c1d0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)

Origin message was:
------------------
- scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ...

... outside of CComponentsScrollBar(). Since the color-changes in
9c8c262 the non-CC scrollbars looks weird.
 2017-04-24 12:29:52 +02:00
vanhofen
7d84d9d1d6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: d7044490de
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-23 (Sun, 23 Apr 2017)
 2017-04-23 20:29:55 +02:00
Thilo Graf
a9acc7f975 CChannelList: remove unused logo object 
Not required since
100032e7d4: add possibility to show channellogo


Origin commit data
------------------
Commit: fbe8889fa9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-23 (Sun, 23 Apr 2017)
 2017-04-23 17:15:17 +02:00
Thilo Graf
92d733f523 CChannelList/CUpnpBrowserGui: add missing reinit for corner modes 
Required eg. if corner settings has been changed by user on runtime.


Origin commit data
------------------
Commit: 0943c467e2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-23 (Sun, 23 Apr 2017)
 2017-04-23 17:01:05 +02:00
vanhofen
fb06261771 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 246b45e32d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-22 (Sat, 22 Apr 2017)
 2017-04-22 16:15:37 +02:00
vanhofen
aeaab563e2 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a7c35a3373
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-22 (Sat, 22 Apr 2017)
 2017-04-22 10:35:44 +02:00
Thilo Graf
3aa91ac91f CComponentsHeader/CChannelList: unify methode names 
Origin commit data
------------------
Commit: 9ef6c49a23
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-21 (Fri, 21 Apr 2017)
 2017-04-21 23:07:14 +02:00
Thilo Graf
100032e7d4 CComponentsHeader: add possibility to show channellogo 
Contains methode setChannelLogo() with parameters
for channel id, channel name and optional
alignment (primary between title and clock). Default
alignment is centered.
Optional parameter to set logo height is available too.

Hope it works on first try. To see how it works, take look
at channellist class.


Origin commit data
------------------
Commit: 68835056c3
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-21 (Fri, 21 Apr 2017)
 2017-04-21 22:47:23 +02:00
vanhofen
31724507a8 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 292d7a2d5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)
 2017-04-19 23:24:19 +02:00
vanhofen
6bfa07de7d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Commit: 7c12bba6e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-13 (Thu, 13 Apr 2017)
 2017-04-13 10:02:31 +02:00
vanhofen
23a69c90bc channelist: rename bool pig_on_win to minitv_is_active 
Origin commit data
------------------
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
 2017-04-12 10:04:04 +02:00
vanhofen
763cf5335b channellist: one more missing OFFSET define 
Origin commit data
------------------
Commit: 31979a4f87
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-12 (Wed, 12 Apr 2017)

Origin message was:
------------------
- channellist: one more missing OFFSET define
 2017-04-12 10:04:03 +02:00
vanhofen
1100259455 channelist: use OFFSET defines for bottom detailsbox 
Origin commit data
------------------
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
 2017-04-12 09:31:21 +02:00
vanhofen
810758370c Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: a14dfd8edd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)
 2017-04-11 23:28:30 +02:00
vanhofen
42b382b820 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Commit: fca2de73e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)
 2017-04-11 23:14:03 +02:00
vanhofen
5b73bc8358 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
------------------
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
 2017-04-11 23:12:41 +02:00
vanhofen
72837ad504 channellist: simplify MaxChanNr() function 
Origin commit data
------------------
Commit: 763f16ccca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)

Origin message was:
------------------
- channellist: simplify MaxChanNr() function
 2017-04-11 23:12:41 +02:00
vanhofen
aa7d4ff017 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: 55743aff0c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 23:39:43 +01:00
vanhofen
30fd965086 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
------------------
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 12:45:30 +01:00
vanhofen
9c009ade29 unify DetailsLine-names; move define to settings.h 
Origin commit data
------------------
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
 2017-03-13 12:40:04 +01:00
vanhofen
6556882cb1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Commit: c188cf3683
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)
 2017-02-26 22:35:47 +01:00
vanhofen
24900dcdf9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 5442173af0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)
 2017-02-26 22:31:40 +01:00
vanhofen
4a8ef2e828 channelist: use OFFSET-defines for channels w/o EPG too 
Origin commit data
------------------
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
 2017-02-26 01:01:15 +01:00
vanhofen
ba302de46b 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
------------------
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 22:17:17 +01:00
vanhofen
5df8b0409e 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
------------------
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 21:54:48 +01:00
Michael Liebmann
c1dd0ff7de Merge branch 'master' into pu/fb-modules 
Origin commit data
------------------
Commit: db8ea57da2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-09 (Thu, 09 Feb 2017)
 2017-02-09 22:58:09 +01:00
Thilo Graf
cef125aa09 Revert "CChannelList: delete with red yes button" 
This reverts commit b7baafa2e5.

User request: Is not desired


Origin commit data
------------------
Commit: a56bb97b50
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
 2017-02-09 22:43:00 +01:00
vanhofen
c4de218cb2 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
------------------
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
 2017-02-09 13:19:03 +01:00
vanhofen
0707fef642 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/epgview.h


Origin commit data
------------------
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
 2017-02-08 08:02:39 +01:00
Stefan Seyfried
f6d5a96838 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
------------------
Commit: 2303d94300
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
 2017-02-07 17:23:42 +01:00
vanhofen
6e6b57ff3a Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 81485b1cb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)
 2017-02-02 13:13:56 +01:00
vanhofen
26dae069c7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: e0084d8913
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)
 2017-02-02 13:13:34 +01:00
vanhofen
59d037e5ea Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac


Origin commit data
------------------
Commit: 43ef78ee44
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)
 2017-02-02 13:10:10 +01:00
Thilo Graf
dd7a7c7c01 Revert "CChannelList: ensure repaint of new header content" 
This reverts commit ab6b3dfb19.


Origin commit data
------------------
Commit: 296aa5b901
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)
 2017-02-02 11:18:27 +01:00
vanhofen
550611ef8c 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
------------------
Commit: 0cfb59b4bd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-31 (Tue, 31 Jan 2017)
 2017-01-31 16:48:40 +01:00
Thilo Graf
ab6b3dfb19 CChannelList: ensure repaint of new header content 
Origin commit data
------------------
Commit: ea700ddf52
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-24 (Tue, 24 Jan 2017)
 2017-01-31 16:36:42 +01:00
Jacek Jendrzej
794fb2d032 some inits 
Origin commit data
------------------
Commit: 0056a53321
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
 2017-01-30 19:04:17 +01:00
vanhofen
0d4a2a3461 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 89beeb2c10
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)
 2017-01-27 18:49:24 +01:00
vanhofen
7fa810e183 Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/screensaver.cpp


Origin commit data
------------------
Commit: 47d0b6efb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-25 (Wed, 25 Jan 2017)
 2017-01-25 21:02:22 +01:00