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
12,197 Commits 2 Branches 9 Tags
a41a628385ae77b29ec2b50abd9c0d41bbd16d6c
Commit Graph

12197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vanhofen
619342d89d add and use FRAME_WIDTH defines; ... 
replace other fixed frame widths with OFFSET defines


Origin commit data
------------------
Commit: 6d58a3b1c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)

Origin message was:
------------------
- add and use FRAME_WIDTH defines; ...

replace other fixed frame widths with OFFSET defines
 2017-09-20 13:46:31 +02:00
vanhofen
8d642a4d57 fix compiler warnings in several console outputs 
Origin commit data
------------------
Commit: 4b2e03d348
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)

Origin message was:
------------------
- fix compiler warnings in several console outputs
 2017-09-20 11:53:02 +02:00
Michael Liebmann
95205bbad5 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 600d215aaf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)
 2017-09-19 23:21:21 +02:00
Michael Liebmann
0f8396bcaa Use parseJsonFromString() for parsing json data in 
- CMoviePlayerGui::luaGetUrl()
 - CTimerList::RemoteBoxChanExists()
 - CTimerList::RemoteBoxTimerList()
 - CTimerList::paintItem()
 - cTmdb::GetMovieDetails()
 - cYTFeedParser::parseFeedJSON()
 - cYTFeedParser::parseFeedDetailsJSON()


Origin commit data
------------------
Commit: 25ae929523
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)

Origin message was:
------------------
Use parseJsonFromString() for parsing json data in

  - CMoviePlayerGui::luaGetUrl()
  - CTimerList::RemoteBoxChanExists()
  - CTimerList::RemoteBoxTimerList()
  - CTimerList::paintItem()
  - cTmdb::GetMovieDetails()
  - cYTFeedParser::parseFeedJSON()
  - cYTFeedParser::parseFeedDetailsJSON()
 2017-09-19 23:20:39 +02:00
Michael Liebmann
8641bcd5ee helpers.cpp: Add new functions 
- readFile()
 - parseJsonFromFile()
 - parseJsonFromString()

 parseJsonFromString() and parseJsonFromFile() use Json::CharReader
 instead of the obsolete function Json::Reader


Origin commit data
------------------
Commit: 05d8ed4105
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)

Origin message was:
------------------
helpers.cpp: Add new functions

 - readFile()
 - parseJsonFromFile()
 - parseJsonFromString()

 parseJsonFromString() and parseJsonFromFile() use Json::CharReader
 instead of the obsolete function Json::Reader
 2017-09-19 23:20:39 +02:00
vanhofen
b7af37cf1d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 08231c17bf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-19 (Tue, 19 Sep 2017)
 2017-09-19 21:31:46 +02:00
gixxpunk
159b844430 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 89de096d1e
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)
 2017-09-19 20:35:30 +02:00
Thilo Graf
ba2c0e22b7 CKeyChooserItem: add missing 'timeoutbar' while waiting for pressed key 
Origin commit data
------------------
Commit: 3e17b73df6
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-19 (Tue, 19 Sep 2017)
 2017-09-19 19:41:42 +02:00
gixxpunk
2723dbdcba Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 1875ced1c5
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)
 2017-09-19 18:37:22 +02:00
Jacek Jendrzej
c0f1dd3454 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: ef0154a89b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)
 2017-09-19 18:16:14 +02:00
vanhofen
955f1e2afa menue: use getItemColors() to get item colors 
Origin commit data
------------------
Commit: 57a17472a6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)

Origin message was:
------------------
- menue: use getItemColors() to get item colors
 2017-09-19 18:10:56 +02:00
Jacek Jendrzej
42c8775883 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 74be1f7b5b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)
 2017-09-19 16:24:38 +02:00
max_10
b780215fad mediaplayer: fixes form Duckbox git 
Origin commit data
------------------
Commit: af3a61cb96
Author: max_10 <max_10@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)
 2017-09-19 15:12:53 +02:00
