Commit Graph

9885 Commits

Author SHA1 Message Date
vanhofen
0385dbc30c remove unused g_info.box_Type
Origin commit data
------------------
Branch: ni/coolstream
Commit: 233886df8d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- remove unused g_info.box_Type

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

------------------
This commit was generated by Migit
2017-03-19 01:04:48 +01:00
vanhofen
9d2ce8caf1 use g_info.hw_caps->has_fan; remove old g_info.has_fan
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4f202b19d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- use g_info.hw_caps->has_fan; remove old g_info.has_fan

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

------------------
This commit was generated by Migit
2017-03-19 01:04:48 +01:00
vanhofen
dbc883b43b neutrinoyparser: remove workaround for Neo Twin
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59adc88491
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- neutrinoyparser: remove workaround for Neo Twin

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

------------------
This commit was generated by Migit
2017-03-19 01:04:48 +01:00
vanhofen
d756900191 controlapi: use "CST" instead of "Coolstream" ...
because I don't know the current legal situation.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e5c30f754
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- controlapi: use "CST" instead of "Coolstream" ...

because I don't know the current legal situation.


------------------
This commit was generated by Migit
2017-03-19 01:04:48 +01:00
vanhofen
2770d07bea hardware_caps: fix has_fan and add detection of Neo Twin
Origin commit data
------------------
Branch: ni/coolstream
Commit: c225c2d4b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- hardware_caps: fix has_fan and add detection of Neo Twin

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

------------------
This commit was generated by Migit
2017-03-19 01:04:48 +01:00
vanhofen
c9b8894436 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	acinclude.m4


Origin commit data
------------------
Branch: ni/coolstream
Commit: b018f610c4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-17 (Fri, 17 Mar 2017)



------------------
This commit was generated by Migit
2017-03-17 13:14:15 +01:00
Michael Liebmann
a14300eca2 Merge branch 'master' into pu/fb-setmode
Conflicts:
 src/driver/screenshot.h
 src/driver/screenshot.cpp
 acinclude.m4


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

Origin message was:
------------------
Merge branch 'master' into pu/fb-setmode

Conflicts:
   src/driver/screenshot.h
   src/driver/screenshot.cpp
   acinclude.m4


------------------
This commit was generated by Migit
2017-03-17 12:43:25 +01:00
Michael Liebmann
0c4a37ad58 CScreenShot: Remove OpenThreads and use pthread functions
Origin commit data
------------------
Branch: ni/coolstream
Commit: ad47a5d5e9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-17 12:19:51 +01:00
vanhofen
87c7eeeb3c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	acinclude.m4
	src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 195c22fffa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-16 (Thu, 16 Mar 2017)



------------------
This commit was generated by Migit
2017-03-16 22:29:22 +01:00
vanhofen
60ebad8e33 acinclude.m4: remove unused --enable-tmsdk switch; ...
There's so much more unused and outdated stuff :/


Origin commit data
------------------
Branch: ni/coolstream
Commit: 93e22163e9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-16 (Thu, 16 Mar 2017)

Origin message was:
------------------
- acinclude.m4: remove unused --enable-tmsdk switch; ...

There's so much more unused and outdated stuff :/


------------------
This commit was generated by Migit
2017-03-16 21:12:01 +01:00
vanhofen
9da6d922dd Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/components/cc_detailsline.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 653e6d3dd3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)



------------------
This commit was generated by Migit
2017-03-15 23:37:37 +01:00
vanhofen
9713a31d6a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4cab22024f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-15 22:47:35 +01:00
Michael Liebmann
c636bf6234 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: b190e0c4ff
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-15 21:19:08 +01:00
TangoCash
d0555d5c08 add unicable2/jess (thx DboxOldie)
Origin commit data
------------------
Branch: ni/coolstream
Commit: f974b56343
Author: TangoCash <eric@loxat.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-15 19:51:20 +01:00
Jacek Jendrzej
b714dab26e screenshot.cpp fix memcpy param overlap
Origin commit data
------------------
Branch: ni/coolstream
Commit: 142ac1392f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-15 19:02:44 +01:00
Jacek Jendrzej
2a2238f53a src/neutrino.cpp fix possible memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: f18ec050c7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-15 15:56:23 +01:00
vanhofen
cd785d2ff6 Merge pull request #8 from Pr0metheus2/patch-1
Update slovak.locale

Origin commit data
------------------
Branch: ni/coolstream
Commit: 09606c5ded
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)



------------------
This commit was generated by Migit
2017-03-15 11:21:49 +01:00
Thilo Graf
540c433a41 CComponentsExtTextForm: use scaled default dimension values
Origin commit data
------------------
Branch: ni/coolstream
Commit: e498cc6b09
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-15 09:58:28 +01:00
Thilo Graf
e05016388d CImageInfo: optimize label arrangement
Distance between label and text was too large with full hd resolution.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 17227504c2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)



------------------
This commit was generated by Migit
2017-03-15 09:58:23 +01:00
Thilo Graf
344b254a4b CComponentsExtTextForm: fix label width calculation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 81cde4836f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-15 09:58:10 +01:00
Thilo Graf
46859665ed CImageInfo: use global offset for item offset
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1db1182b87
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-15 09:57:43 +01:00
Andrej Tobola
fa776f72d1 Update slovak.locale
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9cefe16d4b
Author: Andrej Tobola <andrej.tobola+gifthub@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)



