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

9925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vanhofen
3daf7a9792 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
------------------
Commit: 653e6d3dd3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 23:37:37 +01:00
vanhofen
6c57da28be Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 4cab22024f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 22:47:35 +01:00
Michael Liebmann
b02e3e871e Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: b190e0c4ff
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 21:19:08 +01:00
TangoCash
c1bb877834 add unicable2/jess (thx DboxOldie) 
Origin commit data
------------------
Commit: f974b56343
Author: TangoCash <eric@loxat.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 19:51:20 +01:00
Jacek Jendrzej
41b7873147 screenshot.cpp fix memcpy param overlap 
Origin commit data
------------------
Commit: 142ac1392f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 19:02:44 +01:00
Jacek Jendrzej
7764d7d1c3 src/neutrino.cpp fix possible memleak 
Origin commit data
------------------
Commit: f18ec050c7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 15:56:23 +01:00
vanhofen
60790d0603 Merge pull request #8 from Pr0metheus2/patch-1 
Update slovak.locale

Origin commit data
------------------
Commit: 09606c5ded
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 11:21:49 +01:00
Thilo Graf
409d5dc575 CComponentsExtTextForm: use scaled default dimension values 
Origin commit data
------------------
Commit: e498cc6b09
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 09:58:28 +01:00
Thilo Graf
de5a01942e CImageInfo: optimize label arrangement 
Distance between label and text was too large with full hd resolution.


Origin commit data
------------------
Commit: 17227504c2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 09:58:23 +01:00
Thilo Graf
451f560459 CComponentsExtTextForm: fix label width calculation 
Origin commit data
------------------
Commit: 81cde4836f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 09:58:10 +01:00
Thilo Graf
88b972aed4 CImageInfo: use global offset for item offset 
Origin commit data
------------------
Commit: 1db1182b87
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 09:57:43 +01:00
Andrej Tobola
1bce68ca08 Update slovak.locale 
Origin commit data
------------------
Commit: 9cefe16d4b
Author: Andrej Tobola <andrej.tobola+gifthub@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 09:32:43 +01:00
Michael Liebmann
4193a88be1 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 49737c5ee2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)
 2017-03-14 17:33:57 +01:00
Thilo Graf
730835160d CColorChooser: fix compile conversion warnings 
Origin commit data
------------------
Commit: 3b5cd00bf4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-14 (Tue, 14 Mar 2017)

Origin message was:
------------------
CColorChooser: fix compile conversion warnings
 2017-03-14 09:42:30 +01:00
Thilo Graf
c591f1091c 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
------------------
Commit: f5f2bf92ba
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-14 (Tue, 14 Mar 2017)
 2017-03-14 09:41:19 +01:00
Thilo Graf
d913d04880 cc_types.h: add scale to CC_WIDTH_MIN/CC_HEIGHT_MIN 
Origin commit data
------------------
Commit: df48434092
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-14 (Tue, 14 Mar 2017)
 2017-03-14 09:41:10 +01:00
Thilo Graf
830b0e43d7 settings.h: enable scale for DETAILSLINE_WIDTH 
Origin commit data
------------------
Commit: afe98d3952
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-14 (Tue, 14 Mar 2017)
 2017-03-14 09:41:01 +01:00
vanhofen
9ec64726af .gitignore: add compile 
- .svnignore: remove


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

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

- .svnignore: remove
 2017-03-14 08:04:26 +01:00
Michael Liebmann
b709d2e04c Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 12eef31a08
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)
 2017-03-14 00:14:23 +01:00
vanhofen
003c72673f neutrinoyparser: stay compatible with present code in Y_Blocks.txt 
Origin commit data
------------------
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
 2017-03-13 23:48:08 +01:00
Michael Liebmann
bbaad5b19d Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 2677543cc4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 21:55:50 +01:00
vanhofen
30fd965086 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
------------------
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 12:45:30 +01:00
vanhofen
9c009ade29 unify DetailsLine-names; move define to settings.h 
Origin commit data
------------------
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
 2017-03-13 12:40:04 +01:00
vanhofen
8c65bc5cf0 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: e2cf02f310
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 11:40:34 +01:00
vanhofen
504194f201 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 9c808309b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 11:40:24 +01:00
Michael Liebmann
a3e6544398 CMenuWidget::calcSize: Add forgotten 'wi' 
Origin commit data
------------------
Commit: d0b02a9752
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 10:34:37 +01:00
Michael Liebmann
e3076746d4 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: fa2fd94f77
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 09:56:04 +01:00
Michael Liebmann
a84f479b62 CMenuWidget::calcSize: Use scale2Res() to adjust fixed sizes 
Origin commit data
------------------
Commit: 2ed30486c4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 09:55:58 +01:00
Michael Liebmann
b19cf5238c CMenuWidget::calcSize: Recalculation of min_width ... 
... for adjustment to the osd resolution


