Commit Graph

370 Commits

Author SHA1 Message Date
Jacek Jendrzej
c751391c58 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: ed416416cd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-14 (Mon, 14 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-14 16:26:49 +02:00
vanhofen
e8711e0475 Revert "neutrino: disable some menus in upnp & ts mode"
This reverts commit aaee0baf07.

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 944ad7cb63
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)



------------------
This commit was generated by Migit
2017-08-12 14:05:17 +02:00
Jacek Jendrzej
4052e6868c Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1763bb9e64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-08 (Tue, 08 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-08 20:06:40 +02:00
vanhofen
71d32096c7 menu: fix icon for CGenericMenuNext forwarder
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c4fe6df2f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)

Origin message was:
------------------
- menu: fix icon for CGenericMenuNext forwarder

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


------------------
This commit was generated by Migit
2017-08-08 14:25:12 +02:00
GetAway
aaee0baf07 neutrino: disable some menus in upnp & ts mode
to prevent inoperability of neutrino


Origin commit data
------------------
Branch: ni/coolstream
Commit: 90de51de38
Author: GetAway <get-away@t-online.de>
Date: 2017-08-06 (Sun, 06 Aug 2017)



------------------
This commit was generated by Migit
2017-08-07 07:52:41 +02:00
Jacek Jendrzej
80eba228d6 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: d612fbc05f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-18 (Sun, 18 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-18 12:21:18 +02:00
Thilo Graf
b295c863d0 CMenuSeparator: clean up multiple code parts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 326a9634e1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-18 00:04:40 +02:00
Thilo Graf
b0d7a2a488 CMenuOptionNumberChooser: clean up multiple code parts
Origin commit data
------------------
Branch: ni/coolstream
Commit: f2e8f95e66
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-18 00:04:40 +02:00
Thilo Graf
65a2486250 CMenuForwarder: clean up multiple code parts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b3ce6f330
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-18 00:04:40 +02:00
Thilo Graf
cd712fe5d5 CMenuOptionStringChooser: clean up multiple code parts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 284dba8c25
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-18 00:04:40 +02:00
Thilo Graf
5f1d85300f CMenuOptionChooser: clean up multiple code parts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8899660dad
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-18 00:04:40 +02:00
Jacek Jendrzej
61a0924ac6 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c3002cb26
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-15 (Thu, 15 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-15 12:32:31 +02:00
vanhofen
fd52e89afb menue: replace last fixed values ...
... with OFFSET defines and scale2Res()-calculations

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

- removed TODO for height of hint calculation


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c783a5c50
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- menue: replace last fixed values ...

... with OFFSET defines and scale2Res()-calculations

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

- removed TODO for height of hint calculation


------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
Jacek Jendrzej
0b9ac652bf Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-07 16:20:47 +02:00
Michael Liebmann
10ea5b08d2 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2677543cc4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-13 21:55:50 +01:00
vanhofen
ae3ecfdcfb Merge remote-tracking branch 'neutrino-mp/master' into pu/mp
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8bdb16cec6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)



------------------
This commit was generated by Migit
2017-03-13 16:14:33 +01:00
vanhofen
51c85e1c58 unify DetailsLine-names; move define to settings.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5b0faeab8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)

Origin message was:
------------------
- unify DetailsLine-names; move define to settings.h

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

------------------
This commit was generated by Migit
2017-03-13 12:40:04 +01:00
Michael Liebmann
94ddefdfd0 CMenuWidget::calcSize: Add forgotten 'wi'
Origin commit data
------------------
Branch: ni/coolstream
Commit: d0b02a9752
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-13 10:34:37 +01:00
Michael Liebmann
671568a19e CMenuWidget::calcSize: Use scale2Res() to adjust fixed sizes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ed30486c4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-13 09:55:58 +01:00
Michael Liebmann
b5aa38dc56 CMenuWidget::calcSize: Recalculation of min_width ...
... for adjustment to the osd resolution


Origin commit data
------------------
Branch: ni/coolstream
Commit: 30db40da1a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)



------------------
This commit was generated by Migit
2017-03-13 09:55:58 +01:00
Stefan Seyfried
a5cbcf84af Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: abec1c311b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-04 19:32:30 +01:00
vanhofen
c1140e0c1c rename g_PluginList to g_Plugins; this isn't a list of plugins
Origin commit data
------------------
Branch: ni/coolstream
Commit: 856c676430
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- rename g_PluginList to g_Plugins; this isn't a list of plugins

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

------------------
This commit was generated by Migit
2017-03-01 13:03:50 +01:00
Stefan Seyfried
94d677b18c Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b47699447
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-11 11:18:45 +01:00
Thilo Graf
e1edcb1187 CMenuWidget: remove dub code from init
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0435ca20a3
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-09 16:35:03 +01:00
Thilo Graf
f6ea40a11e CMenuWidget: use only nameString as container for widget name
neutrino_locale_t	name could be transformed always to real string to
unify this container


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2dda93ed2b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)



------------------
This commit was generated by Migit
2017-02-09 15:52:39 +01:00
Thilo Graf
2a4bac952c Revert "CMenuWidget: ensure repaint of all header content if it is already painted"
This reverts commit dff5ceee10.


