mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 10:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,353 Commits 1 Branch 51 Tags
019644334f584bc820ec235f9f7836a751ce6dfd
Commit Graph

169 Commits

Author SHA1 Message Date
svenhoefer
a9012e4699 - bouquetlist: using CComponentsHeader to paint header 2013-05-27 21:19:23 +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
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
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
5ad0b6b6dc 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
 2013-04-06 11:21:55 +02:00
Stefan Seyfried
e09bc260da neutrino: make button bar use available space intelligently 
modify the paintButtons() function, so that it spreads the buttons
over the available width with constant space between them.
Port over all users to the new method and clean up quite some custom
button drawing code on the way.

Conflicts:
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
 2013-04-05 14:50:28 +04:00
svenhoefer
fc614004cf - bouquetlist.cpp: use existing loop to calc max height of buttons 2013-04-01 15:10:01 +04:00
svenhoefer
92f11c1e62 - bouquetlist.cpp: use existing loop to calc max height of buttons 2013-03-21 12:33:09 +01:00
svenhoefer
d90ae61449 - bouquetlist.cpp: fix buttonbar 2013-03-21 12:13:16 +01:00
[CST] Focus
96cd5c94af gui/bouquetlist.cpp: fix b523fe59c0: 
double ::paintButtons calls was added ?
 2013-03-14 11:57:02 +04:00
Stefan Seyfried
b523fe59c0 bouquetlist: only show active buttons 2013-03-12 16:32:51 +04:00
Stefan Seyfried
6c982e3d49 bouquetlist: fix width calculation 2013-03-12 16:32:19 +04:00
Stefan Seyfried
25de0d4380 bouquetlist: mark autogenerated bouquets as readonly 
this at least prevents modification from the context menu,
needs more work in the service->bouquetmanagement menus
 2013-03-12 16:32:12 +04:00
Stefan Seyfried
5acf5a489b bouquetlist: only show active buttons 2013-03-11 13:32:06 +01:00
Stefan Seyfried
0613e43736 bouquetlist: fix width calculation 2013-03-11 13:32:06 +01:00
Stefan Seyfried
2f677a5ffe bouquetlist: mark autogenerated bouquets as readonly 
this at least prevents modification from the context menu,
needs more work in the service->bouquetmanagement menus
 2013-03-11 13:32:06 +01:00
Stefan Seyfried
d6260e3862 bouquetlist: only show active buttons 2013-03-10 00:04:23 +01:00
Stefan Seyfried
e08ee68cd6 bouquetlist: fix width calculation 2013-03-10 00:01:04 +01:00
Stefan Seyfried
b61d0d1d3e bouquetlist: mark autogenerated bouquets as readonly 
this at least prevents modification from the context menu,
needs more work in the service->bouquetmanagement menus
 2013-03-09 23:58:31 +01:00
Stefan Seyfried
c480e36746 Merge branch 'uncool/dvbsi++' 
Conflicts:
	src/driver/Makefile.am
	src/driver/streamts.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/widget/textbox.h
 2012-11-11 01:45:22 +01:00
satbaby
80fe0c9307 src/gui/bouquetlist.cpp: close FAV window with rc-fav only in FAV mode 2012-11-05 16:45:34 +01:00
Stefan Seyfried
7e23ac7223 Merge branch 'uncool/dvbsi++' commit '7ea3a20a808' 
...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
 2012-11-03 10:45:33 +01:00
satbaby
cc73e4de86 src/gui/bouquetlist.cpp: fix width 2012-10-27 20:00:35 +02:00
[CST] Focus
d71ad8700a gui/bouquetlist.cpp: bouquet id safe-checks 2012-10-23 16:15:53 +04:00
[CST] Focus
6fad279231 gui/bouquetlist.cpp: fix message loop, if bouquet list is empty 2012-10-22 15:49:55 +04:00
[CST] Focus
6a0b42e962 gui/bouquetlist.cpp: add updateSelection(), 
fix indent
 2012-10-22 14:23:16 +04:00
satbaby
35138088e3 Neutrino: Channel list: add method isEmpty() and use it, ported from tuxbox cvs (THX Gaucho316) 2012-10-20 13:20:49 +02:00
satbaby
4a6f9467c9 bouquetlist.cpp: fix width for buttontext 2012-10-18 17:17:00 +02:00
Stefan Seyfried
adb23b23ee Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6' 
...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
 2012-10-14 12:51:07 +02:00
satbaby
e50a5ef013 /bouquetlist.cpp: close Favo also with RC_favorites 2012-09-12 22:48:15 +02:00
satbaby
a3bfab0bcd remove doubles include 2012-09-11 20:31:33 +02:00
Stefan Seyfried
ae1b98aa38 Merge branch 'uncool/dvbsi++' commit '6e0bc85a6c0' 
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
 2012-07-23 01:02:29 +02:00
[CST] Focus
5fabe3d425 gui/bouquetlist.cpp: dont repaint, if mode not changed 2012-07-16 17:18:41 +04:00
satbaby
bc574e9688 use empty() instead of size() 2012-06-16 09:44:42 +02:00
satbaby
bb347b3a44 performance Prefer prefix ++/-- operators for non-primitive types. 2012-04-28 10:56:27 +02:00
Stefan Seyfried
a029333c1a neutrino: adapt to the framebuffer_spark blitter change 
basically add fb->blit() in every widget where necessary to
make sure the framebuffer is updated with current content
 2012-04-17 19:33:57 +02:00
Stefan Seyfried
37c5f7c7d3 neutrino: avoid float when calculating scrollbars 2012-04-17 19:33:50 +02:00
Stefan Seyfried
2f65aea744 neutrino: make button bar use available space intelligently 
modify the paintButtons() function, so that it spreads the buttons
over the available width with constant space between them.
Port over all users to the new method and clean up quite some custom
button drawing code on the way.

Attention: This code is GPL v3+ only for now!
 2012-04-17 19:33:49 +02:00
[CST] Focus
f5f819f598 gui/bouquetlist.cpp: use locals for HD and other bouquets 2012-03-29 13:13:33 +04:00
satbaby
163052cd39 dont reload chanellist after manuel reload 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2065 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-01-17 20:07:13 +00:00
satbaby
dc734f7d2a bouquetlist: use settings key 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1998 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-24 14:17:17 +00:00
satbaby
1bb6885cb1 bouquetlist: use settings key 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1992 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-23 20:22:12 +00:00
focus
83e0e1bc98 Move left/right handling after user-defined keys 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1987 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-22 15:51:46 +00:00
focus
e0ef7a0680 Use new class to fade 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1946 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-06 13:07:53 +00:00
focus
82d3290d98 Remove unused g_settings.gtx_alpha1/2 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1917 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-26 12:45:02 +00:00
focus
da65f42575 Switch list modes also with left/right keys 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1886 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-24 15:28:13 +00:00
focus
5c8429673a Allow killTimer to check and reset timer id 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1562 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-07-21 10:04:05 +00:00
striper
8accc074a7 - fix RadioChannels 
- fix delete-button color

patch by Janus -> http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/board310-coolstream-svn/10639-bug-kontext-men%C3%BC-bouquetsliste/

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1499 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-05-31 17:13:20 +00:00
focus
1df85f6ea3 Fade changes for new fb driver 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1413 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-04-23 10:24:09 +00:00