Commit Graph

3809 Commits

Author SHA1 Message Date
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
Michael Liebmann
589b84a6b2 Audioplayer: Small display bugs fixed
Origin commit data
------------------
Commit: 52a5640bc2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-22 (Sun, 22 Jul 2012)

Origin message was:
------------------
* Audioplayer: Small display bugs fixed
2012-07-22 18:30:19 +01:00
Michael Liebmann
a1d536bbc0 Menu hints: Update deutsch.locale
- German Translations Part 8 (THX Tomworld)


Origin commit data
------------------
Commit: 3127a48745
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-22 (Sun, 22 Jul 2012)

Origin message was:
------------------
* Menu hints: Update deutsch.locale

- German Translations Part 8 (THX Tomworld)
2012-07-22 17:16:38 +01:00
Michael Liebmann
ec1a792f4b Audioplayer: CComponentsInfoBox use to paint infobox
Origin commit data
------------------
Commit: 64b3debba2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-22 (Sun, 22 Jul 2012)

Origin message was:
------------------
* Audioplayer: CComponentsInfoBox use to paint infobox
2012-07-22 17:16:38 +01:00
Michael Liebmann
338eac0845 Bouqueteditor: CComponentsInfoBox use to paint infobox
Origin commit data
------------------
Commit: 28b602a8b3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-22 (Sun, 22 Jul 2012)

Origin message was:
------------------
* Bouqueteditor: CComponentsInfoBox use to paint infobox
2012-07-22 17:16:38 +01:00
Michael Liebmann
978f8406ad CComponentsInfoBox: Switch parameter h and w in constructor
Origin commit data
------------------
Commit: a5d8bd4e13
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-22 (Sun, 22 Jul 2012)

Origin message was:
------------------
* CComponentsInfoBox: Switch parameter h and w in constructor
2012-07-22 17:16:37 +01:00
Michael Liebmann
e1073714c3 CComponentsInfoBox: Optimize display
- Paint full info box only when activating the menu,
 otherwise only body paint


Origin commit data
------------------
Commit: cb375cc214
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-22 (Sun, 22 Jul 2012)

Origin message was:
------------------
* CComponentsInfoBox: Optimize display

- Paint full info box only when activating the menu,
 otherwise only body paint
2012-07-22 17:16:37 +01:00
Michael Liebmann
c4e6dfb87e Correct restore the screen to exit menu
Origin commit data
------------------
Commit: ecadf79a8f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)

Origin message was:
------------------
* Correct restore the screen to exit menu
2012-07-22 17:16:37 +01:00
Michael Liebmann
e18fb3a28e CComponentsInfoBox: save/restore screen
- Own save/restore screen routine
- Shadow can be switched off
- Small fixes


Origin commit data
------------------
Commit: 1a654403cc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)

Origin message was:
------------------
* CComponentsInfoBox: save/restore screen

- Own save/restore screen routine
- Shadow can be switched off
- Small fixes
2012-07-22 17:16:37 +01:00
Thilo Graf
f9135ddc11 CBEChannelSelectWidget: remove old detail line handing
add dline instance from CComponentsDetailsLine


Origin commit data
------------------
Commit: dd9086b84d
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-07-19 (Thu, 19 Jul 2012)

Origin message was:
------------------
*CBEChannelSelectWidget: remove old detail line handing

add dline instance from CComponentsDetailsLine
2012-07-22 17:16:37 +01:00
Thilo Graf
b839349bf2 CBEChannelWidget: rework details line handling
Origin commit data
------------------
Commit: 2aa30d7303
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-07-19 (Thu, 19 Jul 2012)

Origin message was:
------------------
*CBEChannelWidget: rework details line handling
2012-07-22 17:16:37 +01:00
Thilo Graf
8b307bae3a CBEBouquetWidget: add missing init for some members with NULL
Origin commit data
------------------
Commit: 672d2db9ff
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-07-19 (Thu, 19 Jul 2012)

Origin message was:
------------------
*CBEBouquetWidget: add missing init for some members with NULL
2012-07-22 17:16:36 +01:00
Thilo Graf
58a5c418a8 components: add members for generic paint, hide and restore items
Origin commit data
------------------
Commit: bc01ed9a86
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-07-19 (Thu, 19 Jul 2012)

Origin message was:
------------------
*components: add members for generic paint, hide and restore items
2012-07-22 17:16:36 +01:00
Thilo Graf
5faf46cfc5 menu: ensure also correct x-position of details line
It's possible that x pos is changeing during runtime


Origin commit data
------------------
Commit: 084fb88f50
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-07-17 (Tue, 17 Jul 2012)

Origin message was:
------------------
*menu: ensure also correct x-position of details line

It's possible that x pos is changeing during runtime
2012-07-22 17:16:36 +01:00
vanhofen
a8efa2f60c yweb: rework, localize and enable backup/restore
Origin commit data
------------------
Commit: 17fd189410
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-21 (Sat, 21 Jul 2012)

