mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,125 Commits 2 Branches 9 Tags
8c27915df5f5f2798cee837cc0140239d74b3579
Commit Graph

518 Commits

Author SHA1 Message Date
vanhofen
8c27915df5 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 2733e0f260
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-02 (Mon, 02 Jan 2017)
 2017-01-02 23:55:23 +01:00
vanhofen
62772c2c5d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/streaminfo2.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: cc07333926
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-30 (Fri, 30 Dec 2016)
 2016-12-30 08:25:42 +01:00
Jacek Jendrzej
bffd81375a some dead assignment 
Origin commit data
------------------
Commit: 0ed24632b7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-29 (Thu, 29 Dec 2016)
 2016-12-29 18:41:25 +01:00
vanhofen
b554e7801c Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: d39dc75c6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
 2016-12-29 15:15:34 +01:00
vanhofen
65cf83258c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/themes.cpp
	src/neutrino.cpp
	src/system/settings.h
	version_pseudo.h


Origin commit data
------------------
Commit: 4f2d36fe3e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
 2016-12-29 00:59:00 +01:00
vanhofen
ff22643691 themes: allow progressbar-settings in themes 
Origin commit data
------------------
Commit: 888bfb6687
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)

Origin message was:
------------------
- themes: allow progressbar-settings in themes
 2016-12-29 00:47:34 +01:00
FlatTV
c9624a74ec OSD Menu: Add progressbar color 
Origin commit data
------------------
Commit: 2570e06e7d
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-12-26 (Mon, 26 Dec 2016)
 2016-12-26 14:58:51 +01:00
vanhofen
56d77c4901 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/Makefile.am
	src/gui/user_menue.cpp


Origin commit data
------------------
Commit: 79a2dc262b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
 2016-12-15 11:49:05 +01:00
vanhofen
140228cdca Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: d5dee22b19
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)
 2016-12-12 21:40:11 +01:00
Jacek Jendrzej
63bfa0da60 fix next epginfo and sat/freq info for webtv 
Origin commit data
------------------
Commit: af9c914013
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-12 (Mon, 12 Dec 2016)
 2016-12-12 17:20:48 +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
d8e3657d27 channellist: remove obsolete NI-code 
Origin commit data
------------------
Commit: 12607338f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- channellist: remove obsolete NI-code
 2016-12-12 09:21:04 +01:00
vanhofen
c2e03bf3ef Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: e57a35f327
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)
 2016-12-12 08:53:05 +01:00
vanhofen
9fc50664c7 channellist: try to fix right status-icon alignment 
Origin commit data
------------------
Commit: 6b4ef6d3f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- channellist: try to fix right status-icon alignment
 2016-12-12 08:30:22 +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
7bb3ecdc45 Merge branch 'master' into pu/msgbox 
Origin commit data
------------------
Commit: 59ae2b52e9
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)
 2016-11-17 21:53:06 +01:00
vanhofen
83e62e9d50 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac
	lib/sectionsdclient/Makefile.am
	lib/timerdclient/Makefile.am


Origin commit data
------------------
Commit: 93fdd4aa79
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)
 2016-11-17 09:52:47 +01:00
vanhofen
c29825efcc Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Commit: 506f7acbdd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)
 2016-11-16 20:17:27 +01:00
Jacek Jendrzej
fad0d05a29 src/gui/channellist.cpp cancel paint_events thread on hide 
Origin commit data
------------------
Commit: f957bbaa37
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-16 (Wed, 16 Nov 2016)
 2016-11-16 19:29:19 +01:00
vanhofen
2e8117384c Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: d4b9daf01e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
 2016-11-11 09:16:24 +01:00
Thilo Graf
d34322b568 Merge branch 'master' into pu/msgbox 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: 3efaac5725
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
 2016-11-10 10:27:22 +01:00
Thilo Graf
9e6adb848d Merge branch 'master' into pu/msgbox 
Conflicts:
	src/gui/timerlist.cpp


Origin commit data
------------------
Commit: 996beed078
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-09 (Wed, 09 Nov 2016)
 2016-11-09 00:30:44 +01:00
