Commit Graph

504 Commits

Author SHA1 Message Date
Jacek Jendrzej
b63295eeb2 fix segfault with static item, supplement to 69ae7d89e3f179a4263abbadc6cc7951607a3854
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9a638ac416
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-03-23 (Sat, 23 Mar 2019)


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

------------------
This commit was generated by Migit
2019-03-23 11:36:17 +01:00
Jacek Jendrzej
bb95ae15ac widget/menue fix memleak, CMenuWidget::removeItem
Origin commit data
------------------
Branch: ni/coolstream
Commit: 34ac796ffa
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-03-20 (Wed, 20 Mar 2019)


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

------------------
This commit was generated by Migit
2019-03-20 15:43:16 +01:00
Thilo Graf
17b2d980bf CMenuOptionStringChooser: remember last item
useful for some cases if needed, default off


Origin commit data
------------------
Branch: ni/coolstream
Commit: d41b2ce0bc
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-03-18 (Mon, 18 Mar 2019)



------------------
This commit was generated by Migit
2019-03-18 16:44:35 +01:00
Thilo Graf
4e04a8079a /widget/menue.h/cpp: add missing signal OnAfterChangeOption()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0462547303
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-03-12 (Tue, 12 Mar 2019)


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

------------------
This commit was generated by Migit
2019-03-12 22:00:11 +01:00
Thilo Graf
16054dec6e themes: move rounded corners to theme section
Origin commit data
------------------
Branch: ni/coolstream
Commit: 77b62807db
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-02-11 (Mon, 11 Feb 2019)


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

------------------
This commit was generated by Migit
2019-02-11 21:49:08 +01:00
vanhofen
3ce43fb360 menu: add condition to enable/disable items in record mode (version 2)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5246233088
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-08-03 (Fri, 03 Aug 2018)

Origin message was:
------------------
- menu: add condition to enable/disable items in record mode (version 2)

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

------------------
This commit was generated by Migit
2018-08-03 22:34:14 +02:00
vanhofen
336b70f490 Revert "- menu: add condition to enable/disable items in record mode"
This reverts commit ac9f00f0d3.
Doesn't work with current disableByCondition-code. This needs more care.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2154812c84
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-08-02 (Thu, 02 Aug 2018)



------------------
This commit was generated by Migit
2018-08-02 22:00:54 +02:00
vanhofen
ac9f00f0d3 menu: add condition to enable/disable items in record mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5bc33322c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-08-02 (Thu, 02 Aug 2018)

Origin message was:
------------------
- menu: add condition to enable/disable items in record mode

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

------------------
This commit was generated by Migit
2018-08-02 21:39:17 +02:00
vanhofen
2e62944648 menu: fix return value of getSelectedLine() for RC_timeout and RC_setup
This fixes the bahaviour of StartPosSelectionMenu in moviebrowser.
When this menu was closed by its timeout or RC_setup was pressed
the movie starts anyway.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 70cbc65483
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-15 (Sun, 15 Jul 2018)

Origin message was:
------------------
- menu: fix return value of getSelectedLine() for RC_timeout and RC_setup

This fixes the bahaviour of StartPosSelectionMenu in moviebrowser.
When this menu was closed by its timeout or RC_setup was pressed
the movie starts anyway.


------------------
This commit was generated by Migit
2018-07-15 00:41:40 +02:00
vanhofen
d8233ff455 lcd4l: move lcd4l-code to driver directory
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a82bfab40
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-05-09 (Wed, 09 May 2018)

Origin message was:
------------------
- lcd4l: move lcd4l-code to driver directory

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

------------------
This commit was generated by Migit
2018-05-09 23:41:37 +02:00
Thilo Graf
38d3b6e56c widget/menue.cpp: avoid paint of toggle buttons with more than 2 opts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 74f1f2f647
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-04-29 (Sun, 29 Apr 2018)


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

------------------
This commit was generated by Migit
2018-04-29 03:13:07 +02:00
Thilo Graf
c277fa0f9a menu: add optional usage of toggle buttons to visualze options
Origin commit data
------------------
Branch: ni/coolstream
Commit: f0f4698984
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-04-11 (Wed, 11 Apr 2018)


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

------------------
This commit was generated by Migit
2018-04-11 23:58:16 +02:00
Thilo Graf
842da46db7 CMenuOptionNumberChooser: expand localize functionality for any number
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ab92c41a7
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-04-04 (Wed, 04 Apr 2018)


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

------------------
This commit was generated by Migit
2018-04-05 20:52:30 +02:00
vanhofen
76d5a637a7 Revert "CMenuOptionNumberChooser: expand localize functionality for any number"
This reverts commit 4ee5185111 because of many
bothering compiler warnings:
extended initializer lists only available with -std=c++11 or -std=gnu++11


