mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-10 07:08:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,192 Commits 2 Branches 9 Tags
c2cc8c434f28d43b5a452bcfa674967bcb4d8881
Commit Graph

246 Commits

Author SHA1 Message Date
vanhofen
c2cc8c434f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
 2017-10-02 23:21:37 +02:00
vanhofen
583f45fad7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
 2017-10-02 23:19:49 +02:00
Stefan Seyfried
c9d4fdd9cc remove "using namespace std" from header files 
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)


Origin commit data
------------------
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
 2017-10-02 13:43:57 +02:00
vanhofen
20451a9be6 rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now 
Origin commit data
------------------
Commit: 99cc7f850a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
 2017-09-29 10:34:23 +02:00
vanhofen
9351a0bf31 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/gui/bookmarkmanager.cpp


Origin commit data
------------------
Commit: 537ea51fcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)
 2017-09-29 08:35:05 +02:00
vanhofen
1776ae664d rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now 
Origin commit data
------------------
Commit: ebc621f3b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
 2017-09-29 08:27:42 +02:00
vanhofen
0e3522fc52 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 2b7afc5b38
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-21 (Thu, 21 Sep 2017)
 2017-09-21 10:33:00 +02:00
vanhofen
1176d4169e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/channellist.cpp
	src/gui/widget/menue.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: 8d4677a319
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-21 (Thu, 21 Sep 2017)
 2017-09-21 10:32:33 +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
vanhofen
b15f91ff97 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 79162ebf6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-30 (Wed, 30 Aug 2017)
 2017-08-30 18:12:10 +02:00
vanhofen
73c370ab33 Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	src/gui/components/cc_frm_footer.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: fd25630d53
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-30 (Wed, 30 Aug 2017)
 2017-08-30 18:11:59 +02:00
Jacek Jendrzej
a23840bc0c Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 23797d29c0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-29 (Tue, 29 Aug 2017)
 2017-08-29 11:26:54 +02:00
vanhofen
3ad81e8d39 Revert "CTimerList: adjust label width in footer dependent by count of buttons" 
This reverts commit d8caaaf758.


Origin commit data
------------------
Commit: 3dbbd378f0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
 2017-08-28 13:18:35 +02:00
vanhofen
64edcce085 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a32d348e32
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
 2017-08-28 12:40:40 +02:00
Thilo Graf
d8caaaf758 CTimerList: adjust label width in footer dependent by count of buttons 
Origin commit data
------------------
Commit: 3987c3a306
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
 2017-08-28 12:16:45 +02:00
Thilo Graf
f36f3d25e6 CTimerList: paint header only if required 
Avoid possible flicker effects.

TODO: fix clock background with enabled gradient on header repaint.


Origin commit data
------------------
Commit: 4dd12767f9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
 2017-08-28 12:16:45 +02:00
Jacek Jendrzej
b01bf9414d Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 1763bb9e64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-08 (Tue, 08 Aug 2017)
 2017-08-08 20:06:40 +02:00
TangoCash
631df3ab05 fix epgtitle 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: bc5b3edc93
Author: TangoCash <eric@loxat.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2017-08-08 14:25:12 +02:00
vanhofen
ff24e343ce Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: edf3dfdc18
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)
 2017-08-01 11:15:08 +02:00
TangoCash
5d689d1e52 fix epgtitle 
Origin commit data
------------------
Commit: bc5a8f239f
Author: TangoCash <eric@loxat.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2017-07-29 14:56:01 +02:00
vanhofen
94e386d4ac Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 111ac82c9a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)
 2017-07-04 14:07:10 +02:00
Jacek Jendrzej
6fb14f5c06 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: f791ee1455
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-07-02 (Sun, 02 Jul 2017)
 2017-07-02 17:22:23 +02:00
gixxpunk
fce31144b0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: fc302d8871
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-07-01 (Sat, 01 Jul 2017)
 2017-07-01 10:55:12 +02:00
Jacek Jendrzej
70130c8cff src/gui/opkg_manager.cpp fix esource leak; supplement to 0e522bb6e6 
Origin commit data
------------------
Commit: 18e1ec060f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-07-01 (Sat, 01 Jul 2017)
 2017-07-01 10:26:33 +02:00
vanhofen
c8cba2e151 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 98edb55233
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)
 2017-06-26 22:51:58 +02:00
vanhofen
d4545b0abd Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a1baacc7d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)
 2017-06-26 22:51:16 +02:00
Jacek Jendrzej
e26b8378e6 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 8b89baa7a2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)
 2017-06-26 22:22:07 +02:00
vanhofen
842164614d timerlist: fix compiler-warning (comparison signed/unsigned int) 
(cherry picked from commit 3b84c0a7ae)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 033d6bb359
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)

Origin message was:
------------------
- timerlist: fix compiler-warning (comparison signed/unsigned int)

(cherry picked from commit 3b84c0a7ae)
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-06-26 20:53:12 +02:00
vanhofen
145b1b84fd timerlist: add separationline to items 
(cherry picked from commit 68dac768c0)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: d2415c4930
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)

Origin message was:
------------------
- timerlist: add separationline to items

(cherry picked from commit 68dac768c0)
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-06-26 20:53:12 +02:00
Jacek Jendrzej
0e522bb6e6 init pre post 
Origin commit data
------------------
Commit: 4bdacf39c8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)
 2017-06-26 19:23:23 +02:00
vanhofen
3b84c0a7ae timerlist: fix compiler-warning (comparison signed/unsigned int) 
Origin commit data
------------------
Commit: 28b606c19f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)

