mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-13 16:33:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,152 Commits 2 Branches 9 Tags
54e4fa620b13dd2468fb76d77cbe838561837c10
Commit Graph

493 Commits

Author SHA1 Message Date
gixxpunk
fd3e8771ea Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 3cb9902e7d
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-08-11 (Fri, 11 Aug 2017)
 2017-08-11 21:24:04 +02:00
GetAway
673305f913 infoviewer.cpp: handle timeout of mode upnp like mode ts 
Signed-off-by: Thilo Graf <dbt@novatux.de>

Infobar timeout in the upnp mode is fixed to 6 sec.
Because it's acting about streams, so we should use the same timeout
such as with playing a movie file.


Origin commit data
------------------
Commit: 0225b043db
Author: GetAway <get-away@t-online.de>
Date: 2017-08-11 (Fri, 11 Aug 2017)
 2017-08-11 20:14:49 +02:00
vanhofen
b4fecd0bdb Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: e78936e478
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)
 2017-05-30 01:27:37 +02:00
vanhofen
1400a38bfc infoviewer: use frameBuffer->getIconPath() to find clock_face icon 
Origin commit data
------------------
Commit: f2ad0eac60
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- infoviewer: use frameBuffer->getIconPath() to find clock_face icon
 2017-05-29 16:30:39 +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
2d7e594035 add missing //NI tags 
Origin commit data
------------------
Commit: 880020cb54
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)

Origin message was:
------------------
- add missing //NI tags
 2017-04-11 15:55:23 +02:00
vanhofen
9f3dad285f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 6673ffd4ea
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
 2017-03-03 10:38:14 +01:00
Michael Liebmann
3a8adb94f0 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 6c3b5dcd93
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-02 (Thu, 02 Mar 2017)
 2017-03-02 23:38:19 +01:00
vanhofen
e714a2ae52 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/update.cpp


Origin commit data
------------------
Commit: cd96638c45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
 2017-03-01 18:18:07 +01:00
TangoCash
900748ae27 fix blinking clock in some modes (thx dbo) 
Origin commit data
------------------
Commit: 16537620a6
Author: TangoCash <eric@loxat.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
 2017-03-01 18:16:09 +01:00
vanhofen
68e2832f96 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)
 2017-02-28 16:55:39 +01:00
vanhofen
f5d9d25957 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.h


Origin commit data
------------------
Commit: 7829247fe8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)
 2017-02-28 15:36:23 +01:00
Michael Liebmann
f74929b4ba CInfoViewer::showTitle: Add parameter forcePaintButtonBar 
Origin commit data
------------------
Commit: cc05d272f2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
 2017-02-28 15:04:09 +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
Michael Liebmann
0146fd687e CInfoViewer: Use flag Font::FULLBG for RenderString() 
dependent on g_settings.theme.infobar_gradient_*


Origin commit data
------------------
Commit: a7ef709e55
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-25 (Wed, 25 Jan 2017)
 2017-01-31 16:36:42 +01:00
Thilo Graf
38357598cf CInfoViewer: enable kill text items after killed title 
This causes repaint text on next view of infobar.


Origin commit data
------------------
Commit: 0de9490326
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-23 (Mon, 23 Jan 2017)
 2017-01-31 16:36:42 +01:00
Thilo Graf
2748077074 Experimental try to rework isPainted() 
Origin commit data
------------------
Commit: 26eb4d079b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-19 (Thu, 19 Jan 2017)
 2017-01-31 16:36:41 +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
Michael Liebmann
133aef7a21 CInfoViewer: Use flag Font::FULLBG for RenderString() 
dependent on g_settings.theme.infobar_gradient_*


Origin commit data
------------------
Commit: 2b24da376c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-25 (Wed, 25 Jan 2017)
 2017-01-25 16:33:47 +01:00
Thilo Graf
22d5fb13d8 CInfoViewer: enable kill text items after killed title 
This causes repaint text on next view of infobar.


Origin commit data
------------------
Commit: fb541268f5
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-23 (Mon, 23 Jan 2017)
 2017-01-25 16:33:46 +01:00
Thilo Graf
858fdd6320 Experimental try to rework isPainted() 
Origin commit data
------------------
Commit: 9d3a968506
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-19 (Thu, 19 Jan 2017)
 2017-01-25 16:33:46 +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
FlatTV
c9624a74ec OSD Menu: Add progressbar color 
Origin commit data
------------------
Commit: 2570e06e7d
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-12-26 (Mon, 26 Dec 2016)
 2016-12-26 14:58:51 +01:00
vanhofen
65e0a39980 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
------------------
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
 2016-11-21 12:46:49 +01:00
vanhofen
cc7ad7ce1a 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
------------------
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)
 2016-11-19 21:11:54 +01:00
Thilo Graf
3b78068800 CInfoViewer: add missing shadow for timescale 
enableShadow() needs enum option.


Origin commit data
------------------
Commit: c8ad32b1e4
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)
 2016-11-15 19:00:21 +01:00
vanhofen
2e8117384c Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: d4b9daf01e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
 2016-11-11 09:16:24 +01:00