Origin commit data
------------------
Branch: ni/coolstream
Commit: adb80290ba
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-04-04 (Wed, 04 Apr 2018)



------------------
This commit was generated by Migit
2018-04-04 23:12:16 +02:00
Thilo Graf
4ee5185111 CMenuOptionNumberChooser: expand localize functionality for any number
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3acd36ba71
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-04-04 (Wed, 04 Apr 2018)


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

------------------
This commit was generated by Migit
2018-04-04 22:55:52 +02:00
Stefan Seyfried
9dafbaa590 menue: initialize height variable
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6223f10529
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-01-15 (Mon, 15 Jan 2018)


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

------------------
This commit was generated by Migit
2018-01-15 19:54:51 +01:00
vanhofen
f06be711fe icons: add default hint icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8137a4cdb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-18 (Mon, 18 Dec 2017)

Origin message was:
------------------
- icons: add default hint icon

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

------------------
This commit was generated by Migit
2017-12-18 11:00:17 +01:00
vanhofen
4da30e95e3 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: c7c94fdf2e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-10 (Sun, 10 Dec 2017)


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

------------------
This commit was generated by Migit
2017-12-10 22:50:42 +01:00
Thilo Graf
025908a318 CMenuWidget: ensure use of unified data type const char*
This should avoid possible compiler errors for this overloaded method.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b55de6ae7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-10 (Sun, 10 Dec 2017)



------------------
This commit was generated by Migit
2017-12-10 22:04:26 +01:00
vanhofen
eeb21f6510 neutrino: unify modes handling; ...
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0fc3e793a4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: unify modes handling; ...

remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-11-22 15:42:09 +01:00
vanhofen
476ce63d99 neutrino: unify modes handling; ...
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


Origin commit data
------------------
Branch: ni/coolstream
Commit: 028ec3cf3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: unify modes handling; ...

remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


------------------
This commit was generated by Migit
2017-11-20 15:19:06 +01:00
GetAway
2724f0ad67 menue.cpp: add reverse search to find selectable item
Origin commit data
------------------
Branch: ni/coolstream
Commit: 002ef3a1c9
Author: GetAway <get-away@t-online.de>
Date: 2017-11-04 (Sat, 04 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-05 22:33:23 +01:00
GetAway
53e680489e menue.cpp: add reverse search to find selectable item
Origin commit data
------------------
Branch: ni/coolstream
Commit: cad8efec3c
Author: GetAway <get-away@t-online.de>
Date: 2017-11-04 (Sat, 04 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-05 00:06:58 +01:00
vanhofen
0d75e0703b Revert "remove pinentered script , revert a46910dd2716d0624ed0ba3bc335a03625b0fbfc"
This reverts commit e89f1f32e5.


Origin commit data
------------------
Branch: ni/coolstream
Commit: f6692bff58
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)



------------------
This commit was generated by Migit
2017-11-03 13:33:31 +01:00
vanhofen
533ef50a9f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e691bceb94
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-03 13:04:12 +01:00
Jacek Jendrzej
e89f1f32e5 remove pinentered script , revert a46910dd27
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec10cd64e5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-03 12:25:14 +01:00
GetAway
86bc8bfcca menue.cpp: dont use one-time init of a variable that could be changed on runtime
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c9bf1df92
Author: GetAway <get-away@t-online.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)



