mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
15,156 Commits 2 Branches 9 Tags
212f7d3b98127964ab0c94316247f8913f04e5cf
Commit Graph

386 Commits

Author SHA1 Message Date
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
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
Jacek Jendrzej
816a0ae326 Revert "src/gui/osd_setup.cpp disable hint paint in channellist-mode, is broken" 
This reverts commit 9566002cf8.


Origin commit data
------------------
Commit: ca09c92542
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)
 2017-09-26 12:41:05 +02:00
vanhofen
459deeca9f osd-setup: use 0 as a localized value for timeout-settings 
Origin commit data
------------------
Commit: 7c429c17e0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- osd-setup: use 0 as a localized value for timeout-settings
 2017-09-26 12:41:05 +02:00
vanhofen
0639e863d5 osd-setup: add missing delete 
Origin commit data
------------------
Commit: 2cb8235ae4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- osd-setup: add missing delete
 2017-09-25 22:27:26 +02:00
vanhofen
0721f777a8 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 367b0a68ef
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
 2017-09-25 13:57:26 +02:00
vanhofen
a38df2dbc3 Revert "src/gui/osd_setup.cpp disable hint paint in channellist-mode, is broken" 
This reverts commit 9566002cf8.


Origin commit data
------------------
Commit: 317f267ef2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
 2017-09-25 13:52:37 +02:00
vanhofen
4681ed01cb Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 2a787fe28b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
 2017-09-25 08:45:42 +02:00
vanhofen
bfef65f8ee osd-setup: use 0 as a localized value for timeout-settings 
Origin commit data
------------------
Commit: 2bdcd058e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- osd-setup: use 0 as a localized value for timeout-settings
 2017-09-25 08:44:21 +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
vanhofen
402c567fe7 add and use FRAME_WIDTH defines; ... 
replace other fixed frame widths with OFFSET defines

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


Origin commit data
------------------
Commit: 6ee3e54741
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

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-09-20 21:29:53 +02:00
Jacek Jendrzej
9566002cf8 src/gui/osd_setup.cpp disable hint paint in channellist-mode, is broken 
Origin commit data
------------------
Commit: e308407b22
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-20 (Wed, 20 Sep 2017)
 2017-09-20 18:07:05 +02:00
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
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
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
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
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
vanhofen
c6c61f6b22 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)
 2017-09-12 22:32:07 +02:00
vanhofen
fdfff6958f move CNITouchFileNotifier to CFlagFileNotifier 
Origin commit data
------------------
Commit: 0eadd27032
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move CNITouchFileNotifier to CFlagFileNotifier
 2017-09-12 22:30:34 +02:00
vanhofen
f37efba8f7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 4bc4a80094
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)
 2017-09-09 08:44:18 +02:00
vanhofen
2ee7a428d9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: eb76978295
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)
 2017-09-09 08:43:52 +02:00
Jacek Jendrzej
b03ab5cb9e remove double includes 
Origin commit data
------------------
Commit: 6576729fd1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-08 (Fri, 08 Sep 2017)
 2017-09-08 21:21:32 +02:00
vanhofen
284426853d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: ff282cbad1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)
 2017-08-27 23:56:52 +02:00
gixxpunk
78143c569a re-add missing include 
Origin commit data
------------------
Commit: 940569fb9e
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-08-26 (Sat, 26 Aug 2017)

Origin message was:
------------------
- re-add missing include
 2017-08-26 12:38:16 +02:00
vanhofen
e87210b1d2 remove possibility to change iconsets for infoviewer 
Origin commit data
------------------
Commit: ae9435f75d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)

Origin message was:
------------------
- remove possibility to change iconsets for infoviewer
 2017-08-26 10:19:37 +02:00
vanhofen
b327436c94 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: e0cd8f75d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)
 2017-08-09 10:37:47 +02:00
vanhofen
a0f5a94440 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fb_generic.cpp
	src/gui/components/cc_frm_header.h
	src/gui/osd_setup.cpp
	src/gui/themes.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/settings.h


Origin commit data
------------------
Commit: 644a634f3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-08 (Tue, 08 Aug 2017)
 2017-08-08 15:54:12 +02:00
