Commit Graph

686 Commits

Author SHA1 Message Date
vanhofen
159dc90933 channellist: add small space between main-window and info-box
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-21 10:47:37 +02:00
vanhofen
6542629122 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5342deb28d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-19 14:54:07 +02:00
vanhofen
46ec7f0fed Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/cst-next
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c908af10e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)



------------------
This commit was generated by Migit
2016-10-19 10:58:08 +02:00
vanhofen
e998d2aa0e channellist: avoid transparent pixels in round corners
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-19 10:52:15 +02:00
vanhofen
44a7f39fbd channellist: re-disable colorchanges in displayNext mode
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-19 10:23:46 +02:00
vanhofen
83f403dfb7 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
------------------
Branch: ni/coolstream
Commit: 42d1c25a8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)



------------------
This commit was generated by Migit
2016-10-19 10:22:43 +02:00
vanhofen
28aa6ea082 channellist: use getItemColors function; try to cleanup color mess
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-19 10:06:36 +02:00
vanhofen
ca5c4b00d7 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
------------------
Branch: ni/coolstream
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)



------------------
This commit was generated by Migit
2016-10-10 17:27:55 +02:00
vanhofen
3739b4de04 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
------------------
Branch: ni/coolstream
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)



------------------
This commit was generated by Migit
2016-10-10 16:45:30 +02:00
vanhofen
bb756163b1 rename customcolor.h -> color_custom.h; reduce unneeded inludes
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
9b0fb43e39 channellist: add small frame to mono progressbars w/o gradient
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
7f19812d17 colors: add COL_SCROLLBAR_PASSIVE wrapper
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6629b64d6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_SCROLLBAR_PASSIVE wrapper

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
vanhofen
e13c700904 colors: add COL_SCROLLBAR_ACTIVE wrapper
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e7d4e5fc1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_SCROLLBAR_ACTIVE wrapper

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
vanhofen
b30174a112 channellist: remove color-mess in progressbar code; don't change colors when moving cursor
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
vanhofen
093234e5f1 channellist: more highlight tuned channel under cursor
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
vanhofen
5987637998 colors: add COL_FRAME wrapper
Origin commit data
------------------
Branch: ni/coolstream
Commit: 75fe6e407d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_FRAME wrapper

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-10 14:19:54 +02:00
FlatTV
8188f332ac Cam Menu: Allow switching to all or same transponder channels
while CI recording


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe69787b0a
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-07 (Fri, 07 Oct 2016)



------------------
This commit was generated by Migit
2016-10-07 14:37:37 +02:00
vanhofen
8e065cda4b Merge branch 'ni/cst-next' into ni/mp/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: ad25cf2933
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-09-29 08:11:23 +02:00
vanhofen
7cc0ff4e16 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 39e5880a70
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-28 (Wed, 28 Sep 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-09-28 21:14:17 +02:00
TangoCash
5542fae578 channellist: paint events in additional box in a separated thread
Origin commit data
------------------
Branch: ni/coolstream
Commit: d35cf3cd55
Author: TangoCash <eric@loxat.de>
Date: 2016-09-28 (Wed, 28 Sep 2016)

Origin message was:
------------------
- channellist: paint events in additional box in a separated thread

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-09-28 21:12:32 +02:00
vanhofen
8b61f4a1f2 detailsline: remove unneeded position/dimension additions
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a94cd86d7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-12 (Mon, 12 Sep 2016)

Origin message was:
------------------
- detailsline: remove unneeded position/dimension additions

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-09-20 08:05:08 +02:00
vanhofen
8c213521f8 add listModeKey() function to simplify these calls
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59b7e3ae36
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- add listModeKey() function to simplify these calls

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-09-20 08:03:50 +02:00
vanhofen
99d6e27be1 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/components/cc_detailsline.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 16fbaaa096
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-12 (Mon, 12 Sep 2016)



------------------
This commit was generated by Migit
2016-09-12 12:13:43 +02:00
vanhofen
ed6f601639 detailsline: remove unneeded position/dimension additions
Origin commit data
------------------
Branch: ni/coolstream
Commit: 974ef11d5b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-12 (Mon, 12 Sep 2016)

Origin message was:
------------------
- detailsline: remove unneeded position/dimension additions

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-09-12 12:11:04 +02:00
vanhofen
af4767a199 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: e419a5c3b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-09-09 10:45:45 +02:00
vanhofen
58b62b0445 add listModeKey() function to simplify these calls
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2911e638c7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- add listModeKey() function to simplify these calls

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-09-09 10:42:46 +02:00
vanhofen
af8fe3ebc6 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
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
2016-08-26 19:13:47 +02:00
vanhofen
568677787e colors: smoother interplay; use 1px frames
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f08483671
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-22 (Mon, 22 Aug 2016)

Origin message was:
------------------
- colors: smoother interplay; use 1px frames

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-08-22 23:30:06 +02:00
Michael Liebmann
2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
2016-08-19 17:40:48 +02:00
vanhofen
d229e14601 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d04798d9b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)



