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

45 Commits

Author SHA1 Message Date
vanhofen
59dd52f825 screensaver: move more repeatedly used code to screensaver's code 
Origin commit data
------------------
Commit: 7c1058382f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- screensaver: move more repeatedly used code to screensaver's code
 2017-11-25 09:58:55 +01:00
vanhofen
02dffb9d98 neutrino: move screensaver members to screensaver's code 
Origin commit data
------------------
Commit: 8a08024e9c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- neutrino: move screensaver members to screensaver's code
 2017-11-25 09:58:55 +01:00
vanhofen
2ee7a428d9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: eb76978295
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)
 2017-09-09 08:43:52 +02:00
Jacek Jendrzej
b03ab5cb9e remove double includes 
Origin commit data
------------------
Commit: 6576729fd1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-08 (Fri, 08 Sep 2017)
 2017-09-08 21:21:32 +02:00
vanhofen
d0744fcadf Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 9ff856310d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)
 2017-05-23 18:29:49 +02:00
Jacek Jendrzej
4fff365eaf src/gui/screensaver.cpp try to fix segfault on stop 
Origin commit data
------------------
Commit: fcc3a12e88
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-23 (Tue, 23 May 2017)
 2017-05-23 17:52:16 +02:00
vanhofen
53a4a8dd85 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 728959949b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
 2017-02-08 20:35:37 +01:00
Michael Liebmann
534d1b315e Merge branch 'master' into pu/fb-modules 
Origin commit data
------------------
Commit: ef61905a2d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)
 2017-02-08 20:16:41 +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
f8d62bdf40 reduce impact of driver/pictureviewer.h header file 
before, more than 175 files depended on it, now it's about 35


Origin commit data
------------------
Commit: 47b1a8b642
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)
 2017-02-07 18:38:45 +01:00
Thilo Graf
69af3b1d37 CScreenSaver: ensure full cleanup of infoclock after stopped screensaver 
This provokes re init of info clock.


Origin commit data
------------------
Commit: 622e7a4dd2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-07 (Tue, 07 Feb 2017)
 2017-02-07 17:12:25 +01:00
Michael Liebmann
d64cc8c88a screensaver: Use black background for the clock 
Origin commit data
------------------
Commit: c62f964dde
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-24 (Tue, 24 Jan 2017)
 2017-01-31 16:36:40 +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
a2f8b4d8f5 screensaver: Use black background for the clock 
Origin commit data
------------------
Commit: 88c38030ab
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-24 (Tue, 24 Jan 2017)
 2017-01-25 16:33:44 +01:00
vanhofen
bc32d98e4d screensaver: fix clock positions 
Origin commit data
------------------
Commit: 75d20b6ecb
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)

Origin message was:
------------------
- screensaver: fix clock positions
 2016-12-19 17:21:51 +01:00
vanhofen
08acfc0911 screensaver: fix clock positions 
Origin commit data
------------------
Commit: 7e077bb7ee
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-18 (Sun, 18 Dec 2016)

Origin message was:
------------------
- screensaver: fix clock positions
 2016-12-18 01:22:24 +01: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
4cf2b60722 NI \o/ 
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
 2016-05-19 22:59:54 +02:00
Thilo Graf
35ca18beee CScreenSaver: use common time format 
Origin commit data
------------------
Commit: 7091383170
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-05-07 (Sat, 07 May 2016)
 2016-05-08 16:46:31 +02:00
Thilo Graf
1336ae1e9c CScreenSaver: fix possible render of clock over screen size 
check position and size use only possible available screen size


Origin commit data
------------------
Commit: 387d96d2f5
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-21 (Thu, 21 Jan 2016)
 2016-01-21 11:00:29 +01:00
Michael Liebmann
facb512971 More replace __FILE__ with __file__ 
Origin commit data
------------------
Commit: c7b6026ac2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-17 (Sun, 17 Jan 2016)
 2016-01-17 06:14:49 +01:00
Michael Liebmann
eae040da39 CScreenSaver: Fix compile when pip is disabled 
Origin commit data
------------------
Commit: 8d58e43499
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)
 2016-01-16 14:44:12 +01:00
defans
195e0dcd31 screensaver: disable pip while screensaver 
Origin commit data
------------------
Commit: 87db52784f
Author: defans <defans@bluepeercrew.us>
Date: 2016-01-16 (Sat, 16 Jan 2016)

Origin message was:
------------------
- screensaver: disable pip while screensaver
 2016-01-16 12:29:22 +01:00
Thilo Graf
5a90cc0fa5 screensaver: rework timeosd handling 
Origin commit data
------------------
Commit: d7ac78c0c2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-07 (Thu, 07 Jan 2016)
 2016-01-10 22:02:00 +01:00
defans
5ea6166a84 screensaver: add optional colored property 
Origin commit data
------------------
Commit: 0f2c73aed3
Author: defans <defans@bluepeercrew.us>
Date: 2016-01-07 (Thu, 07 Jan 2016)
 2016-01-10 22:02:00 +01:00
Michael Liebmann
6d9ce040d1 Remove redundant pthread_cancel() call 
Origin commit data
------------------
Commit: 0e68d504c9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-03 (Sun, 03 Jan 2016)
 2016-01-03 12:59:44 +01:00
Thilo Graf
0bf2981502 Screensaver: add option to show current time instead images 
Origin commit data
------------------
Commit: 0b3576b4a7
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-27 (Sun, 27 Dec 2015)
 2015-12-27 22:26:23 +01:00
Thilo Graf
2781eba3d9 Screeansaver: add optional random images 
Origin commit data
------------------
Commit: ff667dfef3
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-27 (Sun, 27 Dec 2015)
 2015-12-27 19:46:14 +01:00
