Commit Graph

165 Commits

Author SHA1 Message Date
Stefan Seyfried
0b7367ec22 CMenuWidget: simplify up/down selection code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 49f875508e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-02 (Sun, 02 Jun 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-06-02 23:39:51 +02:00
Stefan Seyfried
cf52c972db menu: fix artifacts on page change
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0ad51e7964
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-02 (Sun, 02 Jun 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-06-02 21:33:26 +02:00
Stefan Seyfried
35ebdb1943 menu: make page_start[] int, avoids lots of casts
Origin commit data
------------------
Branch: ni/coolstream
Commit: c5760c6a27
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-02 (Sun, 02 Jun 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-06-02 20:31:42 +02:00
Stefan Seyfried
07ccb9a351 Merge remote-tracking branch 'check/next-cc'
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)



------------------
This commit was generated by Migit
2013-05-24 20:24:39 +02:00
Stefan Seyfried
00cfd31e82 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).


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6b72095f5a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)



------------------
This commit was generated by Migit
2013-05-11 17:17:33 +02:00
Jacek Jendrzej
a5bd75527a supplement to 0c34433d23
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a62b97fcb
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-10 (Fri, 10 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-10 13:43:23 +02:00
Stefan Seyfried
083bc55347 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)



------------------
This commit was generated by Migit
2013-05-10 10:06:47 +02:00
Jacek Jendrzej
0c34433d23 CMenuWidget::paintItems: clean only last multipage menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 28198dc320
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-09 (Thu, 09 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-09 13:10:23 +02:00
Jacek Jendrzej
c8a7e2e6a8 src/gui/widget/menue.cpp: don't paint icon if no space for this
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f552797b4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-29 21:08:44 +02:00
[CST] Focus
0c3a4fa858 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8bb70d1ab3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-17 (Wed, 17 Apr 2013)



------------------
This commit was generated by Migit
2013-04-17 13:32:12 +04:00
Stefan Seyfried
7254e280e3 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ad0b6b6dc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 11:21:55 +02:00
vanhofen
0cad5bca1a 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4714a30f83
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)

Origin message was:
------------------
- 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


------------------
This commit was generated by Migit
2013-04-01 15:42:38 +04:00
[CST] Focus
785bca0d55 gui/widget/menue.cpp: fix CMenuForwarderNonLocalized::getWidth
Origin commit data
------------------
Branch: ni/coolstream
Commit: f21b291fcd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-29 (Fri, 29 Mar 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-29 17:12:23 +04:00
vanhofen
ed04cfdf36 strech most windows to full screen
* switchable with existing switch for 'big_windows'
* 'big_windows' default is on


Origin commit data
------------------
Branch: ni/coolstream
Commit: 759966f935
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)

Origin message was:
------------------
- strech most windows to full screen

* switchable with existing switch for 'big_windows'
* 'big_windows' default is on


------------------
This commit was generated by Migit
2013-03-25 09:45:22 +01:00
Thilo Graf
548275165e CMenuWidget: branch devel_cc Fix merge errors
Some braces were lost during the last merges.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ac1550277
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-16 (Sat, 16 Feb 2013)



------------------
This commit was generated by Migit
2013-03-06 11:28:16 +01:00
Thilo Graf
543b12adaf CMenuWidget: set frame thickness
default value in CComponentsInfoBox is inherit from CComponentsContainer
and =0, baut we need =2


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7df6748f74
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-23 (Thu, 23 Aug 2012)



