mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 09:21:09 +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
a41a628385 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: c965d2408d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
 2017-10-02 23:24:39 +02:00
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
80df05e950 helpers/readFile: limit memory allocations 
Origin commit data
------------------
Commit: 2f39081708
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
 2017-10-02 13:43:57 +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
6c4264a4cd Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: fe645c6114
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
 2017-10-01 23:33:28 +02:00
Stefan Seyfried
eff7a174b2 helpers/readFile: limit memory allocations 
Origin commit data
------------------
Commit: 21f04057bd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
 2017-10-01 14:38:52 +02:00
Stefan Seyfried
73cfd63885 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: aa240a9457
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
 2017-10-01 14:12:55 +02:00
Stefan Seyfried
831e9865f9 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 189a4c62d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
 2017-10-01 13:08:15 +02:00
vanhofen
ffcc694393 deutsch.locale: adjust EPGPlus.remind 
Origin commit data
------------------
Commit: 17ea8e7d63
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-30 (Sat, 30 Sep 2017)

Origin message was:
------------------
- deutsch.locale: adjust EPGPlus.remind
 2017-09-30 13:18:12 +02:00
Stefan Seyfried
c4e6ecdf63 CMenuWidget: fix "left" key for menuchoosers where 
the "decrement menu function" got lost by the last "simplify code and
add missing break" commit. The implicit fallthrough actually was used to
execute the "left" function.
Reorganize the code so that it works even without the implicit
fallthrough.


Origin commit data
------------------
Commit: ab3434e278
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)
 2017-09-30 13:14:57 +02:00
vanhofen
efe62f6905 deutsch.locale: adjust EPGPlus.remind 
Origin commit data
------------------
Commit: 081ac08d86
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-30 (Sat, 30 Sep 2017)

Origin message was:
------------------
- deutsch.locale: adjust EPGPlus.remind
 2017-09-30 10:13:52 +02:00
vanhofen
0a7d0a149a Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: aa61c39211
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-30 (Sat, 30 Sep 2017)
 2017-09-30 09:18:12 +02:00
Stefan Seyfried
57e71ff625 CMenuWidget: fix "left" key for menuchoosers where 
the "decrement menu function" got lost by the last "simplify code and
add missing break" commit. The implicit fallthrough actually was used to
execute the "left" function.
Reorganize the code so that it works even without the implicit
fallthrough.


Origin commit data
------------------
Commit: fea586b311
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)
 2017-09-30 08:19:29 +02:00
vanhofen
b4363c5dc4 Revert "Revert "CMenuWidget: simplify menu_left_exit code, add missing break"" 
This reverts the revert commit ab4decf40e.


Origin commit data
------------------
Commit: 39d31166c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-30 (Sat, 30 Sep 2017)
 2017-09-30 08:10:56 +02:00
Stefan Seyfried
603430617b CMenuWidget: fix "left" key for menuchoosers where 
the "decrement menu function" got lost by the last "simplify code and
add missing break" commit. The implicit fallthrough actually was used to
execute the "left" function.
Reorganize the code so that it works even without the implicit
fallthrough.


Origin commit data
------------------
Commit: 0e144e67ad
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)
 2017-09-29 20:37:37 +02:00
gixxpunk
7744c61ce9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a15c23be7d
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-29 (Fri, 29 Sep 2017)
 2017-09-29 15:25:21 +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
d639455da5 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: d2c54a405b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)
 2017-09-28 23:43:36 +02:00
vanhofen
cce794bbac hdd-info: rework CHDDInfoWidget::paint(); use current gui-standards ... 
Origin commit data
------------------
Commit: 54606af779
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)

Origin message was:
------------------
- hdd-info: rework CHDDInfoWidget::paint(); use current gui-standards ...
 2017-09-28 23:41:24 +02:00
vanhofen
c1535b5567 several memleak fixes; Dziekuje. 
Origin commit data
------------------
Commit: 0f9cb1dc50
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)

Origin message was:
------------------
- several memleak fixes; Dziekuje.
 2017-09-28 15:23:38 +02:00
vanhofen
cce7d1b424 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: bfe2d81fc3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)
 2017-09-28 14:43:25 +02:00
vanhofen
c1f30d17dd bouqueteditor: clear details in infobox if no channels available 
Origin commit data
------------------
Commit: 386c2b4d09
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)

Origin message was:
------------------
- bouqueteditor: clear details in infobox if no channels available
 2017-09-28 14:12:32 +02:00
vanhofen
9ca041f38b bouqueteditor: clear details in infobox if no channels available 
Origin commit data
------------------
Commit: 91baf27971
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)

Origin message was:
------------------
- bouqueteditor: clear details in infobox if no channels available
 2017-09-28 14:01:05 +02:00
Jacek Jendrzej
2aa2cc738f fix clang compil, use swap() 
Origin commit data
------------------
Commit: 0f26434550
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-28 (Thu, 28 Sep 2017)
 2017-09-28 13:43:51 +02:00
vanhofen
92abcdc76d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 28006917aa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)
 2017-09-27 14:31:32 +02:00
