mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-14 08:53:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,811 Commits 2 Branches 9 Tags
284426853d58528b832a73804c19352a07755ee1
Commit Graph

310 Commits

Author SHA1 Message Date
Stefan Seyfried
fce4dbbe72 Merge branch 'check/next-cc' 
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
 2013-06-16 21:22:14 +02:00
Michael Liebmann
56c1d0a7d5 CVolumeBar: Reactivate position 'higher center' for volume bar 
Origin commit data
------------------
Commit: c70167b58f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-06 (Thu, 06 Jun 2013)
 2013-06-06 12:00:06 +02:00
Stefan Seyfried
b6e65d0300 Merge remote-tracking branch 'check/next-cc' 
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)
 2013-05-24 20:24:39 +02:00
vanhofen
4f521760ef locals: use more matching descriptions for screen positions 
Origin commit data
------------------
Commit: c80b1b0640
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-11 (Sat, 11 May 2013)

Origin message was:
------------------
- locals: use more matching descriptions for screen positions
 2013-05-11 12:57:36 +02:00
Michael Liebmann
d42c40beac COsdSetup::changeNotify: Add handling for volume digits / CVolumeHelper 
Origin commit data
------------------
Commit: d90ce27876
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-11 (Sat, 11 May 2013)

Origin message was:
------------------
* COsdSetup::changeNotify: Add handling for volume digits / CVolumeHelper
 2013-05-11 09:38:23 +01:00
vanhofen
474888da37 osd-setup: fix segmentation fault 
Origin commit data
------------------
Commit: 1376a94197
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-10 (Fri, 10 May 2013)

Origin message was:
------------------
- osd-setup: fix segmentation fault
 2013-05-10 22:48:37 +02:00
vanhofen
3e5bf1083e osd-setup: move menu-related stuff to a submenu 'menus' 
* re-sort remaining items


Origin commit data
------------------
Commit: 655ae5d51f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-10 (Fri, 10 May 2013)

Origin message was:
------------------
- osd-setup: move menu-related stuff to a submenu 'menus'

* re-sort remaining items
 2013-05-10 21:36:34 +02:00
Stefan Seyfried
f6c0718366 Merge remote-tracking branch 'check/next-cc' 
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
 2013-05-10 10:06:47 +02:00
Michael Liebmann
ff9e2196dd OSD Setup: Move volume settings in a separate submenu. 
Origin commit data
------------------
Commit: 3d33901e5e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-09 (Thu, 09 May 2013)

Origin message was:
------------------
* OSD Setup: Move volume settings in a separate submenu.
 2013-05-09 16:58:52 +01:00
Thilo Graf
51e81122b5 CVolumeBar: rework volumebar handling 
Use CComponenets and separates the gui part from driver part

- add new class CVolumeBar as CComponentsForm
- Various changes for reworked volume bar handling in some classes
- Move AudioMute() from CVolume to new class CAudioMute
- Use CComponentsPicture to paint muteicon


Origin commit data
------------------
Commit: 8baec6d62a
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-05-04 (Sat, 04 May 2013)
 2013-05-08 05:11:24 +01:00
[CST] Focus
1bd0bd8a7b Merge branch 'pu/cc' into next-cc 
Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/eitd/SIlanguage.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan.h
	src/gui/test_menu.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h
	src/neutrino.cpp
	src/nhttpd/yconfig.h


Origin commit data
------------------
Commit: 8bb70d1ab3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-17 (Wed, 17 Apr 2013)
 2013-04-17 13:32:12 +04:00
Stefan Seyfried
2acc70f0d4 auto-enumerate FONT_TYPE_COUNT instead of defining it 
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Commit: 5954735ed8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-15 (Mon, 15 Apr 2013)
 2013-04-17 10:21:33 +04:00
Stefan Seyfried
276520fa75 auto-enumerate FONT_TYPE_COUNT instead of defining it 
Origin commit data
------------------
Commit: 1f1aa08562
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-15 (Mon, 15 Apr 2013)
 2013-04-15 21:37:43 +02:00
Stefan Seyfried
efa57b24ce auto-enumerate FONT_TYPE_COUNT instead of defining it 
Origin commit data
------------------
Commit: ee3580214f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-13 (Sat, 13 Apr 2013)
 2013-04-13 17:27:21 +02:00
Stefan Seyfried
51bbad3ab1 Merge branch 'check/pu-cc' into master 
Conflicts:
	src/gui/osd_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 61bf95f552
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-13 (Sat, 13 Apr 2013)
 2013-04-13 17:17:30 +02:00
vanhofen
e3905bf5c7 eventlist: make additional infos switchable 
* new menu 'eventlist' in osd-setup
* fix offset in infozone
* fontsize for infozone adjustable


Origin commit data
------------------
Commit: 473d6f38ba
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-13 (Sat, 13 Apr 2013)

Origin message was:
------------------
- eventlist: make additional infos switchable

* new menu 'eventlist' in osd-setup
* fix offset in infozone
* fontsize for infozone adjustable
 2013-04-13 11:13:23 +02:00