vanhofen
98e986dafc Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: f0d9adbe46
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)
 2016-11-08 22:07:57 +01:00
vanhofen
5582d5a8d5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 5b7c68825e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)
 2016-11-08 22:05:31 +01:00
vanhofen
4ace5321ec channellist: use small vertical offset around channellogo 
Origin commit data
------------------
Commit: 8f625c3d27
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- channellist: use small vertical offset around channellogo
 2016-11-08 22:00:51 +01:00
vanhofen
9a9ffd754b channellist: fix epg for webtv channels 
Origin commit data
------------------
Commit: b59527e987
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- channellist: fix epg for webtv channels
 2016-11-08 21:48:51 +01:00
vanhofen
dbfd2214db Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: 1ddcc0c7ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)
 2016-11-02 09:50:10 +01:00
Thilo Graf
b7baafa2e5 CChannelList: delete with red yes button 
Origin commit data
------------------
Commit: 3689684968
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-27 (Thu, 27 Oct 2016)
 2016-10-27 12:17:36 +02:00
FlatTV
5f14ad95b0 CamMenu: add "no other CI channel" option to usable channels while recording 
Origin commit data
------------------
Commit: f790f6d05d
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
 2016-10-25 18:48:00 +02: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
da3d97b77e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: ec448e14fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)
 2016-10-23 21:57:00 +02:00
Stefan Seyfried
c246af077c channellist: fix linking without --enable-pip 
Origin commit data
------------------
Commit: 830b5c2aa7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)
 2016-10-23 17:45:58 +02:00
vanhofen
bf28c38024 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: b93d809116
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
 2016-10-21 11:30:48 +02:00
vanhofen
2510d548e0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	lib/timerdclient/timerdtypes.h
	src/gui/channellist.cpp
	src/system/httptool.h


Origin commit data
------------------
Commit: 0bb2f888c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
 2016-10-21 11:23:51 +02:00
vanhofen
1fa75ed8a3 channellist: add small space between main-window and info-box 
Origin commit data
------------------
Commit: b42045507c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)

Origin message was:
------------------
- channellist: add small space between main-window and info-box
 2016-10-21 10:47:37 +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
1d790a8945 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Commit: 5c908af10e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)
 2016-10-19 10:58:08 +02:00
vanhofen
bd976c83e2 channellist: avoid transparent pixels in round corners 
Origin commit data
------------------
Commit: a7233c1474
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)

Origin message was:
------------------
- channellist: avoid transparent pixels in round corners
 2016-10-19 10:52:15 +02:00
vanhofen
c0eae933d2 channellist: re-disable colorchanges in displayNext mode 
Origin commit data
------------------
Commit: 248fe50252
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)

Origin message was:
------------------
- channellist: re-disable colorchanges in displayNext mode
 2016-10-19 10:23:46 +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
a0e58d2bf6 channellist: use getItemColors function; try to cleanup color mess 
Origin commit data
------------------
Commit: c0a4815d42
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)

Origin message was:
------------------
- channellist: use getItemColors function; try to cleanup color mess
 2016-10-19 10:06:36 +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
892603fe68 rename customcolor.h -> color_custom.h; reduce unneeded inludes 
Origin commit data
------------------
Commit: 104d21e784
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename customcolor.h -> color_custom.h; reduce unneeded inludes
 2016-10-10 14:19:55 +02:00
vanhofen
ad3146d0fc channellist: add small frame to mono progressbars w/o gradient 
Origin commit data
------------------
Commit: 3284484300
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- channellist: add small frame to mono progressbars w/o gradient
 2016-10-10 14:19:55 +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
b9442071af channellist: remove color-mess in progressbar code; don't change colors when moving cursor 
Origin commit data
------------------
Commit: abd3f97e9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- channellist: remove color-mess in progressbar code; don't change colors when moving cursor
 2016-10-10 14:19:54 +02:00
vanhofen
446c1bf7c8 channellist: more highlight tuned channel under cursor 
Origin commit data
------------------
Commit: 4598e320a6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- channellist: more highlight tuned channel under cursor
 2016-10-10 14:19:54 +02:00