Jacek Jendrzej
79d9f7965e Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 756f464a3f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)
 2017-09-19 12:40:58 +02:00
Jacek Jendrzej
462626f9eb fix start clock supplement to 0f9284bf91 
Origin commit data
------------------
Commit: b1f820aa44
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)
 2017-09-19 12:40:02 +02:00
vanhofen
7f85a3063f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: d3b1505600
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)
 2017-09-18 22:57:05 +02:00
vanhofen
6ea00bb502 menue: use getItemColors() to get item colors 
Origin commit data
------------------
Commit: 477ece6ece
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)

Origin message was:
------------------
- menue: use getItemColors() to get item colors
 2017-09-18 22:53:27 +02:00
vanhofen
5c12837f35 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 6dd6df52fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)
 2017-09-18 21:53:44 +02:00
gixxpunk
abee9b0913 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 315a87f2be
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)
 2017-09-18 16:31:55 +02:00
Jacek Jendrzej
b2b526b987 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 2dd24f8c21
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)
 2017-09-18 15:55:41 +02:00
Jacek Jendrzej
48cf627494 osd_setup.cpp fix memleak 
Origin commit data
------------------
Commit: 82a0cdeb68
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)
 2017-09-18 14:57:11 +02:00
Jacek Jendrzej
b34c510658 fix memleak 
Origin commit data
------------------
Commit: 511d953a18
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)
 2017-09-18 14:11:34 +02:00
Jacek Jendrzej
c8b3cee9cb Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: a23737a626
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)
 2017-09-18 10:53:42 +02:00
Jacek Jendrzej
14145554aa fix mem leak 
Origin commit data
------------------
Commit: a7942c9987
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)
 2017-09-18 08:56:02 +02:00
Thilo Graf
41a81c11e5 CKeyChooserItem: fix possible memleak 
Origin commit data
------------------
Commit: 5a48398bb4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-17 (Sun, 17 Sep 2017)
 2017-09-17 22:24:44 +02:00
Thilo Graf
6603d1126e CHintBox: fix possible unintended cut of text 
Last line size was not considered.


Origin commit data
------------------
Commit: 87b53a8597
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-17 (Sun, 17 Sep 2017)
 2017-09-17 21:50:59 +02:00
Thilo Graf
7d4e64e8f8 CPersonalizeGui: fix visualize of passive and active locked items 
Origin commit data
------------------
Commit: 7c0d0b06d0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-17 (Sun, 17 Sep 2017)
 2017-09-17 13:52:54 +02:00
Thilo Graf
3c2c889a58 CMenuItem: add members set/get info icon inside menu items 
Origin commit data
------------------
Commit: f0660dc66c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-17 (Sun, 17 Sep 2017)
 2017-09-17 13:52:43 +02:00
vanhofen
389b44ffab setting_helpers: fix flagfile handling in CFlagFileNotifier() 
Origin commit data
------------------
Commit: 57bdeba636
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-16 (Sat, 16 Sep 2017)

Origin message was:
------------------
- setting_helpers: fix flagfile handling in CFlagFileNotifier()
 2017-09-16 14:04:06 +02:00
Jacek Jendrzej
ebb4b89d93 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: ea89db1ec2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-16 (Sat, 16 Sep 2017)
 2017-09-16 13:26:53 +02:00
vanhofen
5c5b4f4b0a Merge branch 'master' 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: 4e868c860a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-16 (Sat, 16 Sep 2017)
 2017-09-16 13:01:20 +02:00
Jacek Jendrzej
6a908d7228 remove unused locale 
Origin commit data
------------------
Commit: be671bcdc9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-16 (Sat, 16 Sep 2017)
 2017-09-16 12:53:03 +02:00
vanhofen
301a066422 keychooser: just small renamings for a better view 
Origin commit data
------------------
Commit: 2cc8978f4b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- keychooser: just small renamings for a better view
 2017-09-16 11:29:46 +02:00