------------------
This commit was generated by Migit
2016-08-15 19:08:28 +02:00
vanhofen
a8cec5244c fonts: add and use own font for all footers
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-08-15 19:02:42 +02:00
FlatTV
fbab44c8c6 channellist: set CI channel inactive if recording with CI
Origin commit data
------------------
Branch: ni/coolstream
Commit: 570d1b10f2
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-06-25 (Sat, 25 Jun 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-06-25 13:06:12 +02:00
vanhofen
7c0a99b35d lcd4linux: allow to switch umlauts conversion
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a7696b404
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-24 (Tue, 24 May 2016)

Origin message was:
------------------
- lcd4linux: allow to switch umlauts conversion

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-05-24 10:32:02 +02:00
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +02:00
vanhofen
131e086535 channellist: add possibility to clear channel history
Origin commit data
------------------
Branch: ni/coolstream
Commit: ffd0e72251
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)

Origin message was:
------------------
- channellist: add possibility to clear channel history

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-05-19 16:59:56 +02:00
Jacek Jendrzej
6d03cb9e50 Revert "very bad idea src/gui/channellist.cpp fix current channel after edit mode"
This reverts commit f37b72a432.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b07edaffe
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-05-17 (Tue, 17 May 2016)



------------------
This commit was generated by Migit
2016-05-17 09:46:10 +02:00
Jacek Jendrzej
f37b72a432 src/gui/channellist.cpp fix current channel after edit mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6593dcb064
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-05-16 (Mon, 16 May 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-05-16 22:21:06 +02:00
Jacek Jendrzej
beae26be1d some never read compil warning fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d9fbd5378
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-24 (Sun, 24 Apr 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-04-24 17:18:37 +02:00
Jacek Jendrzej
d44c7b1a9d avoid division by zero
Origin commit data
------------------
Branch: ni/coolstream
Commit: 49c86a38b4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-21 (Thu, 21 Apr 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-04-21 18:14:46 +02:00
[CST] Focus
f02dae27c7 neutrino: add webtv channel list mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 302642cee7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-23 (Wed, 23 Mar 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-03-23 16:36:00 +03:00
[CST] Focus
4b784cf6ed neutrino.cpp: try to fix sat/fav keys handling after calling zap history
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e3b1c5844
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-09 (Wed, 09 Mar 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-03-09 10:53:15 +03:00
Michael Liebmann
71ab60d980 Merge branch 'cst-next' into nmp-cst-next
Conflicts: src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c657e2d892
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-29 (Fri, 29 Jan 2016)



------------------
This commit was generated by Migit
2016-01-29 15:41:18 +01:00
Michael Liebmann
8372065c10 CCDraw: Set cc_gradient_bg_cleanup to true
Except menu headers: Disable cleanup when save screen is disabled


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c72fe94bc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-29 (Fri, 29 Jan 2016)

Origin message was:
------------------
CCDraw: Set cc_gradient_bg_cleanup to true

 Except menu headers: Disable cleanup when save screen is disabled


------------------
This commit was generated by Migit
2016-01-29 15:31:12 +01:00
Michael Liebmann
cad1407f90 Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: f628ca6af8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-28 (Thu, 28 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-28 05:32:50 +01:00
Michael Liebmann
9682acf5e8 Fix ghost text in channellist & epg view
Complement to commit 3f0fb53


Origin commit data
------------------
Branch: ni/coolstream
Commit: d85bb1d09b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-27 (Wed, 27 Jan 2016)

Origin message was:
------------------
Fix ghost text in channellist & epg view

 Complement to commit 3f0fb53


------------------
This commit was generated by Migit
2016-01-27 15:14:22 +01:00
Stefan Seyfried
50cb7dd5d3 Merge remote-tracking branch 'n/cst-next-fixed'
Origin commit data
------------------
Branch: ni/coolstream
Commit: f5c72d35c8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-24 (Sun, 24 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-24 13:15:43 +01:00
Michael Liebmann
6b1841a1b0 Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: b6d2bad857
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-21 (Thu, 21 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-21 17:57:38 +01:00
Thilo Graf
a9aa78ca3e text screen save: try to rework screen save behavior for textbox objects
Screen save now always disabled by default and can be controlled
outside of relevant objects.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9d72b086a2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-21 (Thu, 21 Jan 2016)



------------------
This commit was generated by Migit
2016-01-21 11:00:38 +01:00
Thilo Graf
db6be29b3f CInfoViewer: use different modes with enums for virtual zap and number input mode
This should fix missing rounded corners in numbaur input mode too.

Thx defans for input !


Origin commit data
------------------
Branch: ni/coolstream
Commit: 98b73c0d09
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-12 (Tue, 12 Jan 2016)



------------------
This commit was generated by Migit
2016-01-21 11:00:24 +01:00
Michael Liebmann
df30970a78 Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b0a6edba8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-18 (Mon, 18 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-18 09:12:21 +01:00