Commit Graph

344 Commits

Author SHA1 Message Date
Stefan Seyfried
8822421c6b Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)
2015-12-28 16:15:14 +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
8ccd3b0ae6 tmp revert: remove osd setup for gradients
Origin commit data
------------------
Commit: d77b7b2995
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-24 (Thu, 24 Dec 2015)
2015-12-27 14:42:28 +01:00
Thilo Graf
c6905d2f03 Colors: init global color gradient implementation
Origin commit data
------------------
Commit: 523b273af8
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-19 (Thu, 19 Nov 2015)
2015-12-27 14:42:27 +01:00
Stefan Seyfried
17880c4125 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
2015-12-13 17:41:55 +01:00
[CST] Focus
d00a6dbf84 gui/osd_setup.cpp, gui/miscsettings_menu.cpp: do not delete items added to menu - menu dtor do it
Origin commit data
------------------
Commit: 60c45ec06c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-19 (Fri, 19 Jun 2015)
2015-06-19 15:48:15 +03:00
vanhofen
f5213a4ec0 osd_setup: fix active status of ca_dotmatrix and ca_frame
Origin commit data
------------------
Commit: 8d84a4387d
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-06-18 (Thu, 18 Jun 2015)

Origin message was:
------------------
- osd_setup: fix active status of ca_dotmatrix and ca_frame
2015-06-18 21:18:32 +02:00
vanhofen
4ac078dcee infoviewer_bb: add own color for CA-bar
Origin commit data
------------------
Commit: fd6ad52c8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-06-17 (Wed, 17 Jun 2015)

Origin message was:
------------------
- infoviewer_bb: add own color for CA-bar
2015-06-18 21:18:32 +02:00
vanhofen
1f4d26123c infoviewer_bb: show/hide dotmatrix in CA-bar; default show
Origin commit data
------------------
Commit: 59e2143e00
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-06-17 (Wed, 17 Jun 2015)

Origin message was:
------------------
- infoviewer_bb: show/hide dotmatrix in CA-bar; default show
2015-06-18 21:18:32 +02:00
vanhofen
2dbe4bdc46 infoviewer_bb: add frame to CA-bar; default off
Origin commit data
------------------
Commit: 398dfeeab1
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-06-17 (Wed, 17 Jun 2015)

Origin message was:
------------------
- infoviewer_bb: add frame to CA-bar; default off
2015-06-18 21:18:32 +02:00
vanhofen
7882347718 start_wizard: use a global enum; switch detection from bool to int
Origin commit data
------------------
Commit: af90286a30
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-15 (Fri, 15 May 2015)

Origin message was:
------------------
- start_wizard: use a global enum; switch detection from bool to int
2015-05-15 03:46:50 +02:00
[CST] Focus
e6042e8c77 gui/osd_setup.cpp: add option to switch one/two color gradient mode
Origin commit data
------------------
Commit: 56070ca390
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-05-07 (Thu, 07 May 2015)
2015-05-07 16:40:29 +03:00
vanhofen
3689c8fef8 osd_setup: try to bring more structure in infoviewer setup
Origin commit data
------------------
Commit: ca5d85986e
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-04 (Mon, 04 May 2015)

Origin message was:
------------------
- osd_setup: try to bring more structure in infoviewer setup
2015-05-05 11:43:17 +02:00
vanhofen
cc9f8c6450 themes: move colored_events settings to themes setup
Origin commit data
------------------
Commit: cb5f052e83
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-04 (Mon, 04 May 2015)

Origin message was:
------------------
- themes: move colored_events settings to themes setup
2015-05-05 11:43:17 +02:00
vanhofen
939ed343f7 infoviewer: add color-to-color gradient feature; THX to TangoCash ...
... for basic inspiration and dbt for some optimizations


Origin commit data
------------------
Commit: 62daf1dc4c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-04 (Mon, 04 May 2015)

Origin message was:
------------------
- infoviewer: add color-to-color gradient feature; THX to TangoCash ...

... for basic inspiration and dbt for some optimizations
2015-05-04 09:41:41 +02:00
Thilo Graf
61656865d0 Merge branch 'cst-next.pre' into cst-next
Origin commit data
------------------
Commit: a58f1621b4
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-30 (Thu, 30 Apr 2015)
2015-04-30 09:20:43 +02:00
Thilo Graf
4ce9ca0882 COsdSetup: remove repaint call for gradient assignment
Is already executed by chooser object via slot inside showOsdSetup(), and
osd_menu object is not the required object.