------------------
This commit was generated by Migit
2017-03-15 09:32:43 +01:00
Michael Liebmann
efb0eb652f Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 49737c5ee2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-14 17:33:57 +01:00
Thilo Graf
054d0c33bf CColorChooser: fix compile conversion warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3b5cd00bf4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-14 (Tue, 14 Mar 2017)

Origin message was:
------------------
CColorChooser: fix compile conversion warnings

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

------------------
This commit was generated by Migit
2017-03-14 09:42:30 +01:00
Thilo Graf
19c6ff581a CComponentsDetailsLine: add scale to details line width
Also added correction for odd line width values and added
method to change details line width.


Origin commit data
------------------
Branch: ni/coolstream
Commit: f5f2bf92ba
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-14 (Tue, 14 Mar 2017)



------------------
This commit was generated by Migit
2017-03-14 09:41:19 +01:00
Thilo Graf
20c5788556 cc_types.h: add scale to CC_WIDTH_MIN/CC_HEIGHT_MIN
Origin commit data
------------------
Branch: ni/coolstream
Commit: df48434092
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-14 (Tue, 14 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-14 09:41:10 +01:00
Thilo Graf
5ab0fbc081 settings.h: enable scale for DETAILSLINE_WIDTH
Origin commit data
------------------
Branch: ni/coolstream
Commit: afe98d3952
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-14 (Tue, 14 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-14 09:41:01 +01:00
vanhofen
8315062d3f .gitignore: add compile
- .svnignore: remove


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bf9c74f59
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-14 (Tue, 14 Mar 2017)

Origin message was:
------------------
- .gitignore: add compile

- .svnignore: remove


------------------
This commit was generated by Migit
2017-03-14 08:04:26 +01:00
Michael Liebmann
30bb73811a Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 12eef31a08
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-14 00:14:23 +01:00
vanhofen
4152afc612 neutrinoyparser: stay compatible with present code in Y_Blocks.txt
Origin commit data
------------------
Branch: ni/coolstream
Commit: 60d3cfb962
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)

Origin message was:
------------------
- neutrinoyparser: stay compatible with present code in Y_Blocks.txt

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

------------------
This commit was generated by Migit
2017-03-13 23:48:08 +01: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
7dcc90f09f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/widget/menue.cpp


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



------------------
This commit was generated by Migit
2017-03-13 12:45:30 +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
vanhofen
0a75d324ea Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e2cf02f310
Author: vanhofen <vanhofen@gmx.de>
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 11:40:34 +01:00
vanhofen
7bc18cdd11 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9c808309b8
Author: vanhofen <vanhofen@gmx.de>
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 11:40:24 +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
df5c3f62da Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: fa2fd94f77
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:56:04 +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
Thilo Graf
22f84b5bd8 cc_types.h: expand button_label_cc with hint as descrpition for button
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3fa097ebb9
Author: Thilo Graf <dbt@novatux.de>
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:45:38 +01:00
Thilo Graf
fc7164a182 cc_types: move struct button_label_cc into cc_types.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: e777ecdfdb
Author: Thilo Graf <dbt@novatux.de>
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:45:38 +01:00
Thilo Graf
96fe3a3856 CComponentsFooter: add bg_image to button_label_cc type
Origin commit data
------------------
Branch: ni/coolstream
Commit: e2ca965ee9
Author: Thilo Graf <dbt@novatux.de>
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:45:38 +01:00
vanhofen
c3245e8661 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: e7ff6d5493
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit
2017-03-12 21:59:40 +01:00
vanhofen
c51684e1c7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d784e8fb0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-12 21:59:02 +01:00
Michael Liebmann
7596c7d3d3 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 828329452e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-12 (Sun, 12 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-12 06:37:10 +01:00
Michael Liebmann
e7d1a44693 Revert "- allow to force given osd resolution in "videosystem = auto" mode"
This reverts commit f3fe4a116f.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ce34d5cf9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit
2017-03-12 06:32:52 +01:00
vanhofen
de0263121b tuxtxt.cpp: align to tuxbox-neutrino
Origin commit data
------------------
Branch: ni/coolstream
Commit: f599f3aa98
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-11 (Sat, 11 Mar 2017)

Origin message was:
------------------
- tuxtxt.cpp: align to tuxbox-neutrino

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

------------------
This commit was generated by Migit
2017-03-11 12:50:36 +01:00
Thilo Graf
5368732f2f CComponentsFooter: simplify implementation of button labels
button_label_l and button_label_s are now
merged to button_label_cc with prepared default values for text and locales.This type contains all possible
button label properties. Values for locales and string
are evaluated in setButtonLabels(), so it's possible to remove some
overloaded methodes.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c766a970dc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-11 (Sat, 11 Mar 2017)



------------------
This commit was generated by Migit
2017-03-11 00:45:25 +01:00
Thilo Graf
e7daf551b3 CCDraw: add possibility to use background images as item background
Provides functionality to use a backround image instead to render
usual box. If an image is defined, box render is disabled, but behavior
for hide, kill, cache... is not changed.

TODO:
- maybe needs global caching because images are not yet managed like icons in framebuffer class


Origin commit data
------------------
Branch: ni/coolstream
Commit: ccb82083e2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-11 (Sat, 11 Mar 2017)



------------------
This commit was generated by Migit
2017-03-11 00:45:25 +01:00
Stefan Seyfried
ff2eb92401 bouquetlist: don't block RC keys while list is opened
Origin commit data
------------------
Branch: ni/coolstream
Commit: c857fc49be
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-07 (Tue, 07 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-10 19:10:19 +01:00