------------------
This commit was generated by Migit
2017-11-02 21:31:12 +01:00
GetAway
eff0495a4b menue.cpp: dont use one-time init of a variable that could be changed on runtime
Origin commit data
------------------
Branch: ni/coolstream
Commit: c1ce74f776
Author: GetAway <get-away@t-online.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-02 13:25:47 +01:00
vanhofen
e143e0bcb0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/icons/buttons/0.png
	data/icons/buttons/1.png
	data/icons/buttons/2.png
	data/icons/buttons/3.png
	data/icons/buttons/4.png
	data/icons/buttons/5.png
	data/icons/buttons/6.png
	data/icons/buttons/7.png
	data/icons/buttons/8.png
	data/icons/buttons/9.png
	data/icons/buttons/blau.png
	data/icons/buttons/btn_backward.png
	data/icons/buttons/btn_forward.png
	data/icons/buttons/btn_pause.png
	data/icons/buttons/btn_play.png
	data/icons/buttons/btn_record_active.png
	data/icons/buttons/btn_record_inactive.png
	data/icons/buttons/btn_stop.png
	data/icons/buttons/down.png
	data/icons/buttons/gelb.png
	data/icons/buttons/gruen.png
	data/icons/buttons/help.png
	data/icons/buttons/help_small.png
	data/icons/buttons/home.png
	data/icons/buttons/info.png
	data/icons/buttons/info_small.png
	data/icons/buttons/left.png
	data/icons/buttons/menu.png
	data/icons/buttons/menu_small.png
	data/icons/buttons/mute_small.png
	data/icons/buttons/mute_zap_gray.png
	data/icons/buttons/mute_zap_green.png
	data/icons/buttons/ok.png
	data/icons/buttons/power.png
	data/icons/buttons/right.png
	data/icons/buttons/rot.png
	data/icons/buttons/up.png
	data/icons/filetypes/movie.png
	data/icons/filetypes/mp3.png
	data/icons/headers/audio.png
	data/icons/headers/bookmarkmanager.png
	data/icons/headers/colors.png
	data/icons/headers/error.png
	data/icons/headers/features.png
	data/icons/headers/games.png
	data/icons/headers/icon_blue.png
	data/icons/headers/icon_green.png
	data/icons/headers/icon_red.png
	data/icons/headers/icon_yellow.png
	data/icons/headers/information.png
	data/icons/headers/keybinding.png
	data/icons/headers/language.png
	data/icons/headers/lcd.png
	data/icons/headers/mainmenue.png
	data/icons/headers/multimedia.png
	data/icons/headers/network.png
	data/icons/headers/personalize.png
	data/icons/headers/shell.png
	data/icons/headers/softupdate.png
	data/icons/headers/streaming.png
	data/icons/headers/timer.png
	data/icons/headers/upnp.png
	data/icons/headers/video.png
	data/icons/movieplayer/mp_b-skip.png
	data/icons/movieplayer/mp_f-skip.png
	data/icons/movieplayer/mp_pause.png
	data/icons/movieplayer/mp_play.png
	data/icons/movieplayer/mp_play_repeat_all.png
	data/icons/movieplayer/mp_play_repeat_track.png
	data/icons/status/ca/biss_green.png
	data/icons/status/ca/biss_white.png
	data/icons/status/ca/biss_yellow.png
	data/icons/status/ca/conax_green.png
	data/icons/status/ca/conax_white.png
	data/icons/status/ca/conax_yellow.png
	data/icons/status/ca/cw_green.png
	data/icons/status/ca/cw_white.png
	data/icons/status/ca/cw_yellow.png
	data/icons/status/ca/d_green.png
	data/icons/status/ca/d_white.png
	data/icons/status/ca/d_yellow.png
	data/icons/status/ca/ird_green.png
	data/icons/status/ca/ird_white.png
	data/icons/status/ca/ird_yellow.png
	data/icons/status/ca/nagra_green.png
	data/icons/status/ca/nagra_white.png
	data/icons/status/ca/nagra_yellow.png
	data/icons/status/ca/nds_green.png
	data/icons/status/ca/nds_white.png
	data/icons/status/ca/nds_yellow.png
	data/icons/status/ca/powervu_green.png
	data/icons/status/ca/powervu_white.png
	data/icons/status/ca/powervu_yellow.png
	data/icons/status/ca/seca_green.png
	data/icons/status/ca/seca_white.png
	data/icons/status/ca/seca_yellow.png
	data/icons/status/ca/via_green.png
	data/icons/status/ca/via_white.png
	data/icons/status/ca/via_yellow.png
	data/icons/status/ca/x_green.png
	data/icons/status/ca/x_white.png
	data/icons/status/ca/x_yellow.png
	data/icons/status/channel/16_9.png
	data/icons/status/channel/16_9_gray.png
	data/icons/status/channel/ca2.png
	data/icons/status/channel/ca2_gray.png
	data/icons/status/channel/dd.png
	data/icons/status/channel/dd_avail.png
	data/icons/status/channel/dd_gray.png
	data/icons/status/channel/radiotextget.png
	data/icons/status/channel/radiotextoff.png
	data/icons/status/channel/radiotextwait.png
	data/icons/status/channel/res_000.png
	data/icons/status/channel/res_1080.png
	data/icons/status/channel/res_1280.png
	data/icons/status/channel/res_1440.png
	data/icons/status/channel/res_1920.png
	data/icons/status/channel/res_288.png
	data/icons/status/channel/res_352.png
	data/icons/status/channel/res_382.png
	data/icons/status/channel/res_480.png
	data/icons/status/channel/res_528.png
	data/icons/status/channel/res_544.png
	data/icons/status/channel/res_576.png
	data/icons/status/channel/res_704.png
	data/icons/status/channel/res_720.png
	data/icons/status/channel/res_hd.png
	data/icons/status/channel/res_sd.png
	data/icons/status/channel/subt.png
	data/icons/status/channel/subt_gray.png
	data/icons/status/channel/tuner_1.png
	data/icons/status/channel/tuner_2.png
	data/icons/status/channel/tuner_3.png
	data/icons/status/channel/tuner_4.png
	data/icons/status/channel/vtxt.png
	data/icons/status/channel/vtxt_gray.png
	data/icons/status/various/ats.png
	data/icons/status/various/ats_gray.png
	data/icons/status/various/ca.png
	data/icons/status/various/lock.png
	data/icons/status/various/mounted.png
	data/icons/status/various/mute.png
	data/icons/status/various/not_mounted.png
	data/icons/status/various/pip.png
	data/icons/status/various/rec_event_marker.png
	data/icons/status/various/rec_gray.png
	data/icons/status/various/zap.png
	data/locale/Makefile.am
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/start.jpg
	src/driver/fb_accel_sti.cpp
	src/gui/Makefile.am
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/system/settings.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4121099dcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)



