Commit Graph

433 Commits

Author SHA1 Message Date
martii
5dfa57d162 widget/menu: print right icon regardless of activation status
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8f4eee554c
Author: martii <m4rtii@gmx.de>
Date: 2013-04-08 (Mon, 08 Apr 2013)


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

------------------
This commit was generated by Migit
2013-07-18 14:51:58 +04:00
martii
3f20773129 CMenuWidget: add action keys
Conflicts:
	src/gui/widget/menue.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d187e56da
Author: martii <m4rtii@gmx.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)



------------------
This commit was generated by Migit
2013-07-18 14:51:58 +04:00
[CST] Focus
2d41d8a39b gui/widget/menue.cpp: add CMenuItem isStatic param, (c) martii <m4rtii@gmx.de>
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b5bbf8911
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-05 (Fri, 05 Jul 2013)


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

------------------
This commit was generated by Migit
2013-07-18 14:51:58 +04:00
Christian Schuett
2a9c3fd150 menue.cpp: fix macro usage of SUB_HEAD
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7702408456
Author: Christian Schuett <Gaucho316@hotmail.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)

Origin message was:
------------------
- menue.cpp: fix macro usage of SUB_HEAD

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

------------------
This commit was generated by Migit
2013-07-15 23:16:44 +02:00
Stefan Seyfried
7e692549d3 Merge branch 'check/next-cc'
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)



------------------
This commit was generated by Migit
2013-07-06 19:01:15 +02:00
Michael Liebmann
2dae834a11 Revert "CMenuForwarder: Use std::string (not pointer to std::string or char) for option"
This reverts commit 1c1cec1dde.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f4d598b1e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-04 (Thu, 04 Jul 2013)



------------------
This commit was generated by Migit
2013-07-04 07:45:51 +02:00
Michael Liebmann
1c1cec1dde CMenuForwarder: Use std::string (not pointer to std::string or char) for option
Origin commit data
------------------
Branch: ni/coolstream
Commit: b5d1322617
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-04 (Thu, 04 Jul 2013)


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

------------------
This commit was generated by Migit
2013-07-04 02:05:33 +02:00
Michael Liebmann
815dc461c3 CMenuWidget: fix simplified up/down code
- supplement to 834266d04a


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4003d5f434
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-01 (Mon, 01 Jul 2013)



------------------
This commit was generated by Migit
2013-07-01 12:49:37 +02:00
Stefan Seyfried
04b6854d11 CMenuWidget: fix simplified up/down code
Origin commit data
------------------
Branch: ni/coolstream
Commit: ecef1e8ab8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)


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

------------------
This commit was generated by Migit
2013-06-20 12:13:54 +02:00
Stefan Seyfried
834266d04a CMenuWidget: simplify up/down selection code
Origin commit data
------------------
Branch: ni/coolstream
Commit: c5186c82dd
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-20 12:13:04 +02:00
Stefan Seyfried
e599bbfd51 menu: fix artifacts on page change
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4774366474
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-20 12:12:29 +02:00
Stefan Seyfried
e1706580fc menu: make page_start[] int, avoids lots of casts
Origin commit data
------------------
Branch: ni/coolstream
Commit: ed039d6ba9
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-20 12:11:45 +02:00
Stefan Seyfried
430444ff21 CMenuWidget: fix simplified up/down code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e2e647745
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)


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

------------------
This commit was generated by Migit
2013-06-16 21:37:49 +02:00
Stefan Seyfried
4c3c21152b Merge branch 'check/next-cc'
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)



------------------
This commit was generated by Migit
2013-06-16 21:22:14 +02:00
[CST] Focus
6b3f06fb8b set infobox color to COL_MENUCONTENTDARK_PLUS_0:
same color as main window looks boring, probably make sense to add color config option for this


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4850e6d77a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-10 (Mon, 10 Jun 2013)



------------------
This commit was generated by Migit
2013-06-10 15:59:21 +04:00
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
vanhofen
e7cc33ba1f menue-widget: set header-offset and align sub-headers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07b4716ebf
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-30 (Thu, 30 May 2013)

Origin message was:
------------------
- menue-widget: set header-offset and align sub-headers

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

------------------
This commit was generated by Migit
2013-05-30 23:06:27 +02:00
vanhofen
fb308c6334 neutrino: don't save screen while paint headers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c41ffbe47
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-28 (Tue, 28 May 2013)

Origin message was:
------------------
- neutrino: don't save screen while paint headers

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

------------------
This commit was generated by Migit
2013-05-28 10:42:39 +02:00
vanhofen
47ca75e764 menue-widget: using CComponentsHeader to paint header
Origin commit data
------------------
Branch: ni/coolstream
Commit: d3f259444e
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-28 (Tue, 28 May 2013)

Origin message was:
------------------
- menue-widget: using CComponentsHeader to paint header

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

------------------
This commit was generated by Migit
2013-05-28 02:16:38 +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