Origin commit data
------------------
Branch: ni/coolstream
Commit: a2f9d4b462
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)



------------------
This commit was generated by Migit
2017-02-02 11:18:27 +01:00
Stefan Seyfried
b887345480 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7497722646
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-01 (Wed, 01 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-01 22:03:40 +01:00
Thilo Graf
dff5ceee10 CMenuWidget: ensure repaint of all header content if it is already painted
TODO: 	This should be controlled inside header base class.
	paint() method seems suitable.
	I Will try to implement it soon.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 97ed7cdaf7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)



------------------
This commit was generated by Migit
2017-01-31 16:36:43 +01:00
Thilo Graf
8e8ff02d6d CMenuWidget: add missing hide() for details line
Details_line was not removed in all constellations when menu was closed.
Sample: open main menue and select an entry with connect-line, eg. plugins,
press key to come into submenu, then go back to main menue and close
menu with home key, result: it's possible that line is still on screen.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 76008371ff
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)



------------------
This commit was generated by Migit
2017-01-31 16:36:42 +01:00
Stefan Seyfried
634c10557e Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 48ff7b36a2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-30 21:36:09 +01:00
Thilo Graf
8195393c78 CMenuWidget: Forcing removal of details line during removing of hint box.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a3778ba93
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-30 11:27:55 +01:00
Jacek Jendrzej
1d7e75990e fix uninitialised values
Origin commit data
------------------
Branch: ni/coolstream
Commit: f76dda36df
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-01-29 (Sun, 29 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-29 20:54:35 +01:00
Stefan Seyfried
d6861c1054 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-22 (Sun, 22 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-22 22:59:39 +01:00
Thilo Graf
5bbb994250 CMenuWidget: add menu name reinit
Ensures correct display of menu name while runtime.
For example: it's required on changed language settings, otherwise we have
old language in menu head.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 114bba2ab7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-22 (Thu, 22 Dec 2016)



------------------
This commit was generated by Migit
2016-12-22 23:49:01 +01:00
vanhofen
5b6c556d44 menue: use SCROLLBAR_WIDTH define
Origin commit data
------------------
Branch: ni/coolstream
Commit: 97cfb36041
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-20 (Tue, 20 Dec 2016)

Origin message was:
------------------
- menue: use SCROLLBAR_WIDTH define

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

------------------
This commit was generated by Migit
2016-12-20 10:26:59 +01:00
Thilo Graf
2028713b39 CMenuWidget: add external methode to paint scrollbar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 644e8196db
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-17 22:39:14 +01:00
Stefan Seyfried
776aea7c95 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-04 18:02:51 +01:00
Jacek Jendrzej
ccd59e1d3a supplement to 3019b1abdc
Origin commit data
------------------
Branch: ni/coolstream
Commit: 91e0f8070b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-25 (Fri, 25 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-25 16:45:26 +01:00
Jacek Jendrzej
3019b1abdc src/gui/widget/menue.cpp try to fix widget segfault menu with keyboard and background restore
Origin commit data
------------------
Branch: ni/coolstream
Commit: a8ea7c60d5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-24 (Thu, 24 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-24 19:21:14 +01:00
Thilo Graf
e0d6d5537f Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: aa40d88300
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-14 20:38:01 +01:00
Jacek Jendrzej
5e16302783 src/gui/widget/menue.cpp try fix hide info_box (in channellist)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 99c57d3075
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-14 (Mon, 14 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-14 19:27:09 +01:00
Stefan Seyfried
d8d4d753a5 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c92d112d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-12 18:06:26 +01:00
Thilo Graf
fd32ad9b83 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 96ffa4778a
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-11 00:51:20 +01:00
Thilo Graf
b13d1966d2 CMenuWidget: move signal before render methodes
At start of methode, unusual behavior could occur.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 30f231c801
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)



------------------
This commit was generated by Migit
2016-11-11 00:48:37 +01:00
Thilo Graf
045ac300c7 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b9d2542e6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-28 (Fri, 28 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-28 08:05:34 +02:00
Jacek Jendrzej
7fed169731 src/gui/widget/menue.cpp fix segfault if items is empty
Origin commit data
------------------
Branch: ni/coolstream
Commit: 83976f40b4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-10-27 (Thu, 27 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-27 17:06:12 +02:00
Thilo Graf
d3de92054a Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 28acb0fefa
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-27 (Thu, 27 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-27 10:13:45 +02:00
Michael Liebmann
3472c4c80c CMenuWidget::saveScreen: Fix segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3e0a0e917
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-26 (Wed, 26 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-26 15:16:11 +02:00
Thilo Graf
8ca8486085 Shadow: try to optimize shadow areas
* cleanup inner part of box on round corners, frames considered
* adopt implementations in some gui classes
* some debug lines removed
* test menu adopted
* try to fix corner caluculation to avoid transparent holes


Origin commit data
------------------
Branch: ni/coolstream
Commit: a17d61de8c
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-30 (Tue, 30 Aug 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:25 +02:00
Stefan Seyfried
3f75ef5f47 Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-22 11:37:40 +02:00