Commit Graph

654 Commits

Author SHA1 Message Date
Stefan Seyfried
158bd2c244 Merge branch 'check/next-cc'
Origin commit data
------------------
Commit: 50977ef2f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-03 (Tue, 03 Sep 2013)
2013-09-03 09:36:49 +02:00
Michael Liebmann
6e1c1f5c50 src/gui/channellist.cpp: Fix OSD (headerclock)
Origin commit data
------------------
Commit: 83ee284269
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-02 (Mon, 02 Sep 2013)
2013-09-02 23:50:12 +02:00
vanhofen
d9afd3ffd5 channellist: disable miniTV in movieplayer-mode
Origin commit data
------------------
Commit: ebd5f54753
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-09-02 (Mon, 02 Sep 2013)

Origin message was:
------------------
- channellist: disable miniTV in movieplayer-mode
2013-09-02 22:37:07 +02:00
Stefan Seyfried
2c76238007 Merge remote-tracking branch 'check/next-cc'
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.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/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
2013-09-01 19:46:10 +02:00
Jacek Jendrzej
0adda1f225 CChannelList::paintItem:-fix description width with scrambled icon
Origin commit data
------------------
Commit: 4c8e32101c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-01 (Sun, 01 Sep 2013)
2013-09-01 17:03:32 +02:00
[CST] Focus
dd8cc134fe gui/channellist.cpp: fix quick zap and virtual zap, when
empty bouquets present and zap cycle in current bouquet is disabled


Origin commit data
------------------
Commit: 853baa6f29
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
2013-07-30 11:13:50 +04:00
[CST] Focus
caa9cd7e5d gui/channellist.cpp: fix selected after direct record
Origin commit data
------------------
Commit: 291a990be3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
2013-07-30 11:13:50 +04:00
Jacek Jendrzej
e274e633c8 CChannelList::paint(): reduce background paint in miniTV mode
Origin commit data
------------------
Commit: d5876963e7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-07-23 (Tue, 23 Jul 2013)
2013-07-23 19:24:42 +02:00
Thilo Graf
0b4015aecd CChannelList: use matching datatype for color
Origin commit data
------------------
Commit: 72c4deb17c
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-07-15 (Mon, 15 Jul 2013)
2013-07-21 22:04:10 +02:00
Michael Liebmann
7b6498d39f Replace color indexes of the text colors by real color values for RenderString()
- If necessary, Correct data types of the color values


Origin commit data
------------------
Commit: c60c5c5ce3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-11 (Thu, 11 Jul 2013)
2013-07-21 22:00:58 +02:00
Stefan Seyfried
6830b68cac Merge branch 'check/next-cc'
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)
2013-07-06 19:01:15 +02:00
Thilo Graf
61837a058f CComponentsFrmClock: set font only with fontrender object
Origin commit data
------------------
Commit: 03ef18cdb9
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-06-18 (Tue, 18 Jun 2013)
2013-06-18 19:33:34 +02:00
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
04e6326ee8 CChannelList: Use one instance of CComponentsFrmClock for multiple instances of CChannelList
Origin commit data
------------------
Commit: f0de4567ae
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)
2013-06-12 01:32:24 +02:00
Michael Liebmann
24393838b7 CChannelList: using CComponentsHeader to paint header
- using CComponentsFrmClock to paint clock in header


Origin commit data
------------------
Commit: 0128a61708
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-01 (Sat, 01 Jun 2013)

Origin message was:
------------------
* CChannelList: using CComponentsHeader to paint header

- using CComponentsFrmClock to paint clock in header
2013-06-01 19:37:46 +02:00
Jacek Jendrzej
836f7be469 channllist: fix new_zap_mode handling
Origin commit data
------------------
Commit: daf539b141
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-06-01 (Sat, 01 Jun 2013)

