Commit Graph

397 Commits

Author SHA1 Message Date
vanhofen
afda007d95 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/Makefile.am
	src/gui/imageinfo_ni.cpp
	src/gui/movieplayer.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 22:17:17 +01:00
vanhofen
4ac4e963ad Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/fonts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 21:54:48 +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
vanhofen
2f63d963eb Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 81485b1cb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-02 13:13:56 +01:00
vanhofen
adaf63dd74 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e0084d8913
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-02 13:13:34 +01:00
vanhofen
659e55fd39 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: 43ef78ee44
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)



------------------
This commit was generated by Migit
2017-02-02 13:10:10 +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
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
vanhofen
9290240f66 Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: fa6cac3836
Author: vanhofen <vanhofen@gmx.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 16:33:02 +01:00
vanhofen
eccc57e073 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/components/cc_detailsline.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 609d466302
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)



------------------
This commit was generated by Migit
2017-01-30 16:32:43 +01:00
Thilo Graf
f4bf157ebf Merge branch 'master' into pu/font
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a0aaa6c29
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 12:23:51 +01:00
Thilo Graf
798f081c82 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: a72f3a7867
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)



------------------
This commit was generated by Migit
2017-01-30 12:21:10 +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
vanhofen
b5a155f1f9 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4fc269c7d4
Author: vanhofen <vanhofen@gmx.de>
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 22:37:59 +01:00
vanhofen
b8bc7ca96f Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/volumebar.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: cd8b9f9b04
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)



------------------
This commit was generated by Migit
2017-01-29 22:37:31 +01:00
Thilo Graf
5b933d33d1 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: a3ee3351b5
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)



------------------
This commit was generated by Migit
2017-01-29 21:52:52 +01:00
vanhofen
d9a8d365f7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c1803eacac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)



------------------
This commit was generated by Migit
2017-01-29 21:32:04 +01:00
vanhofen
760922196e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4ace56d488
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)



------------------
This commit was generated by Migit
2017-01-29 21:30:01 +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
vanhofen
45d33bdf00 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d39dc75c6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-29 15:15:34 +01:00
vanhofen
27f153c048 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 41c29a4210
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-24 (Sat, 24 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-24 00:29:03 +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
ba43886fb8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a0d262c596
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-20 (Tue, 20 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-20 21:40:42 +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
vanhofen
5ffe34cea9 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98ed3d9448
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-19 17:23:28 +01:00
Thilo Graf
749b463420 CMenuWidget: add external methode to paint scrollbar
Origin commit data
------------------
Branch: ni/coolstream
Commit: abff070ad7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-19 17:21:51 +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
vanhofen
e30d9b012a Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87fe81b890
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-02 23:39:21 +01:00
vanhofen
adc3eb30bb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b57a2b31cd
Author: vanhofen <vanhofen@gmx.de>
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 18:57:11 +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
vanhofen
1314c64817 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/upnpbrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2f3793fa1d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-24 (Thu, 24 Nov 2016)



------------------
This commit was generated by Migit
2016-11-24 21:45:31 +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
vanhofen
6b0e887585 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


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



------------------
This commit was generated by Migit
2016-11-21 12:46:49 +01:00
vanhofen
a413bfb40d 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
------------------
Branch: ni/coolstream
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)



------------------
This commit was generated by Migit
2016-11-19 21:11:54 +01:00
vanhofen
b0f13d51ce Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/sectionsdclient/Makefile.am
	lib/timerdclient/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 93fdd4aa79
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)



------------------
This commit was generated by Migit
2016-11-17 09:52:47 +01:00
vanhofen
06ab0e9f73 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca86828ff1
Author: vanhofen <vanhofen@gmx.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 23:02:33 +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
vanhofen
390f589ac1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d4b9daf01e
Author: vanhofen <vanhofen@gmx.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 09:16:24 +01:00
vanhofen
584a34c2a7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d271a8999b
Author: vanhofen <vanhofen@gmx.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:58 +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
vanhofen
6dfe9dc9ba Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ddcc0c7ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)



------------------
This commit was generated by Migit
2016-11-02 09:50:10 +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
vanhofen
9f3e93e083 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ecd3951b7d
Author: vanhofen <vanhofen@gmx.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 23:12:05 +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
vanhofen
d973ee9821 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/system/httptool.cpp
	src/system/httptool.h


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



------------------
This commit was generated by Migit
2016-10-26 23:46:59 +02:00