Origin message was:
------------------
- yweb: rework, localize and enable backup/restore
2012-07-21 23:31:59 +02:00
vanhofen
4d8c70213f yweb: remove obsolete ucodes-code
Origin commit data
------------------
Commit: 48dea3faf0
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-21 (Sat, 21 Jul 2012)

Origin message was:
------------------
- yweb: remove obsolete ucodes-code
2012-07-21 12:53:18 +02:00
[CST] Focus
6fb493b28c Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 07bac9d650
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-21 (Sat, 21 Jul 2012)
2012-07-21 12:51:45 +04:00
vanhofen
1e80a3dfdf yweb: increase version (for two commits)
Origin commit data
------------------
Commit: 05c4897504
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-20 (Fri, 20 Jul 2012)

Origin message was:
------------------
- yweb: increase version (for two commits)
2012-07-20 23:46:39 +02:00
vanhofen
4b5f312a1f yweb: rework and enable movieplayer-settings
Origin commit data
------------------
Commit: a62210d974
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-20 (Fri, 20 Jul 2012)

Origin message was:
------------------
- yweb: rework and enable movieplayer-settings
2012-07-20 23:45:13 +02:00
vanhofen
28e97fea5a yweb: missing u
Origin commit data
------------------
Commit: 39a44545e0
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-20 (Fri, 20 Jul 2012)

Origin message was:
------------------
- yweb: missing u
2012-07-20 22:41:40 +02:00
vanhofen
a10b6e6511 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: e5708d0830
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-20 (Fri, 20 Jul 2012)
2012-07-20 22:36:29 +02:00
vanhofen
ca3707363d yweb: rework and enable zapit-settings
Origin commit data
------------------
Commit: f6ae36664e
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-20 (Fri, 20 Jul 2012)

Origin message was:
------------------
- yweb: rework and enable zapit-settings
2012-07-20 22:35:32 +02:00
Michael Liebmann
9a22e66abf Menu hints: Update deutsch.locale
- German Translations Part 7 (THX Tomworld & Klauser)


Origin commit data
------------------
Commit: 6cfa504168
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)

Origin message was:
------------------
* Menu hints: Update deutsch.locale

- German Translations Part 7 (THX Tomworld & Klauser)
2012-07-20 21:03:49 +01:00
vanhofen
fc7d9d2644 osd_setup.cpp: remove double include
Origin commit data
------------------
Commit: 9b66c00d04
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-20 (Fri, 20 Jul 2012)

Origin message was:
------------------
- osd_setup.cpp: remove double include
2012-07-20 17:50:11 +02:00
vanhofen
4eddf86942 yweb: increase version
Origin commit data
------------------
Commit: c4e5336619
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-20 (Fri, 20 Jul 2012)

Origin message was:
------------------
- yweb: increase version
2012-07-20 17:06:27 +02:00
vanhofen
332d5deaeb yweb: fix directory for records in timersettings; move block to Y_neutrino_Blocks.txt
Origin commit data
------------------
Commit: eee9f078b0
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-20 (Fri, 20 Jul 2012)

Origin message was:
------------------
- yweb: fix directory for records in timersettings; move block to Y_neutrino_Blocks.txt
2012-07-20 17:02:13 +02:00
[CST] Focus
3e1fe47ba8 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: d593f8e859
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)
2012-07-20 13:30:34 +04:00
vanhofen
3a707e92fa yweb: fix start directory for pictureviewer
Origin commit data
------------------
Commit: 2d0cc14810
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-20 (Fri, 20 Jul 2012)

Origin message was:
------------------
- yweb: fix start directory for pictureviewer
2012-07-20 11:14:37 +02:00
vanhofen
37d81a80b2 yweb: fix start directory for audioplayer
Origin commit data
------------------
Commit: 250708158a
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-20 (Fri, 20 Jul 2012)

Origin message was:
------------------
- yweb: fix start directory for audioplayer
2012-07-20 10:32:55 +02:00
vanhofen
856b99c995 yes - it's a png
Origin commit data
------------------
Commit: 5af87e238b
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-19 (Thu, 19 Jul 2012)

Origin message was:
------------------
- yes - it's a png
2012-07-19 21:28:47 +02:00
vanhofen
faec4c7028 mainmenu: add an icon for tv-radio-switch
Origin commit data
------------------
Commit: e391ea7dfd
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-19 (Thu, 19 Jul 2012)

Origin message was:
------------------
- mainmenu: add an icon for tv-radio-switch
2012-07-19 21:23:53 +02:00
[CST] Focus
4f0ab46459 src/gui/moviebrowser.cpp: use 'cancel' button in movie start menu
Origin commit data
------------------
Commit: 3c7a4441de
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-19 (Thu, 19 Jul 2012)
2012-07-19 17:54:18 +04:00
[CST] Focus
366d26c530 src/gui/widget/menue.cpp: fix crash, if class inherit from CMenuWidget
i.e. CFileChooser