Origin message was:
------------------
- channllist: fix new_zap_mode handling
2013-06-01 08:30:37 +02:00
Stefan Seyfried
6210ac6726 neutrino: fix possible div-by-zero in scrollbar calculation
Origin commit data
------------------
Commit: a33086568b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-29 (Wed, 29 May 2013)
2013-05-30 11:19:39 +02:00
Stefan Seyfried
512febee25 neutrino: fix possible div-by-zero in scrollbar calculation
Origin commit data
------------------
Commit: 6a48922350
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-29 (Wed, 29 May 2013)
2013-05-29 15:33:21 +02:00
vanhofen
d02607f887 channellist: using small buttons in buttonbar
Origin commit data
------------------
Commit: e492048eab
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-26 (Sun, 26 May 2013)

Origin message was:
------------------
- channellist: using small buttons in buttonbar
2013-05-26 23:06:58 +02:00
Jacek Jendrzej
7d40cd7e9d ChannelList::quickZap -record mode- should zap if possible, else display transponderlist
Origin commit data
------------------
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
2013-05-25 13:05:55 +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
Michael Liebmann
22a5af089f CChannelList: prevent possible compile error
Origin commit data
------------------
Commit: a48e7fa200
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-19 (Sun, 19 May 2013)

Origin message was:
------------------
* CChannelList: prevent possible compile error
2013-05-19 08:41:05 +01:00
vanhofen
a56adef180 channellist: colored_events to right infobox
Origin commit data
------------------
Commit: 273a83fa3f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-18 (Sat, 18 May 2013)

Origin message was:
------------------
- channellist: colored_events to right infobox
2013-05-18 23:59:06 +02:00
Jacek Jendrzej
dba03455e3 channellist.cpp fix compil -comparison between signed and unsigned integer expressions
Origin commit data
------------------
Commit: c32266e8f4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Origin message was:
------------------
 channellist.cpp fix compil -comparison between signed and unsigned integer expressions
2013-05-13 08:48:29 +02:00
vanhofen
7bfe1ab4bf channellist: disable 'displayNext' when additional infos enabled
* otherwise there is no possibility to disable 'displayNext'
 except exiting the channellist


Origin commit data
------------------
Commit: 2ab63ce14d
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-12 (Sun, 12 May 2013)

Origin message was:
------------------
- channellist: disable 'displayNext' when additional infos enabled

* otherwise there is no possibility to disable 'displayNext'
 except exiting the channellist
2013-05-12 23:41:36 +02:00
vanhofen
bde183828d channellist: show infotext when epg.info2 is empty ...
... and 'description' is selected in additional infos

* fix double paint of infozone


Origin commit data
------------------
Commit: 4277b8e283
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-12 (Sun, 12 May 2013)

Origin message was:
------------------
- channellist: show infotext when epg.info2 is empty ...

... and 'description' is selected in additional infos

* fix double paint of infozone
2013-05-12 23:06:57 +02:00
vanhofen
f2115ad7f3 channellist: show current event in additional info box
Origin commit data
------------------
Commit: e170aec2d9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-12 (Sun, 12 May 2013)

Origin message was:
------------------
- channellist: show current event in additional info box
2013-05-12 22:26:10 +02:00
Stefan Seyfried
748b384771 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
------------------
Commit: 6b72095f5a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)
2013-05-11 17:17:33 +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
Jacek Jendrzej
ff88d7a481 CChannelList::show() call hide only once
Origin commit data
------------------
Commit: 438248bfac
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-09 (Thu, 09 May 2013)
2013-05-09 16:32:11 +02:00
Jacek Jendrzej
d7ad90f9a3 src/gui/channellist.cpp: skip paint BG for item if firstpaint
Origin commit data
------------------
Commit: 4bf2a4aa19
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-03 (Fri, 03 May 2013)
2013-05-03 18:42:35 +02:00
vanhofen
1f39bc469f channellist: fix transparent pixels in round corners of detail box
Origin commit data
------------------
Commit: c9a17eda0e
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-02 (Thu, 02 May 2013)

Origin message was:
------------------
- channellist: fix transparent pixels in round corners of detail box
2013-05-02 21:08:04 +02:00
vanhofen
0b44ef089f channellist: remove some unneeded calculations
Origin commit data
------------------
Commit: e07e2e5264
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-18 (Thu, 18 Apr 2013)

