mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-18 02:43:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,815 Commits 2 Branches 9 Tags
94b4f9a712c5ad251da6eae44c7331aef77e82b8
Commit Graph

178 Commits

Author SHA1 Message Date
vanhofen
b5448a9e90 rename LIST_MODE_WEBTV => LIST_MODE_WEB 
Origin commit data
------------------
Commit: cd5577e8b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename LIST_MODE_WEBTV => LIST_MODE_WEB
 2017-11-03 09:36:19 +01:00
vanhofen
560bcc7221 add webradio; first steps 
Origin commit data
------------------
Commit: a8b0fee599
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- add webradio; first steps
 2017-11-03 09:36:19 +01: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
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
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
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
gixxpunk
677a327591 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 0e862002b6
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-30 (Fri, 30 Jun 2017)
 2017-06-30 21:27:49 +02:00
Thilo Graf
3218759464 CBouquetList: fix scrollbar shadow 
Footer is painted as first item and scrollbar as last, so shadow
overpaint footer body. Either paint scrollbar as first or use
matching shadow parameter.


Origin commit data
------------------
Commit: acb5b7e292
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-29 (Thu, 29 Jun 2017)
 2017-06-30 13:53:43 +02:00
vanhofen
35e13eb34e Revert "- bouquetlist: fix footer; CComponentsFooter doesn't like 0 buttons as it seems" 
This reverts commit 7442c19a59.


Origin commit data
------------------
Commit: 768bb1330b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-30 (Fri, 30 Jun 2017)
 2017-06-30 10:43:06 +02:00
vanhofen
7442c19a59 bouquetlist: fix footer; CComponentsFooter doesn't like 0 buttons as it seems 
Origin commit data
------------------
Commit: 5b3be66a93
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-29 (Thu, 29 Jun 2017)

Origin message was:
------------------
- bouquetlist: fix footer; CComponentsFooter doesn't like 0 buttons as it seems
 2017-06-29 21:35:51 +02:00
vanhofen
b295834d9a bouquetlist: add shadow to gui-elements; simplify footer handling 
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- bouquetlist: add shadow to gui-elements; simplify footer handling

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-06-20 09:55:40 +02:00
vanhofen
99130d47ab Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: e5cf06ec8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)
 2017-06-19 23:08:41 +02:00
vanhofen
cd05152aab bouquetlist: add shadow to gui-elements; simplify footer handling 
Origin commit data
------------------
Commit: 68172ddb27
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)

Origin message was:
------------------
- bouquetlist: add shadow to gui-elements; simplify footer handling
 2017-06-19 17:01:47 +02:00
vanhofen
b162e3d2aa Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Commit: c68ae57571
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
 2017-06-15 11:07:32 +02:00
vanhofen
7034a85f4e bouquetlist: use getScrollBarData() function 
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- bouquetlist: use getScrollBarData() function

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-06-15 01:01:55 +02:00
vanhofen
cdbbdaff3b bouquetlist: use getScrollBarData() function 
Origin commit data
------------------
Commit: b0c630607f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-14 (Wed, 14 Jun 2017)

Origin message was:
------------------
- bouquetlist: use getScrollBarData() function
 2017-06-14 14:57:09 +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
vanhofen
a6485445d0 bouquetlist: fix calculation of footerwidth 
wrong font was used

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


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

Origin message was:
------------------
- bouquetlist: fix calculation of footerwidth

wrong font was used

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-06-07 14:17:12 +02:00
vanhofen
b78289a920 bouquetlist: fix calculation of footerwidth; wrong font was used 
Origin commit data
------------------
Commit: 05d1e76d0f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-06 (Tue, 06 Jun 2017)

Origin message was:
------------------
- bouquetlist: fix calculation of footerwidth; wrong font was used
 2017-06-06 16:09:48 +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
vanhofen
44cefd60f3 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 633c0c44f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-13 (Thu, 13 Apr 2017)
 2017-04-13 11:21:59 +02:00
vanhofen
092da74b08 bouquetlist: rework; ... 
* use OFFSET defines
* use CComponentsFooter to paint footer
* use CComponentsScrollBar to paint scrollbar
* use a bit more offset for items
* re-align status icons in items
* use same scambled-icon as used in channellist


Origin commit data
------------------
Commit: 4ea2f46c7c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-13 (Thu, 13 Apr 2017)

Origin message was:
------------------
- bouquetlist: rework; ...

* use OFFSET defines
* use CComponentsFooter to paint footer
* use CComponentsScrollBar to paint scrollbar
* use a bit more offset for items
* re-align status icons in items
* use same scambled-icon as used in channellist
 2017-04-13 11:20:10 +02:00
