Commit Graph

122 Commits

Author SHA1 Message Date
Stefan Seyfried
857402e3d4 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


Origin commit data
------------------
Commit: c480e36746
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-11 (Sun, 11 Nov 2012)
2012-11-11 01:45:22 +01:00
defans
1c1c978de7 add pictureviewer to info-key in audioplayer
Origin commit data
------------------
Commit: e145f9a5e8
Author: defans <defans@bluepeercrew.us>
Date: 2012-11-06 (Tue, 06 Nov 2012)

Origin message was:
------------------
- add pictureviewer to info-key in audioplayer
2012-11-06 23:04:55 +01:00
Stefan Seyfried
f8a42bcc53 Merge branch 'uncool/dvbsi++' commit '9578e5da35f'
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


Origin commit data
------------------
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)
2012-07-23 01:02:29 +02:00
Jacek Jendrzej
803674f9df fix gcc 4.7.x warnings
Origin commit data
------------------
Commit: 060c1c45b2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-07 (Sat, 07 Jul 2012)
2012-07-07 13:09:08 +02:00
Jacek Jendrzej
c1a5c7ceb6 pictureviewer.cpp: fix possible segfault
Origin commit data
------------------
Commit: 4f2a24899e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-05-02 (Wed, 02 May 2012)
2012-05-02 19:41:24 +02:00
Jacek Jendrzej
04be37cf14 performance Prefer prefix ++/-- operators for non-primitive types.
Origin commit data
------------------
Commit: bb347b3a44
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-04-28 (Sat, 28 Apr 2012)
2012-04-28 10:56:27 +02:00
Stefan Seyfried
3dda6ee00f 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


Origin commit data
------------------
Commit: a029333c1a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-04-01 (Sun, 01 Apr 2012)
2012-04-17 19:33:57 +02:00
Stefan Seyfried
5977a4de25 neutrino: avoid float when calculating scrollbars
Origin commit data
------------------
Commit: 37c5f7c7d3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-12-25 (Sun, 25 Dec 2011)
2012-04-17 19:33:50 +02:00
Stefan Seyfried
87b161bb16 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!


Origin commit data
------------------
Commit: 2f65aea744
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-03 (Mon, 03 Oct 2011)
2012-04-17 19:33:49 +02:00
Michael Liebmann
9765d68841 Remove old DBox2 identifier (patch by svenhoefer)
- Renaming NEUTRINO_ICON_BUTTON_DBOX* to NEUTRINO_ICON_BUTTON_MENU*
- Changed menu icons


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1839 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: fa2f642e4f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2011-11-07 (Mon, 07 Nov 2011)
2011-11-07 20:48:41 +00:00
Jacek Jendrzej
9349eb2f01 pictureviewer: -add delete pic-file option
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1520 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 083fd6923f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-06-05 (Sun, 05 Jun 2011)
2011-06-05 12:31:02 +00:00
Thilo Graf
add41797f1 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


Origin commit data
------------------
Commit: e1f887af72
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-02-21 (Mon, 21 Feb 2011)

Origin message was:
------------------
*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
gixxpunk
9bd468451f fix pictureviewer background / THX to wittinobi
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1099 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: af5475df8c
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-01-31 (Mon, 31 Jan 2011)

Origin message was:
------------------
- fix pictureviewer background / THX to wittinobi

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1099 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-01-31 19:32:38 +00:00
Jacek Jendrzej
0f2461e044 osd fixes
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@668 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 249352e5dc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-07-15 (Thu, 15 Jul 2010)
2010-07-15 11:04:22 +00:00
[CST] Focus
c6ca418526 Fixes for non-standart icon sizes. Not complete yet, work in progress. Probably will broke commit #568
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@569 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 56674d5561
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-05-06 (Thu, 06 May 2010)
2010-05-06 09:39:29 +00:00
Jacek Jendrzej
759ebe6b2d add menu rounded corners on/off
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@395 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 00d9b35c08
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-02-20 (Sat, 20 Feb 2010)

Origin message was:
------------------
-add menu rounded corners on/off

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@395 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-02-20 21:29:30 +00:00
[CST] Focus
516e738bf2 Fix picture view move; Enable hw blit for picture/logo; Move channel logo display after all channellist shown
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@273 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 022509f24e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-06 (Sat, 06 Feb 2010)
2010-02-06 15:13:12 +00:00
[CST] Focus
2e041bd948 All icon file names moved to icons.h; .raw extension removed from icon names
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@219 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 95130dee5a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-01-29 (Fri, 29 Jan 2010)
2010-01-29 14:09:57 +00:00
mws
c62aa94983 Mark unused vars as comment
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@104 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 1b13da2617
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-21 (Mon, 21 Dec 2009)
2009-12-21 16:23:09 +00:00
Jacek Jendrzej
e1f3340cbb port rounded corner code from tuxbox CVSuse getScreenStartX(),getScreenStartY(),h_max(),w_max() routines
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@87 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 49e009134b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2009-12-17 (Thu, 17 Dec 2009)
2009-12-17 09:58:55 +00:00
Stefan Seyfried
c825f0b90f neutrino: port rounded corner code from tuxbox CVS
This allows to set all four corners separately. The default is
now to have all four corners rounded if radius is > 0 in paintBoxRel.
It also places hard coded integer numbers for CORNER_TOP and
CORNER_BOTTOM with the respective #defines.
This should make it much easier to port over code parts from tuxbox.org.
However, there are probably bugs and oversights in that I did not find
yet. Reports are welcome.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@45 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: b0b471210f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2009-12-13 (Sun, 13 Dec 2009)
2009-12-13 22:23:23 +00:00
mrcolor
cb8dd3394d our current experimental Neutrino branch
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)
2009-12-08 11:05:11 +00:00