Origin message was:
------------------
- channellist: remove some unneeded calculations
2013-04-18 18:09:32 +02:00
vanhofen
df2e4ab12f channellist: use the bigger menu-icon
Origin commit data
------------------
Commit: c87750e66d
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-18 (Thu, 18 Apr 2013)

Origin message was:
------------------
- channellist: use the bigger menu-icon
2013-04-18 17:20:43 +02: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
3395fd26af 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
------------------
Commit: c0c008190e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
2013-04-17 10:21:33 +04:00
Stefan Seyfried
5fe16ac601 channellist: improve add-to-bouquet and remove-new-flag workflow
When adding the current channel to a bouquet or favorites or when
removing the "new" flag from a channel, don't immediately reload the
channels but wait for closing of the channellist.
Additionally, select the next channel after one of the add-to-bouquet or
remove-new-flag actions.


Origin commit data
------------------
Commit: 9eda015afe
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
2013-04-17 10:21:33 +04:00
Stefan Seyfried
4b7f1e09da 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
------------------
Commit: 057f3a8964
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
2013-04-15 19:46:27 +02:00
Stefan Seyfried
bc7ffd33b1 channellist: improve add-to-bouquet and remove-new-flag workflow
When adding the current channel to a bouquet or favorites or when
removing the "new" flag from a channel, don't immediately reload the
channels but wait for closing of the channellist.
Additionally, select the next channel after one of the add-to-bouquet or
remove-new-flag actions.


Origin commit data
------------------
Commit: d35835fe8f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
2013-04-15 19:42:24 +02:00
Stefan Seyfried
c3b4649919 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
------------------
Commit: 744ed878de
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
2013-04-14 19:42:28 +02:00
Stefan Seyfried
1bb69ee4e5 channellist: improve add-to-bouquet and remove-new-flag workflow
When adding the current channel to a bouquet or favorites or when
removing the "new" flag from a channel, don't immediately reload the
channels but wait for closing of the channellist.
Additionally, select the next channel after one of the add-to-bouquet or
remove-new-flag actions.


Origin commit data
------------------
Commit: 7a4c4ae292
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
2013-04-14 13:13:42 +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
Jacek Jendrzej
a1b099722c src/gui/channellist.cpp: fix to 1f453938a7
Origin commit data
------------------
Commit: 838cf61a69
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-10 (Wed, 10 Apr 2013)
2013-04-10 20:43:32 +02:00
Jacek Jendrzej
1f453938a7 src/gui/channellist.cpp: fix paint details with different font size
Origin commit data
------------------
Commit: 4a8350c382
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-10 (Wed, 10 Apr 2013)
2013-04-10 19:28:30 +02:00
[CST] Focus
c54a1188b7 neutrino GUI: more places to disable anything record-related, if recording_type is RECORDING_OFF
Origin commit data
------------------
Commit: e14043dbfb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)
2013-04-09 18:37:25 +04:00
[CST] Focus
8088afd2d6 gui/channellist.cpp: set oldselected to selected on sort mode change,
else wrong selected restored on exit;
store channel to history only if adjustToChannelID called with bToo == true, which means zap


Origin commit data
------------------
Commit: 89423d49b4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)
2013-04-09 13:10:56 +04:00
[CST] Focus
0fa4da9c7c gui/channellist.cpp: fix current transponder key
Origin commit data
------------------
Commit: 06372e1856
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)
2013-04-08 18:02:03 +04:00
Stefan Seyfried
609b8d88f1 CChannelList: fix "prev bouquet" if empty bouquets are present
also do proper wrap-around when selecting previous / next bouquet


Origin commit data
------------------
Commit: b79b13a411
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-08 09:59:18 +04:00
Jacek Jendrzej
26db5ec262 revert commit f4ae5e17ce00575de61daba517f37a4bb9252836
Origin commit data
------------------
Commit: 6d56cc0696
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-08 09:59:04 +04:00
Stefan Seyfried
105fa78aa2 CChannelList: fix "prev bouquet" if empty bouquets are present
also do proper wrap-around when selecting previous / next bouquet


Origin commit data
------------------
Commit: 80e7f9753b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 22:14:06 +02:00