------------------
This commit was generated by Migit
2013-03-06 11:27:55 +01:00
Thilo Graf
ad9dde6549 CMenuWidget: init instance of CComponentsDetailsLine in constructor
Origin commit data
------------------
Branch: ni/coolstream
Commit: 12cb192341
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-22 (Wed, 22 Aug 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-06 11:27:55 +01:00
Thilo Graf
8394800e86 CComponentsInfoBox: create instance of CComponentsInfoBox in constructor
Origin commit data
------------------
Branch: ni/coolstream
Commit: 232933f9fc
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-22 (Wed, 22 Aug 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-06 11:27:55 +01:00
Michael Liebmann
ea270a1897 CMenuWidget: Use removeLineBreaks() in paintHint()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2101a32862
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-08-20 (Mon, 20 Aug 2012)

Origin message was:
------------------
* CMenuWidget: Use removeLineBreaks() in paintHint()

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-06 11:27:54 +01:00
Michael Liebmann
191bc734dc CMenuWidget: Remove line breaks from hint text
- Add font to Constructor & setText()
- remove CTextBox::AUTO_HIGH


Origin commit data
------------------
Branch: ni/coolstream
Commit: ff12f2b5b5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-08-20 (Mon, 20 Aug 2012)



------------------
This commit was generated by Migit
2013-03-06 11:27:54 +01:00
Thilo Graf
69b54672a6 CMenuWidget: implement CComponentsInfoBox functionality for text and icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: 53ff9cdddf
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-19 (Sun, 19 Aug 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-06 11:27:53 +01:00
Thilo Graf
5e197adea3 CMenuWidget: adapt for last changes in CComponents
Origin commit data
------------------
Branch: ni/coolstream
Commit: b0f9cde09f
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-16 (Thu, 16 Aug 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-06 11:27:52 +01:00
Thilo Graf
ecc673379b CMenuWidget: define system colors during runtime
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9027ac6fba
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-04 (Sat, 04 Aug 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-06 11:27:51 +01:00
Thilo Graf
53ee38c801 CComponents: add more basic members and sub classes
- change default colors for info box
- add member methode to synchronize system colors
- add class CComponentsShapeCircle
- add class CComponentsShapeSquare
- add sub class CComponentsPIP


Origin commit data
------------------
Branch: ni/coolstream
Commit: 485dca43e2
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-03 (Fri, 03 Aug 2012)



------------------
This commit was generated by Migit
2013-03-06 11:27:51 +01:00
Thilo Graf
a635bfb3e0 CMenuWidget: adapt to current CComponentsInfoBox changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 03d276d90a
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-03 (Fri, 03 Aug 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-06 11:27:51 +01:00
Thilo Graf
f48a1e9950 menu.cpp: refresh radius settings
Changed corner settings in osd setup
have no effect in unchanged menu widget instances.


Origin commit data
------------------
Branch: ni/coolstream
Commit: ec2c78537c
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-01 (Wed, 01 Aug 2012)

Origin message was:
------------------
*menu.cpp: refresh radius settings

Changed corner settings in osd setup
have no effect in unchanged menu widget instances.


------------------
This commit was generated by Migit
2013-03-06 11:27:50 +01:00
[CST] Focus
2e6fcdcd28 gui/widget/menue.cpp: dont allow to exec non-active item -
in case old, selected, was disabled


Origin commit data
------------------
Branch: ni/coolstream
Commit: e178488bf4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)



------------------
This commit was generated by Migit
2013-01-09 16:19:08 +04:00
Stefan Seyfried
a07b5d6289 Merge branch 'uncool/dvbsi++' commit c6136d612f
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)



------------------
This commit was generated by Migit
2012-12-30 21:35:20 +01:00
[CST] Focus
c01d9a470c gui/widget/menue.cpp: fix hintbox color if theme changed;
fix hint paint for page-up button


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ea053c2e9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)



------------------
This commit was generated by Migit
2012-11-21 20:37:54 +04:00
Stefan Seyfried
f849ff2612 menuewidget: fix menu position code after last uncool merge
Origin commit data
------------------
Branch: ni/coolstream
Commit: ad959d9e08
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-11-03 12:33:52 +01:00
Stefan Seyfried
58ca3266e7 Merge branch 'uncool/dvbsi++' commit '9d1444a8df5'
...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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e23ac7223
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)



------------------
This commit was generated by Migit
2012-11-03 10:45:33 +01:00
Stefan Seyfried
68cc0c3a78 add CRCInput::getKeyNameC to fix lifetime issues
in menu.cpp, getKeyName().c_str()'s destructor was already invoked
when the value was used, triggering a valgrind warning.


Origin commit data
------------------
Branch: ni/coolstream
Commit: d5d136f6c1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-31 (Wed, 31 Oct 2012)



------------------
This commit was generated by Migit
2012-10-31 22:52:12 +01:00
Stefan Seyfried
a5a0e909b9 CMenuWidget: fix width calculation for large menus
with small screen offsets, large menus could get too large for
the screen and displayed outside -> possible segfault


Origin commit data
------------------
Branch: ni/coolstream
Commit: 047223440b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-31 (Wed, 31 Oct 2012)



------------------
This commit was generated by Migit
2012-10-31 21:17:40 +01:00
[CST] Focus
d75e4c5114 gui/widget/menue.cpp:
always call paintHint(-1) in hide() to clear hintbox;
comment additional hintbox w/h from full_width/full_height - CComponents should clear itself;
dont always save/restore menu hint screens - why it was enabled ??
comment GenericMenuBack->setHint() in ::exec - checkHints() do the same


Origin commit data
------------------
Branch: ni/coolstream
Commit: 405ac286e3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-19 (Fri, 19 Oct 2012)



------------------
This commit was generated by Migit
2012-10-19 19:30:28 +04:00
Stefan Seyfried
a603ec74af Merge branch 'uncool/dvbsi++' commit 'd493b1155c4'
...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


Origin commit data
------------------
Branch: ni/coolstream
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)



------------------
This commit was generated by Migit
2012-10-14 12:51:07 +02:00
Stefan Seyfried
9eaeb2866d Merge branch 'neutrino-hd-tripledragon' into neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e46d81b88
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-09-15 (Sat, 15 Sep 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-09-15 12:14:33 +02:00
Jacek Jendrzej
05b3a3949f moviebrowser.cpp: -fix2 vfd
Origin commit data
------------------
Branch: ni/coolstream
Commit: e45aa72605
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-14 (Fri, 14 Sep 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-09-14 20:12:04 +02:00
Jacek Jendrzej
67c5d7c91e remove doubles include
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-09-11 20:31:33 +02:00
Jacek Jendrzej
f748a12ede fixes strncpy & buf size
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7359504dd7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)

Origin message was:
------------------
-fixes strncpy & buf size

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-08-07 18:51:44 +02:00
Stefan Seyfried
6188182b7d neutrino: fix menu position for right or bottom aligned
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6ff06736a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-28 (Sat, 28 Jul 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-07-28 23:50:03 +02:00
Michael Liebmann
c864b01a1b CComponentsInfoBox: Small display bug fixed
Origin commit data
------------------
Branch: ni/coolstream
Commit: bc8128d8d7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)

Origin message was:
------------------
* CComponentsInfoBox: Small display bug fixed

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-07-25 04:37:01 +01:00
[CST] Focus
fea9918329 gui/widget/menue.cpp: disable 'back' hint, if no other hints present
Origin commit data
------------------
Branch: ni/coolstream
Commit: 04f1e9c3f2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-07-24 15:13:18 +04:00
Michael Liebmann
6e01d25546 src/gui/widget/menue.cpp: Comment paintHint debug output
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1511edb51e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)

Origin message was:
------------------
* src/gui/widget/menue.cpp: Comment paintHint debug output

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-07-23 23:49:03 +01:00
Stefan Seyfried
3df9a6f7f5 Merge branch 'uncool/dvbsi++' commit '9d968280bac'
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
------------------
Branch: ni/coolstream
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)



------------------
This commit was generated by Migit
2012-07-23 01:02:29 +02:00
Michael Liebmann
0b99e46673 CComponentsInfoBox: Switch parameter h and w in constructor
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-07-22 17:16:37 +01:00
Michael Liebmann
4dc2ee9898 Correct restore the screen to exit menu
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-07-22 17:16:37 +01:00
Michael Liebmann
96301e61af CComponentsInfoBox: save/restore screen
- Own save/restore screen routine
- Shadow can be switched off
- Small fixes


Origin commit data
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2012-07-22 17:16:37 +01:00
Thilo Graf
cfcaafb816 components: add members for generic paint, hide and restore items
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-07-22 17:16:36 +01:00
Thilo Graf
d0dbe37f8c menu: ensure also correct x-position of details line
It's possible that x pos is changeing during runtime


Origin commit data
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2012-07-22 17:16:36 +01:00
[CST] Focus
13881627ac src/gui/widget/menue.cpp: fix crash, if class inherit from CMenuWidget
i.e. CFileChooser


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2a0c197c1f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-19 (Thu, 19 Jul 2012)



------------------
This commit was generated by Migit
2012-07-19 17:35:23 +04:00