Thilo Graf
d34322b568 Merge branch 'master' into pu/msgbox 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: 3efaac5725
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
 2016-11-10 10:27:22 +01:00
vanhofen
98e986dafc Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: f0d9adbe46
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)
 2016-11-08 22:07:57 +01:00
vanhofen
026ca785fc infoviewer: use small vertical offset around channellogo 
Origin commit data
------------------
Commit: 21b2fbd03c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- infoviewer: use small vertical offset around channellogo
 2016-11-08 22:02:57 +01:00
Thilo Graf
57786208c5 Merge branch 'master' into pu/msgbox 
Origin commit data
------------------
Commit: ab9bf2ffa6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)
 2016-11-02 21:05:36 +01:00
vanhofen
dbfd2214db Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: 1ddcc0c7ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)
 2016-11-02 09:50:10 +01:00
vanhofen
9d2aba7b00 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 6e3648ef31
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-31 (Mon, 31 Oct 2016)
 2016-10-31 23:23:36 +01:00
Jacek Jendrzej
4a56be854e fix possible segfault and negative height 
Origin commit data
------------------
Commit: b8849d53b5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-10-31 (Mon, 31 Oct 2016)
 2016-10-31 15:53:29 +01:00
vanhofen
ee5ff0408d Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/slovak.locale
	lib/libcoolstream/hardware_caps.cpp
	lib/libcoolstream/hardware_caps.h
	lib/libdvbsub/dvbsubtitle.cpp
	lib/timerdclient/timerdclient.cpp
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/framebuffer_ng.h
	src/driver/pictureviewer/Makefile.am
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgplus.cpp
	src/gui/epgview.cpp
	src/gui/plugins.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/gui/widget/listbox.cpp
	src/gui/widget/listhelpers.cpp
	src/neutrino.cpp
	src/system/helpers.cpp
	src/system/helpers.h
	src/system/settings.cpp
	src/system/settings.h
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 75cce3b113
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
 2016-10-25 13:08:01 +02:00
Thilo Graf
4300865679 Shadow: try to optimize shadow areas 
* cleanup inner part of box on round corners, frames considered
* adopt implementations in some gui classes
* some debug lines removed
* test menu adopted
* try to fix corner caluculation to avoid transparent holes


Origin commit data
------------------
Commit: a17d61de8c
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-30 (Tue, 30 Aug 2016)
 2016-10-24 10:31:25 +02:00
Stefan Seyfried
54189f271a Merge remote-tracking branch 'tuxbox/master' 
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-22 11:37:40 +02:00
vanhofen
7220c6b265 Merge branch 'ni/cst-next' into ni/mp/cst-next 
Conflicts:
	acinclude.m4
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/epgplus.cpp
	src/gui/plugins.cpp
	src/gui/widget/listbox.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
 2016-10-10 17:27:55 +02:00
vanhofen
248b6c8684 Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/components/cc_detailsline.h
	src/gui/components/cc_item_infobox.h
	src/gui/infoviewer.cpp
	src/gui/upnpbrowser.cpp
	src/gui/widget/keyboard_input.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
 2016-10-10 16:45:30 +02:00
vanhofen
892603fe68 rename customcolor.h -> color_custom.h; reduce unneeded inludes 
Origin commit data
------------------
Commit: 104d21e784
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename customcolor.h -> color_custom.h; reduce unneeded inludes
 2016-10-10 14:19:55 +02:00
vanhofen
f21851aec0 rename SHADOW_OFFSET -> OFFSET_SHADOW 
Origin commit data
------------------
Commit: 5d450c60d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename SHADOW_OFFSET -> OFFSET_SHADOW
 2016-10-10 14:19:55 +02:00
vanhofen
8419c90eb4 infoviewer: align progressbar/sigbox code to latest changes 
Origin commit data
------------------
Commit: d77858683b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- infoviewer: align progressbar/sigbox code to latest changes
 2016-10-10 14:19:55 +02:00
vanhofen
5d2893e837 Merge branch 'ni/cst-next' into ni/mp/cst-next 
Origin commit data
------------------
Commit: ad25cf2933
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)
 2016-09-29 08:11:23 +02:00
vanhofen
d38da117e5 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: 39e5880a70
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-28 (Wed, 28 Sep 2016)
 2016-09-28 21:14:17 +02:00
Thilo Graf
5a54632b1b CInfoViewer: allow fe change without new sigbox object 
Origin commit data
------------------
Commit: ad189f180d
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-28 (Wed, 28 Sep 2016)
 2016-09-28 21:12:32 +02:00
vanhofen
ce38ff3473 Revert "CInfoViewer: try to fix show current frontend before paint signallbars" 
This reverts commit 670aa9d4ab.


Origin commit data
------------------
Commit: 608247657c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-28 (Wed, 28 Sep 2016)
 2016-09-28 12:54:40 +02:00
vanhofen
2752ca2684 Merge branch 'ni/cst-next' into ni/mp/cst-next 
Origin commit data
------------------
Commit: 0cb151e760
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-24 (Sat, 24 Sep 2016)
 2016-09-24 01:06:20 +02:00