vanhofen
9d255f3f05 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 22:03:03 +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
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
vanhofen
10bf4e8837 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: fdb24232f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)
 2016-12-12 10:29:42 +01:00
vanhofen
d0cb888d2a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 5eaf53dc0b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-08 (Thu, 08 Dec 2016)
 2016-12-08 00:38:05 +01:00
vanhofen
55d2817631 bouquetlist: fix round corners of selected item 
Origin commit data
------------------
Commit: 9fe560fa53
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-08 (Thu, 08 Dec 2016)

Origin message was:
------------------
- bouquetlist: fix round corners of selected item
 2016-12-08 00:36:26 +01:00
vanhofen
e37d517f3e bouquetlist: fix initialisation of empty sting 
Origin commit data
------------------
Commit: 8be61c8763
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- bouquetlist: fix initialisation of empty sting
 2016-12-07 16:46:24 +01:00
vanhofen
cb68f4ff0c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 784a58e6d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)
 2016-12-07 15:40:19 +01:00
vanhofen
64ae7a6ef2 bouquetlist: add "menu", "left" and "right" context buttons to header 
Origin commit data
------------------
Commit: 0842a7ac35
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- bouquetlist: add "menu", "left" and "right" context buttons to header
 2016-12-07 15:24:45 +01:00
vanhofen
65e0a39980 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
 2016-11-21 12:46:49 +01:00
vanhofen
cc7ad7ce1a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)
 2016-11-19 21:11:54 +01:00
Thilo Graf
11b3307251 CMsgBox: rework msgbox classes with Window class implementation 
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details


Origin commit data
------------------
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)
 2016-10-24 10:31:24 +02:00
vanhofen
1a4da62152 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 5342deb28d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)
 2016-10-19 14:54:07 +02:00
vanhofen
f374f6652f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/pictureviewer.cpp


Origin commit data
------------------
Commit: 42d1c25a8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)
 2016-10-19 10:22:43 +02:00
vanhofen
1451d5f0aa bouquetlist: use getItemColors function 
Origin commit data
------------------
Commit: 6f4e7ecda8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)

Origin message was:
------------------
- bouquetlist: use getItemColors function
 2016-10-19 10:06:35 +02:00
vanhofen
7220c6b265 Merge branch 'ni/cst-next' into ni/mp/cst-next 
Conflicts:
	acinclude.m4
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/epgplus.cpp
	src/gui/plugins.cpp
	src/gui/widget/listbox.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
 2016-10-10 17:27:55 +02:00
vanhofen
248b6c8684 Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/components/cc_detailsline.h
	src/gui/components/cc_item_infobox.h
	src/gui/infoviewer.cpp
	src/gui/upnpbrowser.cpp
	src/gui/widget/keyboard_input.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
 2016-10-10 16:45:30 +02:00
vanhofen
af3e39a47d colors: add COL_SCROLLBAR_PASSIVE wrapper 
Origin commit data
------------------
Commit: 6629b64d6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_SCROLLBAR_PASSIVE wrapper
 2016-10-10 14:19:54 +02:00
vanhofen
4b3b25ca7a colors: add COL_SCROLLBAR_ACTIVE wrapper 
Origin commit data
------------------
Commit: 7e7d4e5fc1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_SCROLLBAR_ACTIVE wrapper
 2016-10-10 14:19:54 +02:00
vanhofen
bc33663742 Merge branch 'ni/mp' into ni/cst-next 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 19:13:47 +02:00
Michael Liebmann
4246a31ba6 Merge branch 'cst-next' into nmp-cst-next 
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-19 17:40:48 +02:00
vanhofen
2be5df305e Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Commit: 3d04798d9b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
 2016-08-15 19:08:28 +02:00
vanhofen
e49ee18fb3 fonts: add and use own font for all footers 
Origin commit data
------------------
Commit: 54f2ac510f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- fonts: add and use own font for all footers
 2016-08-15 19:02:42 +02:00
vanhofen
2dc8a2a968 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/themes.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: fd5029560e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
 2016-08-15 00:19:32 +02:00
vanhofen
70abfb3339 colors: make footer background color configurable 
TODO: footer text color and maybe footer font


Origin commit data
------------------
Commit: cc5258e6d5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- colors: make footer background color configurable

TODO: footer text color and maybe footer font
 2016-08-15 00:14:47 +02:00
vanhofen
ed1a6bc916 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: 38ca43dde0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-14 (Sun, 14 Aug 2016)
 2016-08-14 22:05:07 +02:00