Origin commit data
------------------
Commit: 7044df1f9f
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-29 (Wed, 29 Apr 2015)
2015-04-29 12:01:11 +02:00
Thilo Graf
6261b3b869 themes: use hintbox and header gradient option in theme settings
Color gradient feature was originally intended for use
inside theme settings and it's not really suitable for
generally use as default in all themes at the moment, so it makes more
sense to have options in theme settings and let the user decide
to customize this, unless enough other gui parts can use this feature.


Origin commit data
------------------
Commit: 01516cf943
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-29 (Wed, 29 Apr 2015)

Origin message was:
------------------
themes: use hintbox and header gradient option in theme settings

Color gradient feature was originally intended for use
inside theme settings and it's not really suitable for
generally use as default in all themes at the moment, so it makes more
sense to have options in theme settings and let the user decide
to customize this, unless enough other gui parts can use this feature.
2015-04-29 10:16:55 +02:00
vanhofen
92960161a9 remove w_max()-calls to define menu-width, because ...
w-max() returns a pixel-value, but menus need a percentage-value.


Origin commit data
------------------
Commit: 9041bff59c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-24 (Fri, 24 Apr 2015)

Origin message was:
------------------
- remove w_max()-calls to define menu-width, because ...

 w-max() returns a pixel-value, but menus need a percentage-value.
2015-04-24 09:11:04 +02:00
Stefan Seyfried
d9354e847f global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)
2015-04-16 13:39:35 +02:00
vanhofen
bc0984621f channellist: allow show/hide bottom infobox
Origin commit data
------------------
Commit: 7f35a67426
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-14 (Tue, 14 Apr 2015)

Origin message was:
------------------
- channellist: allow show/hide bottom infobox
2015-04-14 11:08:24 +02:00
Thilo Graf
0652b6ab05 COsdSetup: use paint for apply new gradient settings, reduced flicker effects
Origin commit data
------------------
Commit: eb3971e909
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-03-03 (Tue, 03 Mar 2015)
2015-03-29 22:40:14 +02:00
Stefan Seyfried
a968a12b8d Merge remote-tracking branch 'check/cst-next'
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)
2015-01-26 17:26:26 +01:00
vanhofen
65b51ac358 osd_setup: improve/clarify screensaver off option
Origin commit data
------------------
Commit: 026c8b4389
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-01-08 (Thu, 08 Jan 2015)

Origin message was:
------------------
- osd_setup: improve/clarify screensaver off option
2015-01-08 20:01:15 +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
a58875b8da screensaver: remove audioplayer_screensaver; add screensaver_delay
Origin commit data
------------------
Commit: df18f1f4e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-29 (Mon, 29 Dec 2014)

Origin message was:
------------------
- screensaver: remove audioplayer_screensaver; add screensaver_delay
2014-12-29 23:50:18 +01:00
vanhofen
42c011a1f3 screensaver: move configuration to own submenu
Origin commit data
------------------
Commit: 3206e35e20
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)

Origin message was:
------------------
- screensaver: move configuration to own submenu
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
ad395059db screensaver: add GUI option to change screensaver directory
Origin commit data
------------------
Commit: cbed13ecd0
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)

Origin message was:
------------------
- screensaver: add GUI option to change screensaver directory
2014-12-29 22:13:02 +01:00
Stefan Seyfried
d1e2143fd6 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)
2014-12-28 12:32:12 +01:00
Stefan Seyfried
ed24f8fa69 osd_setup: remove g_settings.progressbar_design leftovers
needs more checking throughout the code base...


Origin commit data
------------------
Commit: 49f3516f47
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
2014-12-25 18:32:21 +01:00
Stefan Seyfried
ec1a9fce17 Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
2014-12-25 18:03:08 +01:00
Michael Liebmann
a1c4c26202 CColorChooser: Preview color gradient for header color
Origin commit data
------------------
Commit: 8c3b26fc76
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-11-26 (Wed, 26 Nov 2014)
2014-11-26 09:42:44 +01:00
Michael Liebmann
772bc517be Switches color gradients on/off
Origin commit data
------------------
Commit: c7908c87f4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-09-20 (Sat, 20 Sep 2014)
2014-09-25 11:08:29 +04:00
martii
69f917f16d drop explicit CMenuForwarder icon assignments
Conflicts:
	src/gui/3dsetup.cpp
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/keybind_setup.cpp
	src/gui/mediaplayer.cpp
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/network_setup.cpp
	src/gui/nfs.cpp
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/parentallock_setup.cpp
	src/gui/personalize.cpp
	src/gui/proxyserver_setup.cpp
	src/gui/record_setup.cpp
	src/gui/scan_setup.cpp
	src/gui/screensetup.cpp
	src/gui/settings_manager.cpp
	src/gui/timerlist.cpp
	src/gui/update_menue.cpp
	src/gui/vfd_setup.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: e84782bc4c