Origin commit data
------------------
Commit: 2a0c197c1f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-19 (Thu, 19 Jul 2012)
2012-07-19 17:35:23 +04:00
[CST] Focus
0559c2f84f gui/widget/menue.cpp: dont repaint menu on help key, if no hints
Origin commit data
------------------
Commit: e52367edd8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-19 (Thu, 19 Jul 2012)
2012-07-19 17:30:53 +04:00
[CST] Focus
fe0a7020ad Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 821c3e1bff
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-19 (Thu, 19 Jul 2012)
2012-07-19 17:02:44 +04:00
Michael Liebmann
1a8b51beb9 Menu hints: Update deutsch.locale
- German Translations Part 6 (THX Tomworld)
- Fix typo in english.locale


Origin commit data
------------------
Commit: c5c8e1019a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-19 (Thu, 19 Jul 2012)

Origin message was:
------------------
* Menu hints: Update deutsch.locale

- German Translations Part 6 (THX Tomworld)
- Fix typo in english.locale
2012-07-19 12:03:33 +01:00
[CST] Focus
97bc5fa04f Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: a326f4e294
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-19 (Thu, 19 Jul 2012)
2012-07-19 11:12:42 +04:00
Michael Liebmann
b82f61e3b1 Menu hints: Update deutsch.locale
- German Translations Part 5 (THX Tomworld)


Origin commit data
------------------
Commit: fb4d4644c9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-19 (Thu, 19 Jul 2012)

Origin message was:
------------------
* Menu hints: Update deutsch.locale

- German Translations Part 5 (THX Tomworld)
2012-07-19 05:47:08 +01:00
Michael Liebmann
f03daabcd7 Fix segfault in bouquet editor
Origin commit data
------------------
Commit: edcf2940b8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-19 (Thu, 19 Jul 2012)

Origin message was:
------------------
* Fix segfault in bouquet editor
2012-07-19 05:47:08 +01:00
Stefan Seyfried
980fec5a11 hintboxext: fix for too long lines
text offset was calculated wrong if lines too long to fit on the
screen were present, leading to all sorts of graphics corruptions
(e.g. visible with the simple test.sh script from tuxbox wiki)


Origin commit data
------------------
Commit: b04ab099b2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-18 (Wed, 18 Jul 2012)
2012-07-18 21:01:34 +02:00
[CST] Focus
897c2b8e5d Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 4046849a9e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
2012-07-18 16:01:57 +04:00
[CST] Focus
a9e9d38fa1 gui/widget/menue.cpp: paint body without head;
disable menu name display on VFD - it overwritten by option name anyway;
little cleanup


Origin commit data
------------------
Commit: 00f77bec3d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
2012-07-18 16:01:48 +04:00
Michael Liebmann
93f1e0bb47 CComponentsInfoBox: missing shadow
- Removed wrong parameter 'rad' from function call CComponentsInfoBox


Origin commit data
------------------
Commit: 301193ce01
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)

Origin message was:
------------------
* CComponentsInfoBox: missing shadow

- Removed wrong parameter 'rad' from function call CComponentsInfoBox
2012-07-17 21:36:57 +01:00
Michael Liebmann
7e741fd513 Fix the position of CComponentsDetailLine
Origin commit data
------------------
Commit: ea33afbcf8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)

Origin message was:
------------------
* Fix the position of CComponentsDetailLine
2012-07-17 20:52:55 +01:00
Michael Liebmann
c86c08c34d Use CComponentsInfoBox for menu hint
Origin commit data
------------------
Commit: fd1ec29d83
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)

Origin message was:
------------------
* Use CComponentsInfoBox for menu hint
2012-07-17 20:52:55 +01:00
Michael Liebmann
c211d02979 Add CComponentsInfoBox to CComponents
Origin commit data
------------------
Commit: 5c862f76a9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)

Origin message was:
------------------
* Add CComponentsInfoBox to CComponents
2012-07-17 20:52:55 +01:00
vanhofen
b36814843f deutsch.locale: infobar isn't a "statusbalken"
Origin commit data
------------------
Commit: 34368532d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-17 (Tue, 17 Jul 2012)

Origin message was:
------------------
- deutsch.locale: infobar isn't a "statusbalken"
2012-07-17 15:53:33 +02:00
[CST] Focus
eee259215d Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 7d213f1d15
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
2012-07-17 17:39:35 +04:00
vanhofen
9ceb7763e1 deutsch.locale: some litte corrections
Origin commit data
------------------
Commit: 27006d2719
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-17 (Tue, 17 Jul 2012)

Origin message was:
------------------
- deutsch.locale: some litte corrections
2012-07-17 15:31:23 +02:00
Thilo Graf
0f4bc40ec7 components: remove inherit setWidth() member
Is already declared as virtual member in basic class


Origin commit data
------------------
Commit: 491519c4b5
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-07-17 (Tue, 17 Jul 2012)

Origin message was:
------------------
*components: remove inherit setWidth() member

Is already declared as virtual member in basic class
2012-07-17 15:17:17 +02:00