vanhofen
5bbee58487 menue: only add hint_height to full_height, if we really have a hint 
Origin commit data
------------------
Commit: 58e05cfd99
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- menue: only add hint_height to full_height, if we really have a hint
 2017-09-27 14:29:51 +02:00
vanhofen
81b6ac9b3d menue: only add hint_height to full_height, if we really have a hint 
Origin commit data
------------------
Commit: eb60c52a97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- menue: only add hint_height to full_height, if we really have a hint
 2017-09-27 14:26:22 +02:00
vanhofen
120ebdbe64 bouqueteditor_channels: allow to navigate with left/right through the bouquets 
add corresponding context-icons to header


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

Origin message was:
------------------
- bouqueteditor_channels: allow to navigate with left/right through the bouquets

add corresponding context-icons to header
 2017-09-27 14:20:11 +02:00
vanhofen
79983f7af6 bouqueteditor_channels: allow to navigate with left/right through the bouquets 
add corresponding context-icons to header


Origin commit data
------------------
Commit: 4d9aff730e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- bouqueteditor_channels: allow to navigate with left/right through the bouquets

add corresponding context-icons to header
 2017-09-27 14:13:28 +02:00
vanhofen
68cb4281d6 bouqueteditor: some more timeout-fixes 
Origin commit data
------------------
Commit: c00013ea52
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- bouqueteditor: some more timeout-fixes
 2017-09-27 11:55:22 +02:00
vanhofen
f6b2da8a5d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 0e00551506
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)
 2017-09-27 11:53:43 +02:00
vanhofen
1dd887d5fc Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 581d635af7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)
 2017-09-27 11:53:23 +02:00
vanhofen
8dfa791177 bouqueteditor: some more timeout-fixes 
Origin commit data
------------------
Commit: e5569d9840
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- bouqueteditor: some more timeout-fixes
 2017-09-27 11:50:47 +02:00
Jacek Jendrzej
ab4decf40e Revert "CMenuWidget: simplify menu_left_exit code, add missing break" 
This reverts commit a381903b02.


Origin commit data
------------------
Commit: 1deaebf1cf
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
 2017-09-27 11:11:12 +02:00
vanhofen
25804788d3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: b718ddff50
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)
 2017-09-27 10:48:51 +02:00
vanhofen
fc14107b0b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 6818aad0ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)
 2017-09-27 10:48:30 +02:00
vanhofen
ff62bdcdb7 fix some timout-off-bugs in bouquetlist and channellist 
Origin commit data
------------------
Commit: 95157b1f8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- fix some timout-off-bugs in bouquetlist and channellist
 2017-09-27 09:57:19 +02:00
vanhofen
6c32f7b375 fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser 
Origin commit data
------------------
Commit: f0e7069878
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser
 2017-09-27 09:57:10 +02:00
vanhofen
18fd66d365 bouqueteditor: fix timeout; editor doesn't open when timeout was "off" 
Origin commit data
------------------
Commit: db80514499
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- bouqueteditor: fix timeout; editor doesn't open when timeout was "off"
 2017-09-27 09:50:14 +02:00
vanhofen
f6405d15f0 network-setup: add header-icon to network-test 
Origin commit data
------------------
Commit: db5af2d9ca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- network-setup: add header-icon to network-test
 2017-09-27 09:50:14 +02:00
vanhofen
0721dcc47f network-setup: fix text-alignment for network-test 
Origin commit data
------------------
Commit: b37deab766
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-26 (Tue, 26 Sep 2017)

Origin message was:
------------------
- network-setup: fix text-alignment for network-test
 2017-09-27 09:50:14 +02:00
vanhofen
22cdf620c7 fix some timout-off-bugs in bouquetlist and channellist 
Origin commit data
------------------
Commit: 5405ea7aee
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- fix some timout-off-bugs in bouquetlist and channellist
 2017-09-27 09:13:07 +02:00
vanhofen
7eefaebe15 fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser 
Origin commit data
------------------
Commit: 5b8f7b86bf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser
 2017-09-27 08:53:13 +02:00
vanhofen
f184e79594 bouqueteditor: fix timeout; editor doesn't open when timeout was "off" 
Origin commit data
------------------
Commit: 798661b006
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- bouqueteditor: fix timeout; editor doesn't open when timeout was "off"
 2017-09-27 08:33:15 +02:00
vanhofen
7a1c365f54 network-setup: add header-icon to network-test 
Origin commit data
------------------
Commit: 30b1c76aad
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- network-setup: add header-icon to network-test
 2017-09-27 08:32:42 +02:00
vanhofen
51e5eb8f07 network-setup: fix text-alignment for network-test 
Origin commit data
------------------
Commit: b692d24fda
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-26 (Tue, 26 Sep 2017)

Origin message was:
------------------
- network-setup: fix text-alignment for network-test
 2017-09-26 23:16:26 +02:00
vanhofen
0ac696ebaf Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 09be0b85b4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-26 (Tue, 26 Sep 2017)
 2017-09-26 16:13:18 +02:00