Author: martii <m4rtii@gmx.de>
Date: 2014-02-22 (Sat, 22 Feb 2014)
2014-09-15 11:44:08 +04:00
martii
547d900fee system/settings: move theme colors to dedicated struct
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/epgview.cpp
	src/gui/osd_setup.cpp
	src/gui/pluginlist.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: b21cb152b5
Author: martii <m4rtii@gmx.de>
Date: 2014-01-06 (Mon, 06 Jan 2014)
2014-09-12 18:29:21 +04:00
martii
2c8f3910b2 add thread for determining free hdd (recording dir) space, enable hdd usage icons on vfd (untested)
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/simple_display.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/moviebrowser.cpp
	src/gui/record_setup.cpp
	src/neutrino.cpp
	src/system/ytcache.h


Origin commit data
------------------
Commit: 7c15db185f
Author: martii <m4rtii@gmx.de>
Date: 2013-11-27 (Wed, 27 Nov 2013)
2014-09-11 17:58:19 +04:00
martii
6593a7a8bd gui/channellist: make displaying channel numbers optional
Conflicts:
	data/locale/deutsch.locale
	src/gui/channellist.cpp
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: 94e6cf9a25
Author: martii <m4rtii@gmx.de>
Date: 2014-07-19 (Sat, 19 Jul 2014)
2014-07-23 11:57:05 +04:00
[CST] Focus
467f73764a src/gui/osd_progressbar_setup.cpp: move infoviewer progressbar position config to osd_setup.cpp
Origin commit data
------------------
Commit: 4b3be3c313
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-18 (Fri, 18 Jul 2014)
2014-07-18 12:28:30 +04:00
[CST] Focus
e7589e894a gui/osd_setup.cpp: re-use common channel list settings in context menu
Origin commit data
------------------
Commit: c8b33f6bda
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)
2014-07-17 17:02:47 +04:00
[CST] Focus
fa1be7a360 Revert "CChannelList/COsdSetup: use showOsdChanlistSetup() from OSD-Setup"
commit has problems: bad looking, if fade is ON, menu missed channel list fonts config

This reverts commit 5c9adb6180.


Origin commit data
------------------
Commit: 0cda142ba7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)
2014-07-17 17:02:43 +04:00
[CST] Focus
17c40a5d6e merge neutrino-mp progressbar code, (C) martii
Origin commit data
------------------
Commit: 416646bbff
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)
2014-07-17 17:02:37 +04:00
vanhofen
295885c56c osd_setup: don't show colored progress bar option in channellist ...
... when colored progress bar is disabled


Origin commit data
------------------
Commit: 8887767141
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-27 (Fri, 27 Jun 2014)

Origin message was:
------------------
- osd_setup: don't show colored progress bar option in channellist ...

... when colored progress bar is disabled
2014-06-27 18:26:13 +02:00
Thilo Graf
5c9adb6180 CChannelList/COsdSetup: use showOsdChanlistSetup() from OSD-Setup
This removes multiple code parts from COsdSetup without
loss of functionality.


Origin commit data
------------------
Commit: 253579909f
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-06-07 (Sat, 07 Jun 2014)
2014-06-23 18:43:47 +02:00
vanhofen
cb734e018f channellist: add colored progressbars
* thx to bazi98, martii and benny


Origin commit data
------------------
Commit: df1c8ac00d
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-23 (Mon, 23 Jun 2014)

Origin message was:
------------------
- channellist: add colored progressbars

* thx to bazi98, martii and benny
2014-06-23 17:05:44 +02:00
vanhofen
4f57f066d9 drop obsolete code around FONT_TYPE_GAMELIST
these fonts are not needed since gamelist/scriptlist
 are painted with menu-widget


Origin commit data
------------------
Commit: da7f3b9cb1
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-05-02 (Fri, 02 May 2014)

Origin message was:
------------------
- drop obsolete code around FONT_TYPE_GAMELIST

 these fonts are not needed since gamelist/scriptlist
 are painted with menu-widget
2014-05-02 22:28:36 +02:00
Stefan Seyfried
f853d06d3b Merge remote-tracking branch 'check/next-cc'
broken, needs buildfixing


Origin commit data
------------------
Commit: add688bbb8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)
2014-02-23 15:17:48 +01:00
[CST] Focus
97bed9727f gui/osd_setup.cpp: add 'other' font sizes group,
add subtitles font size setup


Origin commit data
------------------
Commit: 29617ba843
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-16 (Sun, 16 Feb 2014)
2014-02-21 20:01:13 +04:00
Stefan Seyfried
a112e8fb49 Merge remote-tracking branch 'check/next-cc'
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)
2014-01-23 14:08:37 +01:00