mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-06 13:18:27 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,049 Commits 2 Branches 9 Tags
d2bd535b8bb90590c27497f3d28fb8426cf5c066
Commit Graph

106 Commits

Author SHA1 Message Date
vanhofen
d2bd535b8b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 30d4d6e7f0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)
 2017-04-08 14:33:53 +02:00
Thilo Graf
abdf32c639 CComponentsHeader: add methode initRepaintSlot() and considered parent 
Required in sub classes. Considering of parent ensures usage of
required background color in sub classes.


Origin commit data
------------------
Commit: 3e342a7661
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-07 (Fri, 07 Apr 2017)
 2017-04-08 08:16:01 +02:00
vanhofen
c4de218cb2 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/framebuffer.h
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/system/httptool.cpp


Origin commit data
------------------
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
 2017-02-09 13:19:03 +01:00
vanhofen
53a4a8dd85 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 728959949b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
 2017-02-08 20:35:37 +01:00
Michael Liebmann
534d1b315e Merge branch 'master' into pu/fb-modules 
Origin commit data
------------------
Commit: ef61905a2d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)
 2017-02-08 20:16:41 +01:00
Stefan Seyfried
f6d5a96838 replace fontrenderer.h include with forward declaration 
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough


Origin commit data
------------------
Commit: 2303d94300
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
 2017-02-07 17:23:42 +01:00
Thilo Graf
680970ff29 CComponentsForm: move slots into base classes 
Usable for all form classes


Origin commit data
------------------
Commit: 06fa3f2488
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)
 2017-02-07 17:12:25 +01:00
Thilo Graf
1e3da560ed signals: reduce multiple includes for sigc++/bind.h 
Origin commit data
------------------
Commit: e4d0abc7dc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)
 2017-02-07 17:12:25 +01:00
vanhofen
6e6b57ff3a Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 81485b1cb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)
 2017-02-02 13:13:56 +01:00
Thilo Graf
b0295112ba Forms/header/clock: implement slot into OnBeforeRePaint 
Origin commit data
------------------
Commit: 1c217b404f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)
 2017-02-02 11:18:27 +01:00
Thilo Graf
93cfff7d2d CComponentsHeader: add missing paramters to kill methode 
Origin commit data
------------------
Commit: ba9284fba7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-24 (Tue, 24 Jan 2017)
 2017-01-31 16:36:42 +01:00
Thilo Graf
3bb81b5b73 CComponentsForm: add some usefull slots/signal to help paint backgrounds 
Requried to paint form items only on changed contents and on repaint


Origin commit data
------------------
Commit: 5c8aa90e01
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-24 (Tue, 24 Jan 2017)
 2017-01-31 16:36:41 +01:00
Thilo Graf
2748077074 Experimental try to rework isPainted() 
Origin commit data
------------------
Commit: 26eb4d079b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-19 (Thu, 19 Jan 2017)
 2017-01-31 16:36:41 +01:00
Thilo Graf
92d570b18d CComponentsHeader: fix order inside overloaded methode setCaption() 
Stop() was never touched with string version of setCaption()


Origin commit data
------------------
Commit: 58316d2091
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-21 (Sat, 21 Jan 2017)
 2017-01-31 16:36:40 +01:00
vanhofen
0d4a2a3461 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 89beeb2c10
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)
 2017-01-27 18:49:24 +01:00
Thilo Graf
73ae38239c CComponentsHeader: add missing paramters to kill methode 
Origin commit data
------------------
Commit: 00163ba04e
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-24 (Tue, 24 Jan 2017)
 2017-01-25 16:33:47 +01:00
Thilo Graf
5c4e0a25e8 CComponentsForm: add some usefull slots/signal to help paint backgrounds 
Requried to paint form items only on changed contents and on repaint


Origin commit data
------------------
Commit: 7e6cbe5410
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-24 (Tue, 24 Jan 2017)
 2017-01-25 16:33:46 +01:00
Thilo Graf
858fdd6320 Experimental try to rework isPainted() 
Origin commit data
------------------
Commit: 9d3a968506
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-19 (Thu, 19 Jan 2017)
 2017-01-25 16:33:46 +01:00
Thilo Graf
eeb63fa6c8 CComponentsHeader: fix order inside overloaded methode setCaption() 
Stop() was never touched with string version of setCaption()


Origin commit data
------------------
Commit: 5b51f2277b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-21 (Sat, 21 Jan 2017)
 2017-01-25 16:33:43 +01:00
vanhofen
8c27915df5 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 2733e0f260
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-02 (Mon, 02 Jan 2017)
 2017-01-02 23:55:23 +01:00
Thilo Graf
476641a626 CComponentsHeader/CComponentsFooter: prevent crash on changed font settings 
Default fonts for header and footer must be handled too.
After font settings changes these objects could be invalid.
Default fonts have invalid pointers after font changes too. Extra reset is required.


Origin commit data
------------------
Commit: b98319cb91
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
 2016-12-30 20:33:26 +01:00
Thilo Graf
64e72db3a4 CComponentsHeader: declare l_font, s_font as global 
Useful for init in header sub classes. So its possible to use
other prefined size mode fonts


Origin commit data
------------------
Commit: 4cdae3fdf6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-27 (Tue, 27 Dec 2016)
 2016-12-30 20:33:26 +01:00
Jacek Jendrzej
542feb926c some dead assignment 
Origin commit data
------------------
Commit: c0564ec574
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-29 (Thu, 29 Dec 2016)
 2016-12-29 18:51:06 +01:00