Origin commit data
------------------
Commit: 30db40da1a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 09:55:58 +01:00
Thilo Graf
6b0d4ed2c0 cc_types.h: expand button_label_cc with hint as descrpition for button 
Origin commit data
------------------
Commit: 3fa097ebb9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 09:45:38 +01:00
Thilo Graf
fbe5200b0c cc_types: move struct button_label_cc into cc_types.h 
Origin commit data
------------------
Commit: e777ecdfdb
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 09:45:38 +01:00
Thilo Graf
e23f4e1db5 CComponentsFooter: add bg_image to button_label_cc type 
Origin commit data
------------------
Commit: e2ca965ee9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 09:45:38 +01:00
vanhofen
7dd5854d20 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
------------------
Commit: e7ff6d5493
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 21:59:40 +01:00
vanhofen
d259a7fa79 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 6d784e8fb0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 21:59:02 +01:00
Michael Liebmann
6e32a631bd Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 828329452e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 06:37:10 +01:00
Michael Liebmann
f9abc1c985 Revert "- allow to force given osd resolution in "videosystem = auto" mode" 
This reverts commit b9472250c3.


Origin commit data
------------------
Commit: 5ce34d5cf9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 06:32:52 +01:00
vanhofen
da360bea16 tuxtxt.cpp: align to tuxbox-neutrino 
Origin commit data
------------------
Commit: f599f3aa98
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-11 (Sat, 11 Mar 2017)

Origin message was:
------------------
- tuxtxt.cpp: align to tuxbox-neutrino
 2017-03-11 12:50:36 +01:00
Thilo Graf
616904958c 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
------------------
Commit: c766a970dc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-11 (Sat, 11 Mar 2017)
 2017-03-11 00:45:25 +01:00
Thilo Graf
002a3ab7d2 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
------------------
Commit: ccb82083e2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-11 (Sat, 11 Mar 2017)
 2017-03-11 00:45:25 +01:00
Stefan Seyfried
600dc518cd bouquetlist: don't block RC keys while list is opened 
Origin commit data
------------------
Commit: c857fc49be
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-07 (Tue, 07 Mar 2017)
 2017-03-10 19:10:19 +01:00
Stefan Seyfried
e56dde123a msgbox: deobfuscate assignment of default result value 
Origin commit data
------------------
Commit: 2cef61bd8e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-07 (Tue, 07 Mar 2017)
 2017-03-10 19:10:06 +01:00
Michael Liebmann
bd2ffd04f3 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 87cb1b514a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 15:38:15 +01:00
vanhofen
1cb8859aa9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: d384f4e37c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 15:37:03 +01:00
vanhofen
4110492797 controlapi: /control/info => return PACKAGE_NAME and PACKAGE_VERSION 
Origin commit data
------------------
Commit: 0203de264f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- controlapi: /control/info => return PACKAGE_NAME and PACKAGE_VERSION
 2017-03-10 15:36:13 +01:00
vanhofen
8ce36eb9e1 remove obsolete ifdef's 
Origin commit data
------------------
Commit: 4aecc9f1b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- remove obsolete ifdef's
 2017-03-10 15:27:30 +01:00
vanhofen
b90bc955c3 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 114392256c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 15:21:17 +01:00
vanhofen
a8db520beb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	lib/hardware/coolstream/hd2/libcoolstream/cs_api.h


Origin commit data
------------------
Commit: 8c95f1f7a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
 2017-03-10 15:10:04 +01:00
vanhofen
e96b2f0178 hardware_caps: just changes in comments 
Origin commit data
------------------
Commit: ff6046bb56
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- hardware_caps: just changes in comments
 2017-03-10 15:07:52 +01:00
vanhofen
a924473bb6 neutrinoyparser: use hw_caps in func_get_boxtype() ... 
... and func_get_boxmodel()


Origin commit data
------------------
Commit: 305b1a6da5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- neutrinoyparser: use hw_caps in func_get_boxtype() ...

... and func_get_boxmodel()
 2017-03-10 15:07:52 +01:00
vanhofen
26584b4308 controlapi: use hw_caps in HWInfoCGI() 
Origin commit data
------------------
Commit: b902648b08
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- controlapi: use hw_caps in HWInfoCGI()
 2017-03-10 15:07:52 +01:00