Commit Graph

23 Commits

Author SHA1 Message Date
vanhofen
5c76067adf Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: b57a2b31cd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-25 (Fri, 25 Nov 2016)
2016-11-25 18:57:11 +01:00
Jacek Jendrzej
d06eeec388 src/gui/widget/keyboard_input.cpp -add direkt digikey pressed
Origin commit data
------------------
Commit: 983d24cd51
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-25 (Fri, 25 Nov 2016)
2016-11-25 18:17:49 +01:00
vanhofen
cc7ad7ce1a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)
2016-11-19 21:11:54 +01:00
Thilo Graf
eae883a161 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Commit: aae4411d03
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)
2016-10-29 12:38:17 +02:00
vanhofen
6cbee866fd Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 5c9aa1562e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)
2016-10-29 11:41:02 +02:00
Michael Liebmann
e564e864e4 CKeyboardInput: Make saveScreen changeable with forceSaveScreen()
Origin commit data
------------------
Commit: 74b0ce7f70
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-29 (Sat, 29 Oct 2016)
2016-10-29 10:38:06 +02:00
Thilo Graf
11b3307251 CMsgBox: rework msgbox classes with Window class implementation
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details


Origin commit data
------------------
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)
2016-10-24 10:31:24 +02:00
vanhofen
f374f6652f 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
------------------
Commit: 42d1c25a8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)
2016-10-19 10:22:43 +02:00
vanhofen
deeab4a75e keyboard_input: use getItemColors function
Origin commit data
------------------
Commit: a5c9602e4b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)

Origin message was:
------------------
- keyboard_input: use getItemColors function
2016-10-19 10:06:36 +02:00
vanhofen
248b6c8684 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
------------------
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
2016-10-10 16:45:30 +02:00
vanhofen
f21851aec0 rename SHADOW_OFFSET -> OFFSET_SHADOW
Origin commit data
------------------
Commit: 5d450c60d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename SHADOW_OFFSET -> OFFSET_SHADOW
2016-10-10 14:19:55 +02:00
vanhofen
ab6f1fde03 keyboard_input: fix shadow color
Origin commit data
------------------
Commit: 06e7d1b952
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- keyboard_input: fix shadow color
2016-10-10 14:19:55 +02:00
vanhofen
897dc6ae8c colors: add COL_FRAME wrapper
Origin commit data
------------------
Commit: 75fe6e407d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_FRAME wrapper
2016-10-10 14:19:54 +02:00
vanhofen
91fc1e2528 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: e419a5c3b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)
2016-09-09 10:45:45 +02:00
vanhofen
fa2686a90e add listModeKey() function to simplify these calls
Origin commit data
------------------
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
2016-09-09 10:42:46 +02:00
vanhofen
cf2f3e11fe colors: smoother interplay; use 1px frames
Origin commit data
------------------
Commit: 5f08483671
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-22 (Mon, 22 Aug 2016)

Origin message was:
------------------
- colors: smoother interplay; use 1px frames
2016-08-22 23:30:06 +02:00
vanhofen
4cf2b60722 NI \o/
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
2016-05-19 22:59:54 +02:00
[CST] Focus
38ede6dfb0 neutrino: add webtv channel list mode
Origin commit data
------------------
Commit: 302642cee7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-23 (Wed, 23 Mar 2016)
2016-03-23 16:36:00 +03:00
vanhofen
8eec6ce2c9 keyboard_input: allow string hints ...
... in preparation for implementation in Lua instance


Origin commit data
------------------
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
2014-11-24 10:01:20 +01:00
vanhofen
936e9998e6 keyboard_input: auto calculate size of input-field ...
... if size is 0 or not given.


Origin commit data
------------------
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.
2014-11-22 15:58:02 +01:00
[CST] Focus
d53ca50b16 gui/widget/keyboard_input.cpp: fix cycle on dialog after timeout
Origin commit data
------------------
Commit: 3958428dd7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-20 (Thu, 20 Nov 2014)
2014-11-20 14:38:07 +03:00
vanhofen
a3a61eec4f keyboard_input: align keys_deutsch table to german keyboards
Origin commit data
------------------
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
2014-11-20 11:05:38 +01:00
[CST] Focus
402b08969e gui/widget/keyboard_input.cpp: add string input with keyboard-style layout
Origin commit data
------------------
Commit: 003acea160
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-19 (Wed, 19 Nov 2014)
2014-11-19 18:16:01 +03:00