mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-11 23:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,187 Commits 1 Branch 51 Tags
6e1069bbdfb94b65483e34625dc7a960cac88362
Commit Graph

282 Commits

Author SHA1 Message Date
Jacek Jendrzej
32909483ef src/gui/epgview.cpp: fixes from tuxbox, THX Gaucho316 & GetAway 2013-04-09 09:54:16 +04:00
Jacek Jendrzej
6a32e96920 src/gui/epgview.cpp: fixes3 from tuxbox, THX Gaucho316 2013-04-08 21:03:46 +02:00
Jacek Jendrzej
d23bdf7bb8 src/gui/epgview.cpp: fixes2 from tuxbox, THX Gaucho316 2013-04-08 20:41:36 +02:00
Jacek Jendrzej
67e6ed102c src/gui/epgview.cpp: fixes from tuxbox, THX Gaucho316 & GetAway 2013-04-08 17:42:37 +02:00
Michael Liebmann
d4740238dd * Supplement to commit adfbfe0... 
- epgview: Fix colors in progress bar
 2013-04-06 15:18:12 +01: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
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
Thilo Graf
f70a30defa Progressbars: use default frame thickness 
It's unnecessary overhead to set the value everywhere, except it's needed.
 2013-04-06 08:33:51 +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
Thilo Graf
860be9a412 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
 2013-04-02 09:31:05 +02:00
svenhoefer
4714a30f83 - 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
 2013-04-01 15:42:38 +04:00
svenhoefer
759966f935 - strech most windows to full screen 
* switchable with existing switch for 'big_windows'
* 'big_windows' default is on
 2013-03-25 09:45:22 +01:00
Stefan Seyfried
4dbeb3a31e neutrino: fix 32<->64bit format string warnings 
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t
 2013-02-21 15:47:18 +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
5e284c68c3 src/gui/epgview.cpp: further corrections for followlist 2012-11-04 22:13:36 +01:00
Stefan Seyfried
a918f64bcf epgview: don't paint out-of-bounds background box 2012-11-03 21:33:21 +01:00
Stefan Seyfried
e0acbd3ddb neutrino: fix 32<->64bit format string warnings 
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t
 2012-11-03 14:05:48 +01:00
satbaby
27fe0fe6e0 src/gui/epgview.cpp:show always all screening 2012-11-03 11:20:15 +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
c40361147d src/gui/epgview.cpp:check res after exec 2012-11-02 22:00:01 +01:00
[CST] Focus
af753fc4f1 gui/epgview.cpp: use g_InfoViewer->getUpdateTimer() 2012-11-02 16:09:30 +04: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
striper
6138e42948 - epgview: only hide info1 if info2 begins with info1 (port from tuxbox-cvs. THX Gaucho316) 2012-10-11 20:41:46 +02:00
[CST] Focus
3f5a0e5bb1 remove channel_id mask for CEitManager getXXX calls 2012-08-30 14:50:01 +04:00
[CST] Focus
74a761ef50 use CEitManager to get EIT data 2012-08-30 11:40:02 +04:00
satbaby
ab24c127c8 -add: show sore screenings in in extra window 2012-08-06 20:22:43 +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
5dd54caf54 fix conflict 2012-06-18 14:56:17 +04:00
satbaby
bc574e9688 use empty() instead of size() 2012-06-16 09:44:42 +02:00
[CST] Focus
35ee04049a remove obsolete and unused includes 2012-06-14 11:01:37 +04: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
6317064504 epgview: add event ID and table as last line to epg window 2012-04-17 19:33:53 +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
satbaby
2591100c42 remove never used volues 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2138 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-03-04 17:25:48 +00:00
focus
346d3ad63e Use new class to fade 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1944 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-06 12:48:16 +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
micha-bbg
4f4f46a912 Correct calculation of the size of logo in list header. 
- Function for calculating from infoviewer.cpp to pictureviewer.cpp moved
- Correct calculation in channellist.cpp, epgview.cpp and moviebrowser.cpp


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1869 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-21 23:11:52 +00:00
micha-bbg
2b12adebe0 Display error in the title of EPG information. 
- Calculate offset for the title when logo appears.


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1799 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-01 09:00:38 +00:00
focus
28382c9aa5 Remove global allchans, use CServiceManager. 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1649 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-09-01 12:24:18 +00:00
thilo
6a9a8d6d55 *neutrino epgview: fix max value of progressbar 
see also: http://www.dbox2-tuning.net/forum/viewtopic.php?p=380156#p380156
thx Gaucho316

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1641 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-08-31 16:25:02 +00:00
focus
9dadf4ff05 Remove extern; remove timer reset 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1564 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-07-21 10:11:55 +00:00
striper
339b869b64 - remove obsolete rtl workarounds (thx Gaucho316) 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1492 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-05-25 16:47:36 +00:00
satbaby
3daae6d569 dont show logo if without Logo 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1490 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-05-24 15:11:35 +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
satbaby
7c49669d32 fix compil 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1387 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-04-11 14:00:35 +00:00
seife
90164158b3 epgview: rework hasFollowScreenings() and FollowScreenings() 
the current code has differences in hasFollowScreenings() and
FollowScreenings() leading to different results. hasFollow() returns
true but Follow() then notices that there are actually no repeats.
Fix this by making hasFollowScreenings() generate a list "followlist"
containing all repeats and FollowScreenings() use that list.
An added benefit is that the requested feature to add a possibility to
select one of the follow-ups for a record timer will be also able to
use that list ;-)

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1383 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-04-10 18:10:25 +00:00
satbaby
74d2f2ee76 -add zapto time correction option 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1281 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-03-10 14:54:57 +00:00
thilo
be9380236d *neutrino epgview: unused variable removed 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1184 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-21 09:08:41 +00:00
thilo
e1f887af72 *neutrino buttonbars: reworked painting of buttonbar in 
channellist,
stringinput (also cleared some char format problems),
audioplayer,
bouqueteditor_bouqets,
bouqueteditor_channels,
bouqueteditor_chanselect,
bookmarkmanager,,
bouquetlist,
filebrowser,
epgplus,
epgview,
pictureviewer,
timerlist,
upnpbrowser

TODO:
This is still not a final solution. I would like to see buttonhandling in
own class for better integration and handling of window structure.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1179 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-21 09:08:10 +00:00
seife
e76b372031 neutrino: make big EPG window run-time configurable 
This was configurable with "-DUSE_SPACE_EFFICIENTLY" but can easily
be integrated into the OSD menu.
TODO: better locale texts could probably be found.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@967 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-12-26 11:34:13 +00:00