Thilo Graf
68d732057a CScreenSaver: add signal/slot handler OnBeforeStart(), try to fix infoclock 
In some constelations it is not required to enable infoclock after close
screensaver. So it is possible to cotrol this from other objects.


Origin commit data
------------------
Commit: 6c8bd66801
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-18 (Wed, 18 Nov 2015)
 2015-12-27 14:42:28 +01:00
vanhofen
3429bd79b2 fix and use ICONSDIR variable; move ICONSSDIR_VAR to global.h 
Origin commit data
------------------
Commit: 89a11de651
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-06 (Wed, 06 May 2015)

Origin message was:
------------------
- fix and use ICONSDIR variable; move ICONSSDIR_VAR to global.h
 2015-05-06 22:58:54 +02:00
vanhofen
6a4659bf77 framebuffer: revival of showFrame() function to allow ... 
... pictures like start.jpg, mp3.jpg etc. from /var/tuxbox/icons


Origin commit data
------------------
Commit: edc8527379
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-05 (Tue, 05 May 2015)

Origin message was:
------------------
- framebuffer: revival of showFrame() function to allow ...

... pictures like start.jpg, mp3.jpg etc. from /var/tuxbox/icons
 2015-05-05 12:01:04 +02:00
Thilo Graf
04e0ac3e99 CScreenSaver: fix wconversion warnings 
Origin commit data
------------------
Commit: 016fc14177
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-01-15 (Thu, 15 Jan 2015)
 2015-03-29 22:40:10 +02:00
Thilo Graf
c64cbaf405 CScreenSaver: use unified debug output 
Origin commit data
------------------
Commit: be78944eb8
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-01-15 (Thu, 15 Jan 2015)
 2015-03-29 22:40:09 +02:00
vanhofen
e510b2eb39 screensaver: fix restart of clock and mute; 
restart is now depending on previous status


Origin commit data
------------------
Commit: aea7e1f772
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-01-09 (Fri, 09 Jan 2015)

Origin message was:
------------------
- screensaver: fix restart of clock and mute;

 restart is now depending on previous status
 2015-01-09 15:04:39 +01:00
vanhofen
324a4315b1 screensaver: use strcasecmp instead of strcmp 
Origin commit data
------------------
Commit: f80f539387
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-01-08 (Thu, 08 Jan 2015)

Origin message was:
------------------
- screensaver: use strcasecmp instead of strcmp
 2015-01-08 19:59:50 +01:00
defans
7ef96cf0f9 CSreenSaver: add png files 
Origin commit data
------------------
Commit: b32757420a
Author: defans <defans@bluepeercrew.us>
Date: 2015-01-08 (Thu, 08 Jan 2015)
 2015-01-08 12:23:36 +01:00
vanhofen
0afd4ecde2 screensaver: disable clock while screesaver 
Origin commit data
------------------
Commit: 7c9a158f11
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-30 (Tue, 30 Dec 2014)

Origin message was:
------------------
- screensaver: disable clock while screesaver
 2014-12-30 00:53:31 +01:00
vanhofen
68bb115812 screensaver: allow no screensaver_timeout to show first pic only 
Thats usefull when you have just one plain black pic in your
 screensaver directory. So you'll get a blank screen w/o pic changes.


Origin commit data
------------------
Commit: b85aa43d87
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-29 (Mon, 29 Dec 2014)

Origin message was:
------------------
- screensaver: allow no screensaver_timeout to show first pic only

 Thats usefull when you have just one plain black pic in your
 screensaver directory. So you'll get a blank screen w/o pic changes.
 2014-12-29 23:50:18 +01:00
vanhofen
586eb7782d screensaver: moving "using namespace std;" to cpp ... 
... to avoid the inheritance of this


Origin commit data
------------------
Commit: 5f42845160
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)

Origin message was:
------------------
- screensaver: moving "using namespace std;" to cpp ...

 ... to avoid the inheritance of this
 2014-12-29 22:13:02 +01:00
vanhofen
3efac0bcf4 screensaver: add GUI option to change timeout 
Origin commit data
------------------
Commit: 153e7dba91
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-29 (Mon, 29 Dec 2014)

Origin message was:
------------------
- screensaver: add GUI option to change timeout
 2014-12-29 22:13:02 +01:00
vanhofen
d4ca3a30b2 screensaver: user pictureviewer instead of videoDecoder ... 
... to avoid interrupts while playing and keep pictures unscaled


Origin commit data
------------------
Commit: ecc98b7def
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-24 (Wed, 24 Dec 2014)

Origin message was:
------------------
- screensaver: user pictureviewer instead of videoDecoder ...

... to avoid interrupts while playing and keep pictures unscaled
 2014-12-29 22:13:02 +01:00
vanhofen
e9222dc27c screensaver: just add mp3-?.jpg when using DATADIR "/neutrino/icons" ... 
... to get the same behavior as usual


Origin commit data
------------------
Commit: 4cf5e8ffd1
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-24 (Wed, 24 Dec 2014)

Origin message was:
------------------
- screensaver: just add mp3-?.jpg when using DATADIR "/neutrino/icons" ...

... to get the same behavior as usual
 2014-12-29 22:13:02 +01:00
vanhofen
70fb417fd1 screensaver: remove trailing slash from screensaver_dir 
Origin commit data
------------------
Commit: 20e49a492a
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-24 (Wed, 24 Dec 2014)

Origin message was:
------------------
- screensaver: remove trailing slash from screensaver_dir
 2014-12-29 22:13:02 +01:00
defans
f01a84009e CScreenSaver: add class CScreenSaver 
Origin commit data
------------------
Commit: 6a23a1c36a
Author: defans <defans@bluepeercrew.us>
Date: 2014-12-29 (Mon, 29 Dec 2014)
 2014-12-29 22:13:02 +01:00