------------------
This commit was generated by Migit
2017-10-18 09:41:46 +02:00
Jacek Jendrzej
dbf6f5127d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b8cf23d70
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-16 (Mon, 16 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-16 13:17:17 +02:00
vanhofen
7667bf5f01 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 84484832c3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-14 07:10:33 +02:00
Thilo Graf
d361165f99 CMenuWidget: don't use parameter for label width calculation
Footer object does this itself.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 35f048a735
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)



------------------
This commit was generated by Migit
2017-10-13 12:35:59 +02:00
gixxpunk
440a301827 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a6de24c7b7
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-11 (Wed, 11 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-11 21:35:55 +02:00
Jacek Jendrzej
eba89b1004 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2661fa4287
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-08 (Sun, 08 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-08 18:03:01 +02:00
Thilo Graf
39191df6e0 CMenuWidget: small clean ups
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4ad5ce65e2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-08 (Sun, 08 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-08 17:48:32 +02:00
Jacek Jendrzej
f5fc50139e Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 08dc0d7561
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-30 (Sat, 30 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-30 13:22:29 +02:00
Stefan Seyfried
d6b2b1e368 CMenuWidget: fix "left" key for menuchoosers where
the "decrement menu function" got lost by the last "simplify code and
add missing break" commit. The implicit fallthrough actually was used to
execute the "left" function.
Reorganize the code so that it works even without the implicit
fallthrough.


Origin commit data
------------------
Branch: ni/coolstream
Commit: ab3434e278
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)



------------------
This commit was generated by Migit
2017-09-30 13:14:57 +02:00
Stefan Seyfried
ee8a577fef CMenuWidget: fix "left" key for menuchoosers where
the "decrement menu function" got lost by the last "simplify code and
add missing break" commit. The implicit fallthrough actually was used to
execute the "left" function.
Reorganize the code so that it works even without the implicit
fallthrough.


Origin commit data
------------------
Branch: ni/coolstream
Commit: fea586b311
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)



------------------
This commit was generated by Migit
2017-09-30 08:19:29 +02:00
vanhofen
9f3ba8341f Revert "Revert "CMenuWidget: simplify menu_left_exit code, add missing break""
This reverts the revert commit 2c554b1ae7.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 39d31166c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-30 (Sat, 30 Sep 2017)



------------------
This commit was generated by Migit
2017-09-30 08:10:56 +02:00
Jacek Jendrzej
43eeb40008 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4fc73acffc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-29 (Fri, 29 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-29 10:49:27 +02:00
vanhofen
3df3b9eafe rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
Branch: ni/coolstream
Commit: 99cc7f850a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now

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

------------------
This commit was generated by Migit
2017-09-29 10:34:23 +02:00
vanhofen
369436124b rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebc621f3b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now

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

------------------
This commit was generated by Migit
2017-09-29 08:27:42 +02:00
Jacek Jendrzej
093a970ca5 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ae7765460
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-27 14:30:28 +02:00
vanhofen
85e3acf202 menue: only add hint_height to full_height, if we really have a hint
Origin commit data
------------------
Branch: ni/coolstream
Commit: 58e05cfd99
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- menue: only add hint_height to full_height, if we really have a hint

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

------------------
This commit was generated by Migit
2017-09-27 14:29:51 +02:00
vanhofen
2b25a2880d menue: only add hint_height to full_height, if we really have a hint
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb60c52a97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- menue: only add hint_height to full_height, if we really have a hint

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

------------------
This commit was generated by Migit
2017-09-27 14:26:22 +02:00
Jacek Jendrzej
fa8fc40b60 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1fc8437a34
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-27 11:56:03 +02:00
vanhofen
7da79f28df Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 581d635af7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-27 11:53:23 +02:00
Jacek Jendrzej
2c554b1ae7 Revert "CMenuWidget: simplify menu_left_exit code, add missing break"
This reverts commit 1582977133.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1deaebf1cf
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)



------------------
This commit was generated by Migit
2017-09-27 11:11:12 +02:00
Jacek Jendrzej
76904502ed Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0abeb742bd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-26 13:38:07 +02:00
vanhofen
94b5fa194b menue: fix coordinates for savescreen function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 96bb48b281
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: fix coordinates for savescreen function

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

------------------
This commit was generated by Migit
2017-09-26 13:36:33 +02:00