Stefan Seyfried
c64dc2ffa5 osd_setup: bring progressbar locales closer to mainline 
Origin commit data
------------------
Commit: 899fcaf8ca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
 2013-04-06 15:20:46 +02:00
Stefan Seyfried
bb76cc5a40 fix build / progressbar setup after pu/cc merge 
* CProgressBar::PB_MONO is no longer available
* PB color setup is split over two configuration variables
Fix this while still keeping seamless update compatibility.


Origin commit data
------------------
Commit: 6a955ecef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
 2013-04-06 14:41:06 +02:00
vanhofen
204d3ca7bb osd_progressbar_setup: rework locales; marginal changes in code 
Conflicts:
	data/locale/deutsch.locale


Origin commit data
------------------
Commit: c20d1ef6eb
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-26 (Tue, 26 Mar 2013)

Origin message was:
------------------
- osd_progressbar_setup: rework locales; marginal changes in code

Conflicts:
	data/locale/deutsch.locale
 2013-04-01 16:14:29 +04:00
Thilo Graf
5a4019cbe1 CProgressbarSetup: using unified 'osd' namespace 
Origin commit data
------------------
Commit: cca6d898c8
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-19 (Tue, 19 Mar 2013)
 2013-04-01 15:06:41 +04:00
[CST] Focus
e5c67247b9 gui/osd_setup.cpp: fix show tuner icon option 
Origin commit data
------------------
Commit: fc0571490e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-26 (Tue, 26 Mar 2013)
 2013-03-26 19:53:09 +04:00
vanhofen
f02bd7f5a7 osd_progressbar_setup: rework locales; marginal changes in code 
Origin commit data
------------------
Commit: 33c8526673
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-26 (Tue, 26 Mar 2013)

Origin message was:
------------------
- osd_progressbar_setup: rework locales; marginal changes in code
 2013-03-26 00:48:04 +01:00
Thilo Graf
24ccdd875a CProgressbarSetup: using unified 'osd' namespace 
Origin commit data
------------------
Commit: 7e1ef5d325
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-19 (Tue, 19 Mar 2013)
 2013-03-19 08:12:43 +01:00
Jacek Jendrzej
3b680a36ca progressbar-menu-tomworld 
Origin commit data
------------------
Commit: 369289d179
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-11 (Mon, 11 Mar 2013)
 2013-03-12 17:27:52 +04:00
Jacek Jendrzej
1bc23bfc31 progressbar-menu-tomworld 
Origin commit data
------------------
Commit: be2966035f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-11 (Mon, 11 Mar 2013)
 2013-03-11 14:40:36 +01:00
Stefan Seyfried
8d71c14242 neutrino: add more progressbar design options 
new progressbar design
* colored horizontal lines
* colored vertical lines
* colored solid bar


Origin commit data
------------------
Commit: 385d4ff6a9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-09 (Sat, 09 Mar 2013)
 2013-03-09 13:23:14 +01:00
Stefan Seyfried
0a6e405603 Merge branch 'check/next' into master 
Conflicts:
	data/locale/english.locale
	src/neutrino.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: 8048673dec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-07 (Thu, 07 Mar 2013)
 2013-03-07 17:10:11 +01:00
vanhofen
8d7e89e414 osd_setup.cpp: move dest-dir for screenshots to top of menu 
Origin commit data
------------------
Commit: d4370304cd
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-26 (Tue, 26 Feb 2013)

Origin message was:
------------------
- osd_setup.cpp: move dest-dir for screenshots to top of menu
 2013-02-26 13:10:17 +01:00
Stefan Seyfried
2b4f5306dc Merge branch 'check/dvbsi++' commit 984435d48e 
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 0cf191822a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-21 (Thu, 21 Feb 2013)
 2013-02-21 17:07:18 +01:00
Jacek Jendrzej
d17c767183 add progressbar hint loc 
Origin commit data
------------------
Commit: 6fb981b447
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)
 2013-02-12 19:26:46 +01:00
Jacek Jendrzej
00dfd32794 add progressbar opt to infobar 
Origin commit data
------------------
Commit: 63c66c1f4e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)
 2013-02-12 18:03:50 +01:00
tomworld
51fda1d48f channellist.cpp: Use extra font for event list 
Origin commit data
------------------
Commit: 105c6b4c70
Author: tomworld <atzeworld@msn.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
* channellist.cpp: Use extra font for event list
 2013-02-12 15:45:27 +01:00
vanhofen
13584ec686 osd_setup.cpp: fix color-hotkey for channellist-submenu and add a seperator line 
Origin commit data
------------------
Commit: e07e95bfb2
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- osd_setup.cpp: fix color-hotkey for channellist-submenu and add a seperator line
 2013-02-05 00:44:13 +01:00
vanhofen
7ecdaf4a01 osd_setup.cpp: add 'channellist.additional' to channellist's submenu 
very ugly: same code two times


Origin commit data
------------------
Commit: ce0025c7cd
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-04 (Mon, 04 Feb 2013)

Origin message was:
------------------
- osd_setup.cpp: add 'channellist.additional' to channellist's submenu

very ugly: same code two times
 2013-02-04 23:43:16 +01:00