Origin message was:
------------------
- timerlist: fix compiler-warning (comparison signed/unsigned int)
 2017-06-26 11:49:17 +02:00
vanhofen
68dac768c0 timerlist: add separationline to items 
Origin commit data
------------------
Commit: 2709af5f8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-24 (Sat, 24 Jun 2017)

Origin message was:
------------------
- timerlist: add separationline to items
 2017-06-24 11:12:08 +02:00
vanhofen
663773d677 timerlist: re-add by mistake removed commit 8ef59f6 
Origin commit data
------------------
Commit: 6e7bb1c505
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-24 (Sat, 24 Jun 2017)

Origin message was:
------------------
- timerlist: re-add by mistake removed commit 8ef59f6
 2017-06-24 09:16:02 +02:00
Jacek Jendrzej
da7d2ce50f Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 2ddad19873
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-21 (Wed, 21 Jun 2017)
 2017-06-21 13:54:49 +02:00
vanhofen
bb5ecea8f0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/timerlist.cpp


Origin commit data
------------------
Commit: 94d3ba6d1e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)
 2017-06-21 11:43:58 +02:00
vanhofen
0c076425eb cc_frm_header: remove CComponentsHeaderLocalized() subclass 
use another constructor of CComponentsHeader() instead

Signed-off-by: Thilo Graf <dbt@novatux.de>

Good idea, this I had already in mind too.


Origin commit data
------------------
Commit: 980e293517
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)

Origin message was:
------------------
- cc_frm_header: remove CComponentsHeaderLocalized() subclass

use another constructor of CComponentsHeader() instead

Signed-off-by: Thilo Graf <dbt@novatux.de>

Good idea, this I had already in mind too.
 2017-06-21 10:31:22 +02:00
Thilo Graf
a78db68a63 CTimerList: partial revert of - timerlist: small design reworks ... 
removed: * blinking clock in header (shameless stolen from TangoCash)

Not really required here and before we can enable a ticking clock here,
clock must be disabled on opened context menues, because the
timerlist context menus will be damaged. This needs a separate handling.


Origin commit data
------------------
Commit: 06c8fd33f8
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)
 2017-06-21 10:31:22 +02:00
vanhofen
1d32d07224 timerlist: small design reworks ... 
* re-align item contents
* rename some variables
* use CComponentsFooter
* blinking clock in header (shameless stolen from TangoCash)

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 915410e571
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)

Origin message was:
------------------
- timerlist: small design reworks ...

* re-align item contents
* rename some variables
* use CComponentsFooter
* blinking clock in header (shameless stolen from TangoCash)

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-06-21 10:31:22 +02:00
vanhofen
49b94a015d timerlist: add space between channelname and "(CI)" string 
Origin commit data
------------------
Commit: ba149575e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)

Origin message was:
------------------
- timerlist: add space between channelname and "(CI)" string
 2017-06-20 21:25:57 +02:00
vanhofen
9e625173a2 timerlist: align header's clock format to the other header-clocks 
Origin commit data
------------------
Commit: c357993cb9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)

Origin message was:
------------------
- timerlist: align header's clock format to the other header-clocks
 2017-06-20 16:25:52 +02:00
vanhofen
ad6ede01b2 cc_frm_header: remove CComponentsHeaderLocalized() subclass 
use another constructor of CComponentsHeader() instead


Origin commit data
------------------
Commit: 92ceac6a5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)

Origin message was:
------------------
- cc_frm_header: remove CComponentsHeaderLocalized() subclass

use another constructor of CComponentsHeader() instead
 2017-06-20 15:55:42 +02:00
vanhofen
a95ede2649 timerlist: small design reworks ... 
* re-align item contents
* rename some variables
* use CComponentsFooter
* blinking clock in header (shameless stolen from TangoCash)


Origin commit data
------------------
Commit: 86067e6e44
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)

Origin message was:
------------------
- timerlist: small design reworks ...

* re-align item contents
* rename some variables
* use CComponentsFooter
* blinking clock in header (shameless stolen from TangoCash)
 2017-06-20 14:16:14 +02:00
vanhofen
61d41d0862 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/widget/listbox.cpp


Origin commit data
------------------
Commit: e32d5a869f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)
 2017-06-16 15:10:34 +02:00
Jacek Jendrzej
6eebe6055b Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: a70f3cb025
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)
 2017-06-16 14:19:26 +02:00
vanhofen
26bcb96210 timerlist: use CComponentsScrollbar 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 5d1a6a7f8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- timerlist: use CComponentsScrollbar

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-06-15 21:52:39 +02:00
vanhofen
73e943daea timerlist: use CComponentsScrollbar 
Origin commit data
------------------
Commit: bf644cdff0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- timerlist: use CComponentsScrollbar
 2017-06-15 16:30:02 +02:00
vanhofen
b4fecd0bdb Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: e78936e478
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)
 2017-05-30 01:27:37 +02:00
vanhofen
48b29784ad timerlist: don't use rc_info with remotetimers; that doesn't work 
Origin commit data
------------------
Commit: a03b7bcb1e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- timerlist: don't use rc_info with remotetimers; that doesn't work
 2017-05-23 23:11:34 +02:00
vanhofen
4e15c2ddfe Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 665e499208
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-03 (Wed, 03 May 2017)
 2017-05-03 23:08:15 +02:00
Jacek Jendrzej
66cf4d88cd Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: d8ba9c822a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-29 (Sat, 29 Apr 2017)
 2017-04-29 19:03:17 +02:00