Commit Graph

140 Commits

Author SHA1 Message Date
[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
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
Michael Liebmann
55e37eb2b5 * src/gui/audioplayer.cpp: Fix osd (draw frame) 2013-04-08 16:01:27 +01:00
Stefan Seyfried
a5c6160384 audioplayer: don't free curl_handle too early 2013-04-08 10:36:18 +02:00
Stefan Seyfried
fcd65c2ce3 audioplayer: don't free curl_handle too early 2013-04-08 10:14:17 +04:00
Michael Liebmann
f1740ac21b * src/gui/audioplayer.cpp: Fix segfault in audioplayer osd 2013-04-08 10:02:40 +04:00
Michael Liebmann
9a9a347ee3 * src/gui/audioplayer.cpp: Fix segfault in audioplayer osd 2013-04-07 22:07:38 +01:00
Stefan Seyfried
4a1cb03e82 audioplayer: don't free curl_handle too early 2013-04-07 17:57:58 +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
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
8048673dec Merge branch 'check/next' into master
Conflicts:
	data/locale/english.locale
	src/neutrino.cpp
	src/system/setting_helpers.cpp
2013-03-07 17:10:11 +01:00
Thilo Graf
bdce50780d CAudioPlayerGui: set missing corner mode for info box 2013-03-06 11:51:38 +01:00
Thilo Graf
14f8e63cc9 CAudioPlayer: adapt for last changes in CComponents 2013-03-06 11:27:53 +01:00
Thilo Graf
360feb8db9 CAudioPlayerGui: adapt to current CComponentsInfoBox changes 2013-03-06 11:27:50 +01:00
svenhoefer
ca8f8251ed - audioplayer.cpp: fix comparison operator 2013-02-28 10:02:59 +01:00
svenhoefer
57317aae31 - audioplayer.cpp: reducing console spam 2013-02-27 21:23:15 +01:00
Stefan Seyfried
0cf191822a Merge branch 'check/dvbsi++' commit 5db16ee2ff
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
2013-02-21 17:07:18 +01:00
svenhoefer
ac3e482cca - audioplayer.cpp: center horizontally 2013-02-20 23:52:30 +01:00
svenhoefer
92e6d383bd - audioplayer.cpp: fix display of buttons and round corners in footer 2013-02-20 03:00:09 +01:00
svenhoefer
178ec028cb - audioplayer: don't paint something if screensaver is active 2013-02-20 02:09:26 +01:00
svenhoefer
ed52353607 - audioplayer.cpp: remove not working code with mute-icon handling 2013-02-20 00:59:39 +01:00
svenhoefer
95b51f6993 - audioplayer.cpp: ignore first keypress when screensaver is on
just quit the screensaver and return to loop
2013-02-19 22:09:47 +01:00
svenhoefer
59642214f7 - audioplayer.cpp: fix cursor-background with round borders 2013-02-19 11:11:58 +01:00
svenhoefer
6e828fa0a4 - audioplayer.cpp: restore correct background when leaving screensaver
and remove background-pic from screensaver-loop
2013-02-19 00:11:12 +01:00
Stefan Seyfried
e5e7d52fa1 Merge branch 'uncool/dvbsi++'
Conflicts:
	data/icons/border_lr.png
	data/icons/border_ul.png
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/system/setting_helpers.cpp
2012-11-23 18:45:22 +01:00
[CST] Focus
6d7f1efd06 gui/audioplayer.cpp: return menu_return::RETURN_EXIT_ALL on standby/shutdown,
thanks satbaby for patch
2012-11-16 15:45:39 +04: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
snafed
e145f9a5e8 - add pictureviewer to info-key in audioplayer 2012-11-06 23:04:55 +01: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
dc95ffa37c - audioplayer: fix memleak (THX martii) 2012-10-11 21:05:44 +02:00
Stefan Seyfried
25446f7408 get rid of NEW_CURL hack, this API is long obsolete 2012-10-06 17:29:09 +02:00
satbaby
87342fd0d9 my_system fix 2012-09-15 11:20:49 +02:00
satbaby
86632f0369 if curl version 2012-09-12 18:28:11 +02:00
satbaby
c6ae7255ac -add wakeup_hdd & file_exists to system-helpers 2012-09-11 20:35:47 +02:00
satbaby
3389defb17 start SCRIPTs with-my_system 2012-09-11 20:33:34 +02:00
satbaby
a3bfab0bcd remove doubles include 2012-09-11 20:31:33 +02:00
micha-bbg
e7a1dca8ea * Audioplayer: Small display bugs fixed
- Use 'full paint' for infobox
2012-07-23 09:07:11 +01: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
micha-bbg
52a5640bc2 * Audioplayer: Small display bugs fixed 2012-07-22 18:30:19 +01:00
micha-bbg
64b3debba2 * Audioplayer: CComponentsInfoBox use to paint infobox 2012-07-22 17:16:38 +01:00
Thilo Graf
261904acd0 *neutrino: remove dub code
using class 'CComponentsDetailLine' instead multiple code
details line rendering
2012-07-16 22:28:02 +02:00
satbaby
d2b948933a fix tiny OSD shadow 2012-07-12 17:58:32 +02:00
satbaby
1196a01818 fix OSD 2012-07-11 15:59:41 +02:00
satbaby
060c1c45b2 fix gcc 4.7.x warnings 2012-07-07 13:09:08 +02:00
[CST] Focus
4c2ad26dea gui/audioplayer.cpp: add urls from m3u 2012-06-18 15:04:31 +04: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
f32e7bdeb4 gui/audioplayer.cpp: fix sms-input for title search 2012-06-14 16:47:12 +04:00