vanhofen
bc3aec2238 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: bcb50dacc6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-16 (Sat, 16 Sep 2017)
 2017-09-16 11:04:54 +02:00
vanhofen
58e5e670c1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/widget/colorchooser.cpp


Origin commit data
------------------
Commit: 10c224c00e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-16 (Sat, 16 Sep 2017)
 2017-09-16 11:03:04 +02:00
Thilo Graf
64f30884ed CColorChooser: fix possible artefacts on screen after closed window 
Window was painted with shadow but hide() method didn't know about this.


Origin commit data
------------------
Commit: 38f80a5ca6
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)
 2017-09-15 22:23:01 +02:00
Jacek Jendrzej
95c8f0d759 readd fontmenu scaling hint 
Origin commit data
------------------
Commit: 3732eb851a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-15 (Fri, 15 Sep 2017)
 2017-09-15 21:27:36 +02:00
Jacek Jendrzej
678fa9560f Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: e3998c1ced
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-15 (Fri, 15 Sep 2017)
 2017-09-15 20:44:49 +02:00
vanhofen
c846cceba5 icons: rename slider icons to more logical names 
Origin commit data
------------------
Commit: cd539af1f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- icons: rename slider icons to more logical names
 2017-09-15 20:18:26 +02:00
vanhofen
98851fc4e7 rename SLIDER defines 
Origin commit data
------------------
Commit: d873aef1e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- rename SLIDER defines
 2017-09-15 20:17:48 +02:00
vanhofen
1af6786518 icons: new slider icons with material colors 
Origin commit data
------------------
Commit: eb22f29d3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- icons: new slider icons with material colors
 2017-09-15 20:17:07 +02:00
vanhofen
53336e813e menu: rework slider; ... 
* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


Origin commit data
------------------
Commit: 0a748de445
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- menu: rework slider; ...

* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly
 2017-09-15 20:16:13 +02:00
vanhofen
7b141038c2 colorchooser: rework tis gui-element; ... 
* use OFFSET defines
* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


Origin commit data
------------------
Commit: 442f1adff0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- colorchooser: rework tis gui-element; ...

* use OFFSET defines
* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly
 2017-09-15 20:15:25 +02:00
vanhofen
1f0feccf78 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: e9dbee89df
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)
 2017-09-15 19:07:00 +02:00
vanhofen
b18675eb20 keychooser: just small renamings for a better view 
Origin commit data
------------------
Commit: a648203955
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- keychooser: just small renamings for a better view
 2017-09-15 19:04:57 +02:00
vanhofen
c0c088f36f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/widget/keychooser.h


Origin commit data
------------------
Commit: a529a43164
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)
 2017-09-15 18:26:42 +02:00
vanhofen
87fa51f50f menue: don't move menu in centered mode to the right; ... 
when hintboxes do overlay the menu it looks crooked


Origin commit data
------------------
Commit: 221722bc9e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- menue: don't move menu in centered mode to the right; ...

when hintboxes do overlay the menu it looks crooked
 2017-09-15 18:23:31 +02:00
vanhofen
75212a5c31 menue: always show frame around the hintbox 
Origin commit data
------------------
Commit: 38237f07b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- menue: always show frame around the hintbox
 2017-09-15 18:23:31 +02:00
vanhofen
cafa859775 keychooser: use CMenuDForwarder instead of CMenuForwarder 
Origin commit data
------------------
Commit: 10d236fd16
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- keychooser: use CMenuDForwarder instead of CMenuForwarder
 2017-09-15 16:40:14 +02:00
vanhofen
b6d05461a8 keychooser: strip unneeded code; use hintbox instead of handcrafted paints 
Origin commit data
------------------
Commit: 5370086103
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- keychooser: strip unneeded code; use hintbox instead of handcrafted paints
 2017-09-15 16:34:23 +02:00