vanhofen
9da986e456 channellist: make miniTV switchable 
Origin commit data
------------------
Commit: d8bd46e9d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-04 (Mon, 04 Feb 2013)

Origin message was:
------------------
- channellist: make miniTV switchable
 2013-02-04 22:25:15 +01:00
TangoCash
eedc2330d9 add optional mini-tv to channellist 
Signed-off-by: satbaby <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 1a425308ed
Author: TangoCash <eric@loxat.de>
Date: 2013-01-30 (Wed, 30 Jan 2013)
 2013-01-30 19:17:52 +01:00
Stefan Seyfried
f2e855b7ef neutrino: enable screenshots 
Origin commit data
------------------
Commit: a5ed005ff8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-13 (Sun, 13 Jan 2013)
 2013-01-13 18:49:37 +01:00
Stefan Seyfried
4ea8f88ad8 Merge branch 'uncool/dvbsi++' commit '626f1aabc0a' 
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 7e23ac7223
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
 2012-11-03 10:45:33 +01:00
[CST] Focus
0b95ac9dba gui/osd_setup.cpp: remove unneeded colorSetupNotifier->changeNotify 
Origin commit data
------------------
Commit: bc6a239002
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-02 (Fri, 02 Nov 2012)
 2012-11-02 12:56:44 +04:00
[CST] Focus
280d4a4979 gui/osd_setup.cpp: set hints for channel list context menu -> settings, 
testing menu/hints over gui with save-screen.
TODO: still small glitch at menu bottom, when switching hints on/off
with help button, sometimes.


Origin commit data
------------------
Commit: 483e9563e5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-20 (Sat, 20 Oct 2012)
 2012-10-20 11:13:22 +04:00
Stefan Seyfried
345a8a274d Merge branch 'uncool/dvbsi++' commit '890b4f2c0a3' 
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)
 2012-10-14 12:51:07 +02:00
Michael Liebmann
72d855d2eb osd_setup.cpp: Fix segfault in mode single tuner/display tuner icon 
Origin commit data
------------------
Commit: 7a414b7c56
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
 2012-10-02 11:08:48 +01:00
Thilo Graf
de4d59a548 COsdSetup: show correct option in infobar tuner icon setup item 
It could be confused for single stb users to see the option
'ON', although it is not possible.
So it's better to show only a possible or real option at item, if stb is in single mode or
item is disabled,
but the real value of g_settings.infobar_show_tuner is not touched.


Origin commit data
------------------
Commit: ca748c6f48
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-18 (Tue, 18 Sep 2012)

Origin message was:
------------------
*COsdSetup: show correct option in infobar tuner icon setup item

It could be confused for single stb users to see the option
'ON', although it is not possible.
So it's better to show only a possible or real option at item, if stb is in single mode or
item is disabled,
but the real value of g_settings.infobar_show_tuner is not touched.
 2012-09-18 12:10:18 +02:00
Thilo Graf
c076790003 CInfoViewer: don't show tuner icon with single boxes 
Origin commit data
------------------
Commit: 807dce9497
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-30 (Thu, 30 Aug 2012)

Origin message was:
------------------
*CInfoViewer: don't show tuner icon with single boxes
 2012-09-18 12:10:17 +02:00
Stefan Seyfried
d51722434a osd_setup: fix build by disabling unfinished menu_hints 
Origin commit data
------------------
Commit: d3497c9ad1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-09-15 (Sat, 15 Sep 2012)
 2012-09-15 12:11:26 +02:00
Thilo Graf
4ffd702166 COsdSetup: change order of includes 
- typo fix in member name
 showOsdScreenshottSetup->showOsdScreenShotSetup


Origin commit data
------------------
Commit: 260af3fb65
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-07-29 (Sun, 29 Jul 2012)

Origin message was:
------------------
*COsdSetup: change order of includes

- typo fix in member name
 showOsdScreenshottSetup->showOsdScreenShotSetup
 2012-08-21 09:48:22 +01:00
Michael Liebmann
57dcb7d27a Numeric display volumebar can be switched off. 
- Adjustable via Menu -> Settings -> OSD -> Volumebar digits


Origin commit data
------------------
Commit: ccd8e39182
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-04-27 (Fri, 27 Apr 2012)

Origin message was:
------------------
* Numeric display volumebar can be switched off.

- Adjustable via Menu -> Settings -> OSD -> Volumebar digits
 2012-07-23 09:07:10 +01:00
Stefan Seyfried
f8a42bcc53 Merge branch 'uncool/dvbsi++' commit '9578e5da35f' 
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)
 2012-07-23 01:02:29 +02:00
vanhofen
fc7d9d2644 osd_setup.cpp: remove double include 
Origin commit data
------------------
Commit: 9b66c00d04
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-20 (Fri, 20 Jul 2012)

Origin message was:
------------------
- osd_setup.cpp: remove double include
 2012-07-20 17:50:11 +02:00
[CST] Focus
1d79eea214 gui/osd_setup.cpp: fix channel list menu, if fade enabled 
Origin commit data
------------------
Commit: 3b0dec611c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
 2012-07-16 19:05:35 +04:00