Commit Graph

16 Commits

Author SHA1 Message Date
vanhofen
83f403dfb7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/cst-next
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/pictureviewer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 42d1c25a8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)



------------------
This commit was generated by Migit
2016-10-19 10:22:43 +02:00
vanhofen
c0e4ec5e87 keyboard_input: use getItemColors function
Origin commit data
------------------
Branch: ni/coolstream
Commit: a5c9602e4b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)

Origin message was:
------------------
- keyboard_input: use getItemColors function

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

------------------
This commit was generated by Migit
2016-10-19 10:06:36 +02:00
vanhofen
3739b4de04 Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/components/cc_detailsline.h
	src/gui/components/cc_item_infobox.h
	src/gui/infoviewer.cpp
	src/gui/upnpbrowser.cpp
	src/gui/widget/keyboard_input.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)



------------------
This commit was generated by Migit
2016-10-10 16:45:30 +02:00
vanhofen
b59278067e rename SHADOW_OFFSET -> OFFSET_SHADOW
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d450c60d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename SHADOW_OFFSET -> OFFSET_SHADOW

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

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
70c0d4cec5 keyboard_input: fix shadow color
Origin commit data
------------------
Branch: ni/coolstream
Commit: 06e7d1b952
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- keyboard_input: fix shadow color

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

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
5987637998 colors: add COL_FRAME wrapper
Origin commit data
------------------
Branch: ni/coolstream
Commit: 75fe6e407d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_FRAME wrapper

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

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
vanhofen
af4767a199 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: e419a5c3b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-09 10:45:45 +02:00
vanhofen
58b62b0445 add listModeKey() function to simplify these calls
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2911e638c7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- add listModeKey() function to simplify these calls

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

------------------
This commit was generated by Migit
2016-09-09 10:42:46 +02:00
vanhofen
568677787e colors: smoother interplay; use 1px frames
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f08483671
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-22 (Mon, 22 Aug 2016)

Origin message was:
------------------
- colors: smoother interplay; use 1px frames

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

------------------
This commit was generated by Migit
2016-08-22 23:30:06 +02:00
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


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

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +02:00
[CST] Focus
f02dae27c7 neutrino: add webtv channel list mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 302642cee7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-23 (Wed, 23 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-23 16:36:00 +03:00
vanhofen
cc38cc44cb keyboard_input: allow string hints ...
... in preparation for implementation in Lua instance


Origin commit data
------------------
Branch: ni/coolstream
Commit: da9ce1bb38
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-24 (Mon, 24 Nov 2014)

Origin message was:
------------------
- keyboard_input: allow string hints ...

... in preparation for implementation in Lua instance


------------------
This commit was generated by Migit
2014-11-24 10:01:20 +01:00
vanhofen
a2db36124a keyboard_input: auto calculate size of input-field ...
... if size is 0 or not given.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b727ea4be8
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-22 (Sat, 22 Nov 2014)

Origin message was:
------------------
- keyboard_input: auto calculate size of input-field ...

 ... if size is 0 or not given.


------------------
This commit was generated by Migit
2014-11-22 15:58:02 +01:00
[CST] Focus
f812cc0d55 gui/widget/keyboard_input.cpp: fix cycle on dialog after timeout
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3958428dd7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-20 (Thu, 20 Nov 2014)


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

------------------
This commit was generated by Migit
2014-11-20 14:38:07 +03:00
vanhofen
282d9fc29f keyboard_input: align keys_deutsch table to german keyboards
Origin commit data
------------------
Branch: ni/coolstream
Commit: 30c5e7b900
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-20 (Thu, 20 Nov 2014)

Origin message was:
------------------
- keyboard_input: align keys_deutsch table to german keyboards

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

------------------
This commit was generated by Migit
2014-11-20 11:05:38 +01:00
[CST] Focus
f7f154a486 gui/widget/keyboard_input.cpp: add string input with keyboard-style layout
Origin commit data
------------------
Branch: ni/coolstream
Commit: 003acea160
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-19 (Wed, 19 Nov 2014)


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

------------------
This commit was generated by Migit
2014-11-19 18:16:01 +03:00