Stefan Seyfried
32de6beef0
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
2013-09-01 19:46:10 +02:00
Jacek Jendrzej
4c8e32101c
CChannelList::paintItem:-fix description width with scrambled icon
2013-09-01 17:03:32 +02:00
[CST] Focus
853baa6f29
gui/channellist.cpp: fix quick zap and virtual zap, when
...
empty bouquets present and zap cycle in current bouquet is disabled
2013-07-30 11:13:50 +04:00
[CST] Focus
291a990be3
gui/channellist.cpp: fix selected after direct record
2013-07-30 11:13:50 +04:00
Jacek Jendrzej
d5876963e7
CChannelList::paint(): reduce background paint in miniTV mode
2013-07-23 19:24:42 +02:00
Thilo Graf
72c4deb17c
CChannelList: use matching datatype for color
2013-07-21 22:04:10 +02:00
Michael Liebmann
c60c5c5ce3
Replace color indexes of the text colors by real color values for RenderString()
...
- If necessary, Correct data types of the color values
2013-07-21 22:00:58 +02:00
Stefan Seyfried
7cfe54dc2f
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
2013-07-06 19:01:15 +02:00
Thilo Graf
03ef18cdb9
CComponentsFrmClock: set font only with fontrender object
2013-06-18 19:33:34 +02:00
Stefan Seyfried
d5d5a60261
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
2013-06-16 21:22:14 +02:00
Michael Liebmann
f0de4567ae
CChannelList: Use one instance of CComponentsFrmClock for multiple instances of CChannelList
2013-06-12 01:32:24 +02:00
Michael Liebmann
0128a61708
* CChannelList: using CComponentsHeader to paint header
...
- using CComponentsFrmClock to paint clock in header
2013-06-01 19:37:46 +02:00
Jacek Jendrzej
daf539b141
- channllist: fix new_zap_mode handling
2013-06-01 08:30:37 +02:00
Stefan Seyfried
a33086568b
neutrino: fix possible div-by-zero in scrollbar calculation
2013-05-30 11:19:39 +02:00
Stefan Seyfried
6a48922350
neutrino: fix possible div-by-zero in scrollbar calculation
2013-05-29 15:33:21 +02:00
svenhoefer
e492048eab
- channellist: using small buttons in buttonbar
2013-05-26 23:06:58 +02:00
Jacek Jendrzej
a01551d360
ChannelList::quickZap -record mode- should zap if possible, else display transponderlist
2013-05-25 13:05:55 +02:00
Stefan Seyfried
a7f1e0e25e
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
2013-05-24 20:24:39 +02:00
Michael Liebmann
a48e7fa200
* CChannelList: prevent possible compile error
2013-05-19 08:41:05 +01:00
svenhoefer
273a83fa3f
- channellist: colored_events to right infobox
2013-05-18 23:59:06 +02:00
Jacek Jendrzej
c32266e8f4
channellist.cpp fix compil -comparison between signed and unsigned integer expressions
2013-05-13 08:48:29 +02:00
svenhoefer
2ab63ce14d
- 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
svenhoefer
4277b8e283
- 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
svenhoefer
e170aec2d9
- channellist: show current event in additional info box
2013-05-12 22:26:10 +02:00
Stefan Seyfried
6b72095f5a
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).
2013-05-11 17:17:33 +02:00
Stefan Seyfried
8253c4d67c
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
2013-05-10 10:06:47 +02:00
Jacek Jendrzej
438248bfac
CChannelList::show() call hide only once
2013-05-09 16:32:11 +02:00
Jacek Jendrzej
4bf2a4aa19
src/gui/channellist.cpp: skip paint BG for item if firstpaint
2013-05-03 18:42:35 +02:00
svenhoefer
c9a17eda0e
- channellist: fix transparent pixels in round corners of detail box
2013-05-02 21:08:04 +02:00
svenhoefer
e07e2e5264
- channellist: remove some unneeded calculations
2013-04-18 18:09:32 +02:00
svenhoefer
c87750e66d
- channellist: use the bigger menu-icon
2013-04-18 17:20:43 +02:00
[CST] Focus
8bb70d1ab3
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
2013-04-17 13:32:12 +04:00
Stefan Seyfried
c0c008190e
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.
2013-04-17 10:21:33 +04:00
Stefan Seyfried
9eda015afe
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.
2013-04-17 10:21:33 +04:00
Stefan Seyfried
057f3a8964
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.
2013-04-15 19:46:27 +02:00
Stefan Seyfried
d35835fe8f
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.
2013-04-15 19:42:24 +02:00
Stefan Seyfried
744ed878de
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.
2013-04-14 19:42:28 +02:00
Stefan Seyfried
7a4c4ae292
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.
2013-04-14 13:13:42 +02:00
Stefan Seyfried
61bf95f552
Merge branch 'check/pu-cc' into master
...
Conflicts:
src/gui/osd_setup.cpp
src/neutrino.cpp
2013-04-13 17:17:30 +02:00
Jacek Jendrzej
838cf61a69
src/gui/channellist.cpp: fix to 4a8350c382
2013-04-10 20:43:32 +02:00
Jacek Jendrzej
4a8350c382
src/gui/channellist.cpp: fix paint details with different font size
2013-04-10 19:28:30 +02:00
[CST] Focus
e14043dbfb
neutrino GUI: more places to disable anything record-related, if recording_type is RECORDING_OFF
2013-04-09 18:37:25 +04:00
[CST] Focus
89423d49b4
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
2013-04-09 13:10:56 +04:00
[CST] Focus
06372e1856
gui/channellist.cpp: fix current transponder key
2013-04-08 18:02:03 +04:00
Stefan Seyfried
b79b13a411
CChannelList: fix "prev bouquet" if empty bouquets are present
...
also do proper wrap-around when selecting previous / next bouquet
2013-04-08 09:59:18 +04:00
Jacek Jendrzej
6d56cc0696
revert commit f4ae5e17ce
2013-04-08 09:59:04 +04:00
Stefan Seyfried
80e7f9753b
CChannelList: fix "prev bouquet" if empty bouquets are present
...
also do proper wrap-around when selecting previous / next bouquet
2013-04-06 22:14:06 +02:00
Jacek Jendrzej
e0facfa2e0
revert commit f4ae5e17ce
2013-04-06 22:13:47 +02:00
Stefan Seyfried
8b689f4b26
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
2013-04-06 14:28:16 +02:00
Stefan Seyfried
8ba673497e
Revert "src/gui/channellist.cpp: fix to 36e95d7fbc if more bouquets empty"
...
This reverts commit f4ae5e17ce
2013-04-06 13:33:29 +02:00