vanhofen
cf7fc39a1a Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 98ed3d9448
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)
 2016-12-19 17:23:28 +01:00
Thilo Graf
11983a7220 CComponentsHeader: ensure to have correct font instances after changed font 
On possible changed font settings, font objects can be invalid and
we have a crash. With this fix it's possible, that
CNeutrinoApp::setupFont() method clean up header font object itself.


Origin commit data
------------------
Commit: 8292ec84af
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)
 2016-12-19 17:21:51 +01:00
Thilo Graf
3069495033 CComponentsHeader: ensure to have correct font instances after changed font 
On possible changed font settings, font objects can be invalid and
we have a crash. With this fix it's possible, that
CNeutrinoApp::setupFont() method clean up header font object itself.


Origin commit data
------------------
Commit: 239496c207
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-18 (Sun, 18 Dec 2016)
 2016-12-18 20:30:41 +01:00
vanhofen
56d77c4901 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/Makefile.am
	src/gui/user_menue.cpp


Origin commit data
------------------
Commit: 79a2dc262b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
 2016-12-15 11:49:05 +01:00
Thilo Graf
c36053860a CComponentsHeader: fix font and height handling 
Font was not changeable. setCaptionFont() was without effect.


Origin commit data
------------------
Commit: ab8aa77687
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-14 (Wed, 14 Dec 2016)
 2016-12-14 16:21:15 +01:00
vanhofen
10bf4e8837 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: fdb24232f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)
 2016-12-12 10:29:42 +01:00
vanhofen
8f55c83ce0 rename BUTTON_TOP to BUTTON_UP; it isn't a top-button 
Origin commit data
------------------
Commit: 0dc0789de8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- rename BUTTON_TOP to BUTTON_UP; it isn't a top-button
 2016-12-07 15:37:03 +01:00
vanhofen
317c73efcc cc_frm_header: show left button before the right one 
Origin commit data
------------------
Commit: 3d78174b8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- cc_frm_header: show left button before the right one
 2016-12-07 15:24:45 +01:00
vanhofen
984b4378c1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 3ead60b3fd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)
 2016-12-07 12:35:53 +01:00
vanhofen
453a8a9a3e cc_frm_header: try to fix clock; e.g. in timerlist 
Origin commit data
------------------
Commit: c661f3f07d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)

Origin message was:
------------------
- cc_frm_header: try to fix clock; e.g. in timerlist
 2016-12-06 20:59:35 +01:00
vanhofen
2e8117384c Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: d4b9daf01e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
 2016-11-11 09:16:24 +01:00
vanhofen
2a769e02ce Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 8d598b3d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 22:21:35 +01:00
vanhofen
3449a434d4 cc_frm_header: use OFFSET define 
Origin commit data
------------------
Commit: 15e24a3e66
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- cc_frm_header: use OFFSET define
 2016-11-07 21:08:51 +01:00
vanhofen
7220c6b265 Merge branch 'ni/cst-next' into ni/mp/cst-next 
Conflicts:
	acinclude.m4
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/epgplus.cpp
	src/gui/plugins.cpp
	src/gui/widget/listbox.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
 2016-10-10 17:27:55 +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
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
889a555c3b Merge branch 'ni/cst-next' into ni/mp/cst-next 
Origin commit data
------------------
Commit: f06fa4d0e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-25 (Sun, 25 Sep 2016)
 2016-09-25 00:24:09 +02:00
vanhofen
6e91038cd2 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: 0288091f69
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-25 (Sun, 25 Sep 2016)
 2016-09-25 00:18:22 +02:00
Thilo Graf
3f514865ac CComponentsHeader: ensure clean object on reinit 
Items were destroyed with simple call of delete
but not removed from item collection.
removeCCItem() does this and destroys item objects too.


Origin commit data
------------------
Commit: b205b0c8d0
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-24 (Sat, 24 Sep 2016)
 2016-09-24 01:09:41 +02:00
vanhofen
c36373040d Merge branch 'ni/cst-next' into ni/mp/cst-next 
Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Commit: fda1cda516
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-06 (Tue, 06 Sep 2016)
 2016-09-06 15:24:30 +02:00
vanhofen
a4a96bdc26 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/driver/framebuffer.cpp


Origin commit data
------------------
Commit: 22ef37ae12
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-01 (Thu, 01 Sep 2016)
 2016-09-01 08:50:59 +02:00
Thilo Graf
ab825c08da CComponentsHeader: don't use default parameters for privat member 
Unified adaptation related to child class ComponentsFooter.
see: 5a24dc1ce5


Origin commit data
------------------
Commit: 731cb9c66d
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-30 (Tue, 30 Aug 2016)
 2016-08-30 11:19:48 +02:00
vanhofen
bc33663742 Merge branch 'ni/mp' into ni/cst-next 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 19:13:47 +02:00
Michael Liebmann
4246a31ba6 Merge branch 'cst-next' into nmp-cst-next 
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-19 17:40:48 +02:00
vanhofen
141df6c65a Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: 5d1316417a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-17 (Wed, 17 Aug 2016)
 2016-08-17 21:38:03 +02:00
Thilo Graf
1af0174ac4 CComponentsHeader: remove reassigned col_body vars 
Origin commit data
------------------
Commit: 8500648b7f
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-17 (Wed, 17 Feb 2016)
 2016-02-17 11:42:29 +01:00
Michael Liebmann
304fea8be0 Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: b6d2bad857
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-21 (Thu, 21 Jan 2016)
 2016-01-21 17:57:38 +01:00