Commit Graph

644 Commits

Author SHA1 Message Date
Michael Liebmann
301a522b57 Software update: Apply the settings in the options menu switchable
Origin commit data
------------------
Branch: ni/coolstream
Commit: 365661e841
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-08 (Sat, 08 Jun 2013)

Origin message was:
------------------
* Software update: Apply the settings in the options menu switchable

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-06-08 16:20:32 +02:00
Michael Liebmann
80ddb22bed Add volume bar to osd timeouts in the OSD setup
Origin commit data
------------------
Branch: ni/coolstream
Commit: d08d18522e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-03 (Mon, 03 Jun 2013)

Origin message was:
------------------
* Add volume bar to osd timeouts in the OSD setup

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-06-04 01:17:39 +02:00
[CST] Focus
93eb0c1679 Merge branch 'next' into next-cc
Conflicts:
	data/locale/english.locale
	src/driver/framebuffer.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f8ef9ec46
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-02 (Sun, 02 Jun 2013)



------------------
This commit was generated by Migit
2013-06-02 10:46:42 +04:00
Stefan Seyfried
c3ea7f0bbf neutrino: don't spam with --enable-cleanup
sectionsd already does malloc_stats()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6aee976490
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-01 (Sat, 01 Jun 2013)



------------------
This commit was generated by Migit
2013-06-01 15:50:35 +02:00
Stefan Seyfried
78bb53b641 neutrino: generic-pc is now also using 1280x70 FB per default
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb9eba8914
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-29 (Wed, 29 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-29 15:30:06 +02:00
Stefan Seyfried
5cd9f154ff neutrino/femanager: fix format string warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bb8fd218a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-12 (Sun, 12 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-28 16:24:35 +02:00
Jacek Jendrzej
75f50de7eb fix comma at end of enumerator list
Origin commit data
------------------
Branch: ni/coolstream
Commit: a549b97924
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-28 (Tue, 28 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-28 15:52:31 +02:00
Jacek Jendrzej
c9565c9d33 ChannelList::quickZap -record mode- should zap if possible, else display transponderlist
Origin commit data
------------------
Branch: ni/coolstream
Commit: a01551d360
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-25 (Sat, 25 May 2013)

Origin message was:
------------------
ChannelList::quickZap -record mode- should zap if possible, else display transponderlist

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-25 13:05:55 +02:00
Stefan Seyfried
07ccb9a351 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
------------------
Branch: ni/coolstream
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)



------------------
This commit was generated by Migit
2013-05-24 20:24:39 +02:00
Michael Liebmann
fc2fd28825 Mute icon: Fix minor bugs
- Fix display the mute icon when leaving the audio player
- Disable mute icon in channellist when 'Quickzap in list' active or allow
- Fix hide the mute icon in movie browser, picture viewer,
 file browser and upnp browser
- Font::RenderString(): Use correct value of y for CFrameBuffer::checkFbArea()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5eb7f4aea8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-17 (Fri, 17 May 2013)

Origin message was:
------------------
* Mute icon: Fix minor bugs

- Fix display the mute icon when leaving the audio player
- Disable mute icon in channellist when 'Quickzap in list' active or allow
- Fix hide the mute icon in movie browser, picture viewer,
 file browser and upnp browser
- Font::RenderString(): Use correct value of y for CFrameBuffer::checkFbArea()


------------------
This commit was generated by Migit
2013-05-18 14:44:20 +01:00
Michael Liebmann
5235cec6d0 Various changes for reworked mute icon handling in some classes
- mute icon disabled for moviebrowser, upnpbrowser, pictureviewer
- extra handling for audioplayer


Origin commit data
------------------
Branch: ni/coolstream
Commit: bf1c7bfdb7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Origin message was:
------------------
* Various changes for reworked mute icon handling in some classes

- mute icon disabled for moviebrowser, upnpbrowser, pictureviewer
- extra handling for audioplayer


------------------
This commit was generated by Migit
2013-05-16 11:01:41 +01:00
[CST] Focus
2bb4fda91b neutrino.cpp: change defaults:
record ttx/subtitles to true;
progress bars to horizontal bars;
infoviewer epg progress to below channel name;
ca sys display to discreet;
direct record end to epg event


Origin commit data
------------------
Branch: ni/coolstream
Commit: bbade7451d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-05-15 (Wed, 15 May 2013)



------------------
This commit was generated by Migit
2013-05-15 16:04:37 +04:00
vanhofen
c9b9d8a5cb neutrino: use key 'sleep' to execute CSleepTimerWidget
Origin commit data
------------------
Branch: ni/coolstream
Commit: a5857e9d5b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-14 (Tue, 14 May 2013)

Origin message was:
------------------
- neutrino: use key 'sleep' to execute CSleepTimerWidget

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-14 01:09:10 +02:00
Stefan Seyfried
aaa9d02f07 neutrino/femanager: fix format string warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d64dfa134
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-12 (Sun, 12 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-12 17:26:00 +02:00
Stefan Seyfried
0211c52c47 neutrino: put hw_caps init after cs_api_init()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7459630565
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-12 (Sun, 12 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-12 17:23:34 +02:00
Stefan Seyfried
00cfd31e82 neutrino: explicitly include vfd/lcd header
Instead of including it everywhere through global.h, just include
the lcd/vfd header where needed. Add a tiny helper header "display.h"
to divert between vfd.h (coolstream) and lcdd.h (everything else).


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6b72095f5a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)



------------------
This commit was generated by Migit
2013-05-11 17:17:33 +02:00
Jacek Jendrzej
5d2e0aadcd CTimerManager:: don't set wekup flag if box boot from zapto timer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1396896dd1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-01 (Wed, 01 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-10 17:02:11 +04:00
Stefan Seyfried
083bc55347 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
------------------
Branch: ni/coolstream
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)



------------------
This commit was generated by Migit
2013-05-10 10:06:47 +02:00
Thilo Graf
d6c76ef8a8 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
------------------
Branch: ni/coolstream
Commit: 8baec6d62a
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-05-04 (Sat, 04 May 2013)



------------------
This commit was generated by Migit
2013-05-08 05:11:24 +01:00
Stefan Seyfried
d7243aa213 neutrino: do not clean up infoviewer
after spending ages trying to track down the illegal access
in the infoviewer destructor, just #if 0 it.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 596e8b5bf6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-04 (Sat, 04 May 2013)



------------------
This commit was generated by Migit
2013-05-04 12:35:08 +02:00
Jacek Jendrzej
c711eb68fb CTimerManager:: don't set wekup flag if box boot from zapto timer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ba280261b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-01 (Wed, 01 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-01 22:00:03 +02:00
Jacek Jendrzej
eb6d2f4dd6 src/neutrino.cpp: execute rcK on restart
Origin commit data
------------------
Branch: ni/coolstream
Commit: f4f5e4cbe6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-18 (Thu, 18 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-30 13:00:40 +04:00
[CST] Focus
99672ced61 neutrino.cpp, settings: add key for file play subtitle select
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f37b8a7b6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-30 (Tue, 30 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-30 12:10:03 +04:00
Jacek Jendrzej
8ca7dc7947 src/neutrino.cpp: execute rcK on restart
Origin commit data
------------------
Branch: ni/coolstream
Commit: ab3b8b4fdd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-18 (Thu, 18 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-18 20:32:40 +02:00
[CST] Focus
0c3a4fa858 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
------------------
Branch: ni/coolstream
Commit: 8bb70d1ab3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-17 (Wed, 17 Apr 2013)



------------------
This commit was generated by Migit
2013-04-17 13:32:12 +04:00
Stefan Seyfried
89d3d162ea neutrino: make g_channel_list_changed private
Add a setter function MarkChannelListChanged() instead for
bouquet/channel list. This avoids sometimes not reloading
channels after changes in the service menu.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c0c008190e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)



------------------
This commit was generated by Migit
2013-04-17 10:21:33 +04:00
Stefan Seyfried
4cd92b9163 neutrino: fix signed/unsigned warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: 24a61bddd6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-17 10:21:33 +04:00
Stefan Seyfried
db358a3de2 reloadchannels: make sure that channel flags are updated when reloading
Origin commit data
------------------
Branch: ni/coolstream
Commit: bb560fbf47
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-17 10:21:33 +04:00
[CST] Focus
17808e8e84 neutrino.cpp: add ci_ignore_messages settings var
Origin commit data
------------------
Branch: ni/coolstream
Commit: f36200e0fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-16 (Tue, 16 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-16 13:16:16 +04:00
Stefan Seyfried
917b67d4b7 neutrino: make g_channel_list_changed private
Add a setter function MarkChannelListChanged() instead for
bouquet/channel list. This avoids sometimes not reloading
channels after changes in the service menu.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 057f3a8964
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)



------------------
This commit was generated by Migit
2013-04-15 19:46:27 +02:00
Stefan Seyfried
53e3a05eaf neutrino: fix signed/unsigned warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6996658dcc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-15 19:42:35 +02:00
Stefan Seyfried
61ca8bc63f reloadchannels: make sure that channel flags are updated when reloading
Origin commit data
------------------
Branch: ni/coolstream
Commit: ba22ea8668
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-15 19:42:06 +02:00
Stefan Seyfried
d241584369 neutrino: make g_channel_list_changed private
Add a setter function MarkChannelListChanged() instead for
bouquet/channel list. This avoids sometimes not reloading
channels after changes in the service menu.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 744ed878de
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)



------------------
This commit was generated by Migit
2013-04-14 19:42:28 +02:00
Stefan Seyfried
deb6a3f262 neutrino: fix signed/unsigned warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f92bba94c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-14 17:13:38 +02:00
Stefan Seyfried
88f31b8a8d reloadchannels: make sure that channel flags are updated when reloading
Origin commit data
------------------
Branch: ni/coolstream
Commit: 80c5185bbb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-14 13:03:12 +02:00
Stefan Seyfried
858bd31770 auto-enumerate FONT_TYPE_COUNT instead of defining it
Origin commit data
------------------
Branch: ni/coolstream
Commit: ee3580214f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-13 (Sat, 13 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-13 17:27:21 +02:00
Stefan Seyfried
6a3cf1003b Merge branch 'check/pu-cc' into master
Conflicts:
	src/gui/osd_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 61bf95f552
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-13 (Sat, 13 Apr 2013)



------------------
This commit was generated by Migit
2013-04-13 17:17:30 +02:00
vanhofen
d956906ecb eventlist: make additional infos switchable
* new menu 'eventlist' in osd-setup
* fix offset in infozone
* fontsize for infozone adjustable


Origin commit data
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2013-04-13 11:13:23 +02:00
Jacek Jendrzej
c8ac087adf src/neutrino.cpp: fix execute rcK script
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9fe2f83987
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-10 (Wed, 10 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-10 14:09:13 +04:00
Jacek Jendrzej
0f15b39df4 src/neutrino.cpp: fix execute rcK script
Origin commit data
------------------
Branch: ni/coolstream
Commit: f5297f06d9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-10 (Wed, 10 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-10 11:59:48 +02:00
[CST] Focus
2e5bd433fa neutrino GUI: more places to disable anything record-related, if recording_type is RECORDING_OFF
Origin commit data
------------------
Branch: ni/coolstream
Commit: e14043dbfb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-09 18:37:25 +04:00
[CST] Focus
0da88e2139 neutrino.cpp: fix unused variable warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c2362374d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-09 16:02:29 +04:00
[CST] Focus
8c9f0af590 src/neutrino.cpp: setSelected(old_num) on channel list exit wrong in case of sort
mode change - try to restore current channel id


Origin commit data
------------------
Branch: ni/coolstream
Commit: e250588705
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)



------------------
This commit was generated by Migit
2013-04-09 13:12:05 +04:00
[CST] Focus
2e69c38b88 neutrino.cpp: stop PiP in standby
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f90276877
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-09 10:58:54 +04:00
Stefan Seyfried
2c192a4947 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
------------------
Branch: ni/coolstream
Commit: 6a955ecef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 14:41:06 +02:00
Stefan Seyfried
ab5760e4de Merge branch 'check/pu-cc' into master
...needs some build- and logical fixing...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b689f4b26
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 14:28:16 +02:00
Stefan Seyfried
7254e280e3 Merge branch 'check/pu-cc' into master
needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/framebuffer.h
	src/driver/volume.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/imageinfo.cpp
	src/gui/infoviewer.cpp
	src/gui/streaminfo2.cpp
	src/gui/widget/textbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ad0b6b6dc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 11:21:55 +02:00
Stefan Seyfried
d2478aa428 neutrino: add the possibility to lock bouquets by default
This basically inverts the "locked" attribute of bouquets.xml and
allows to selectively enable only favourites or similar.

Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 27493de2ef
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-30 (Sun, 30 Oct 2011)



------------------
This commit was generated by Migit
2013-04-05 15:52:58 +04:00
Thilo Graf
71248e0dc7 CComponents: add progressbar class to cc-items
CProgressbar moved into components sub directory and adapt includes.
Progressbar objects are now usable as cc-item

TODO:
-some color and size corrections
-found some dub codes for sig and snr-bars, needs rework


Origin commit data
------------------
Branch: ni/coolstream
Commit: 860be9a412
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)



------------------
This commit was generated by Migit
2013-04-02 09:31:05 +02:00
vanhofen
0cad5bca1a strech most windows to full screen
* switchable with existing switch for 'big_windows'
* 'big_windows' default is on

Conflicts:
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4714a30f83
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)

Origin message was:
------------------
- strech most windows to full screen

* switchable with existing switch for 'big_windows'
* 'big_windows' default is on

Conflicts:
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp


------------------
This commit was generated by Migit
2013-04-01 15:42:38 +04:00