Thilo Graf
1d8c69936d COsdSetup: add slot to ensure clean up icon cache on changed resolution. 
Some old icon data makes no sense with changed resolution.
In some cases it could happens that no icons are to see on screen
after changed resolution. This should fix this,


Origin commit data
------------------
Commit: 58d4f13bb7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-02 (Wed, 02 Aug 2017)
 2017-08-08 14:25:12 +02:00
Thilo Graf
22ed88a072 Colorsettings: add possibility to change shadow color 
Shadow color was bound to infobar color and it's not really
understandable why, because with some colors eg. black, the shadow is
grey or with other colors it is exaggerated colored and seems to be
not realistically and looks unusual if shadow is brighter or colorful
than foreground. Some themes will thank it.

TODO: update theme files with matching values if required


Origin commit data
------------------
Commit: c600b4c416
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-02 (Wed, 02 Aug 2017)
 2017-08-08 14:25:12 +02:00
vanhofen
c35224ff08 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: 17546e7ba1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-10 (Sat, 10 Jun 2017)
 2017-06-10 11:43:50 +02:00
vanhofen
5a9e9904a7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	configure.ac
	data/icons/filetypes/mp3.png
	data/icons/filetypes/picture.png
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/filebrowser.cpp
	src/gui/followscreenings.cpp
	src/gui/followscreenings.h
	src/gui/osd_setup.cpp
	src/gui/record_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 75db11c2e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 15:14:51 +02:00
Michael Liebmann
9767657185 Merge branch 'pu/fb-setmode' 
Origin commit data
------------------
Commit: 624f2b3154
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 14:18:01 +02:00
vanhofen
e3835a8272 filebrowser: use a bit larger regular font by default 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 11aa9054bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)

Origin message was:
------------------
- filebrowser: use a bit larger regular font by default

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-06-07 14:17:11 +02:00
vanhofen
a0ec4edf2e remove graphic progressbar 
Origin commit data
------------------
Commit: 675c0dc6f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-06 (Tue, 06 Jun 2017)

Origin message was:
------------------
- remove graphic progressbar
 2017-06-06 00:09:31 +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
01e489a44f filebrowser: use a bit larger regular font by default 
Origin commit data
------------------
Commit: b1b6994fd7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)

Origin message was:
------------------
- filebrowser: use a bit larger regular font by default
 2017-05-30 01:24:21 +02:00
vanhofen
694eaa1cf4 osd_setup: move unused fonts away from users choice 
Origin commit data
------------------
Commit: c367becaec
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- osd_setup: move unused fonts away from users choice
 2017-05-23 18:21:51 +02:00
vanhofen
59852c47dd Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 3d8073b910
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)
 2017-05-23 17:59:21 +02:00
vanhofen
4965e8a845 osd_setup: move channellist_show_channellogo to new logo menu; ... 
align locales


Origin commit data
------------------
Commit: fe50c85a3b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- osd_setup: move channellist_show_channellogo to new logo menu; ...

align locales
 2017-05-23 17:58:53 +02:00
vanhofen
1a323fbbdc osd_setup: add channellogo-setup menu 
Origin commit data
------------------
Commit: e9297bcc1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- osd_setup: add channellogo-setup menu
 2017-05-23 17:58:53 +02:00
vanhofen
d4196e101f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 7bccd83b07
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)
 2017-04-27 14:02:32 +02:00
gixxpunk
c4f66cd900 Merge branch 'master' of github.com:tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 8f3783987a
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-04-26 (Wed, 26 Apr 2017)
 2017-04-26 11:17:46 +02:00
Thilo Graf
3a0e02793f Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 8554722323
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-25 (Tue, 25 Apr 2017)
 2017-04-25 11:46:41 +02:00
Thilo Graf
f8e84e7137 COsdSetup: reset channellist objects after changed window size 
Ensures complete reinit of relevent modules inside channellist instance.


Origin commit data
------------------
Commit: 4de8c61c04
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)
 2017-04-25 11:36:49 +02:00
vanhofen
31724507a8 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 292d7a2d5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)
 2017-04-19 23:24:19 +02:00
Michael Liebmann
5049436c85 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 2afb8fef86
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-16 (Sun, 16 Apr 2017)
 2017-04-16 19:42:14 +02:00