Commit Graph

9698 Commits

Author SHA1 Message Date
vanhofen
96a45db4b2 timerlist: change colors for remote-timer (as requested by tewsbo)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e5a472748
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)

Origin message was:
------------------
- timerlist: change colors for remote-timer (as requested by tewsbo)

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

------------------
This commit was generated by Migit
2016-10-29 17:16:23 +02:00
vanhofen
f7614da769 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/moviebrowser/mb.cpp
	src/gui/moviebrowser/mb.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 30e1c0ef71
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)



------------------
This commit was generated by Migit
2016-10-29 12:45:02 +02:00
vanhofen
0e9db1640b Merge branch 'master' into pu/moviebrowser
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1fc717f56f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-29 12:26:05 +02:00
vanhofen
da08c55473 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c9aa1562e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-29 11:41:02 +02:00
Michael Liebmann
5b0d909a9f Use forceSaveScreen() in COsdSetup & CTimerList
Origin commit data
------------------
Branch: ni/coolstream
Commit: e5402057d3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-29 (Sat, 29 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-29 10:38:06 +02:00
Michael Liebmann
c7830d8d7b CKeyboardInput: Make saveScreen changeable with forceSaveScreen()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 74b0ce7f70
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-29 (Sat, 29 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-29 10:38:06 +02:00
Michael Liebmann
bb952faf1b CStringInput: Make saveScreen changeable with forceSaveScreen()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0e22860ac0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-29 (Sat, 29 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-29 10:38:06 +02:00
Michael Liebmann
3a5823e382 Sort locale
Origin commit data
------------------
Branch: ni/coolstream
Commit: 373ae57e42
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-29 (Sat, 29 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-29 10:38:06 +02:00
vanhofen
dded0065cb moviebrowser: allow channellist-design in moviebrowser
Origin commit data
------------------
Branch: ni/coolstream
Commit: 142ae901b0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)

Origin message was:
------------------
- moviebrowser: allow channellist-design in moviebrowser

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

------------------
This commit was generated by Migit
2016-10-29 10:02:07 +02:00
vanhofen
ced4fd201e listframe: add some needed get-members
Origin commit data
------------------
Branch: ni/coolstream
Commit: f7f76b0dd9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)

Origin message was:
------------------
- listframe: add some needed get-members

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

------------------
This commit was generated by Migit
2016-10-29 10:01:24 +02:00
vanhofen
af1670252d textbox: add member to get background-radius
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3f28e50c84
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)

Origin message was:
------------------
- textbox: add member to get background-radius

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

------------------
This commit was generated by Migit
2016-10-29 10:00:25 +02:00
TangoCash
0e87207cab add possibility to add Name,Url,Port, Username and Password if needed.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3776340268
Author: TangoCash <eric@loxat.de>
Date: 2016-10-28 (Fri, 28 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-28 22:20:27 +02:00
Jacek Jendrzej
d2ab0e9ce5 src/gui/osd_setup.cpp try to fix segfault, call from channellist
Origin commit data
------------------
Branch: ni/coolstream
Commit: 682b6f578e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-10-28 (Fri, 28 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-28 20:50:52 +02:00
vanhofen
4b91651de8 textbox: fix box width in round corners mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 002277fb5f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-28 (Fri, 28 Oct 2016)

Origin message was:
------------------
- textbox: fix box width in round corners mode

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

------------------
This commit was generated by Migit
2016-10-28 09:55:40 +02:00
vanhofen
9f3e93e083 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ecd3951b7d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-27 (Thu, 27 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-27 23:12:05 +02:00
vanhofen
56ba19313d cc_item_picture: fix wrong operator in width calculation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 874f54af4b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-27 (Thu, 27 Oct 2016)

Origin message was:
------------------
- cc_item_picture: fix wrong operator in width calculation

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

------------------
This commit was generated by Migit
2016-10-27 23:11:43 +02:00
Jacek Jendrzej
d2ec61edf3 src/gui/eventlist.cpp supplement to 8da554c0fa, fix chanel_id in search-mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: a71c71edcc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-10-27 (Thu, 27 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-27 18:56:13 +02:00
Jacek Jendrzej
7fed169731 src/gui/widget/menue.cpp fix segfault if items is empty
Origin commit data
------------------
Branch: ni/coolstream
Commit: 83976f40b4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-10-27 (Thu, 27 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-27 17:06:12 +02:00
vanhofen
3c705b943f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 501f0cf717
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-27 (Thu, 27 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-27 11:05:52 +02:00
vanhofen
eb3486ed02 textbox: fix lineBreakWidth calculation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 99a9f8a7e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-27 (Thu, 27 Oct 2016)

Origin message was:
------------------
- textbox: fix lineBreakWidth calculation

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

------------------
This commit was generated by Migit
2016-10-27 11:02:18 +02:00
vanhofen
d973ee9821 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/system/httptool.cpp
	src/system/httptool.h


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



------------------
This commit was generated by Migit
2016-10-26 23:46:59 +02:00
Jacek Jendrzej
f83231ec06 src/gui/timerlist.cpp update timerlist after show epgview
Origin commit data
------------------
Branch: ni/coolstream
Commit: 48c596e2ca
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-10-26 (Wed, 26 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-26 18:31:44 +02:00
Michael Liebmann
db7fc457eb CTimerList: Set httpConnectTimeout for remote timer = 3 sec
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4dceb70ce1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-26 (Wed, 26 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-26 15:16:11 +02:00
FlatTV
d360e11bbc system/httptool: make timeouts flexible
Signed-off-by: M. Liebmann <git@tuxcode.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: f62a3ada8b
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-09-07 (Wed, 07 Sep 2016)



------------------
This commit was generated by Migit
2016-10-26 15:16:11 +02:00
Michael Liebmann
2c390c94e6 remotetimer: Don't repaint timerlist when no changes to remote ip
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c8de6960e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-26 (Wed, 26 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-26 15:16:11 +02:00
Michael Liebmann
3472c4c80c CMenuWidget::saveScreen: Fix segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3e0a0e917
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-26 (Wed, 26 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-26 15:16:11 +02:00
Michael Liebmann
3e6623f4de CTimerList: Use enableSaveScreen() for CIPInput
Origin commit data
------------------
Branch: ni/coolstream
Commit: a132969547
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-26 (Wed, 26 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-26 15:16:11 +02:00
Michael Liebmann
7d11d5508b CExtendedInput: Add saveScreen & restoreScreen() functions
Origin commit data
------------------
Branch: ni/coolstream
Commit: f396037078
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-26 (Wed, 26 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-26 15:16:11 +02:00
vanhofen
9d2cab77c1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e7fd47ca44
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-25 22:42:15 +02:00
vanhofen
fe4f04cc08 followscreenings: don't show menu if just one event is found
Origin commit data
------------------
Branch: ni/coolstream
Commit: 56e668ae95
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)

Origin message was:
------------------
- followscreenings: don't show menu if just one event is found

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

------------------
This commit was generated by Migit
2016-10-25 22:40:50 +02:00
FlatTV
0fd68eb6a7 don't execute ci "hack", if calling from movieplayer
Origin commit data
------------------
Branch: ni/coolstream
Commit: a2193c9e44
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-25 18:48:00 +02:00
FlatTV
54c9128b89 CamMenu: add "no other CI channel" option to usable channels while recording
Origin commit data
------------------
Branch: ni/coolstream
Commit: f790f6d05d
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-25 18:48:00 +02:00
vanhofen
abfb65680e fix last merge
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bbfbe997b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)

Origin message was:
------------------
- fix last merge

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

------------------
This commit was generated by Migit
2016-10-25 13:15:57 +02:00
vanhofen
8474ef8c98 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/slovak.locale
	lib/libcoolstream/hardware_caps.cpp
	lib/libcoolstream/hardware_caps.h
	lib/libdvbsub/dvbsubtitle.cpp
	lib/timerdclient/timerdclient.cpp
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/framebuffer_ng.h
	src/driver/pictureviewer/Makefile.am
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgplus.cpp
	src/gui/epgview.cpp
	src/gui/plugins.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/gui/widget/listbox.cpp
	src/gui/widget/listhelpers.cpp
	src/neutrino.cpp
	src/system/helpers.cpp
	src/system/helpers.h
	src/system/settings.cpp
	src/system/settings.h
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 75cce3b113
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
2016-10-25 13:08:01 +02:00
vanhofen
59c83b2c70 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/Makefile.am
	src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ed2ebe75b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
2016-10-25 12:30:10 +02:00
vanhofen
01acc7d9ae Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/moviebrowser/mb.cpp
	src/gui/osd_setup.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 318b4926e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
2016-10-25 12:22:47 +02:00
vanhofen
c1bda7d95c moviebrowser: port configuration of moviebrowser fonts from NI-Neutrino
Origin commit data
------------------
Branch: ni/coolstream
Commit: 82f7eff169
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)

Origin message was:
------------------
- moviebrowser: port configuration of moviebrowser fonts from NI-Neutrino

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

------------------
This commit was generated by Migit
2016-10-25 12:19:48 +02:00
vanhofen
e437d6f686 listframe/moviebrowser: add round corners to scrollbar
Origin commit data
------------------
Branch: ni/coolstream
Commit: a8c4bdb7de
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)

Origin message was:
------------------
- listframe/moviebrowser: add round corners to scrollbar

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

------------------
This commit was generated by Migit
2016-10-25 11:06:12 +02:00
vanhofen
a622a70495 moviebrowser: add spacer row to last play/rec windows
Origin commit data
------------------
Branch: ni/coolstream
Commit: 46297266b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)

Origin message was:
------------------
- moviebrowser: add spacer row to last play/rec windows

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

------------------
This commit was generated by Migit
2016-10-25 11:06:12 +02:00
vanhofen
5253431990 textbox: fix round corners/scrollbar handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: be9143a511
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)

Origin message was:
------------------
- textbox: fix round corners/scrollbar handling

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

------------------
This commit was generated by Migit
2016-10-25 11:06:12 +02:00
vanhofen
23472efd8b moviebrowser: fix max_width in info-box
Origin commit data
------------------
Branch: ni/coolstream
Commit: 301f312673
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)

Origin message was:
------------------
- moviebrowser: fix max_width in info-box

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

------------------
This commit was generated by Migit
2016-10-25 11:06:12 +02:00
Jacek Jendrzej
f8ea2e5650 helpers: 201103L have to_string
Origin commit data
------------------
Branch: ni/coolstream
Commit: 80f7d0a299
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-10-24 (Mon, 24 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-24 13:41:23 +02:00
vanhofen
f23c56ed95 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7e4be231c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-24 (Mon, 24 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-24 10:06:31 +02:00
Stefan Seyfried
07f447e0f9 configure: fix short-filename logic
if configure was not called from absolute path, detection
would fail and huge filenames would be included in binary
(noticed in yocto krogoth release)


Origin commit data
------------------
Branch: ni/coolstream
Commit: b8cf8167f4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-20 (Thu, 20 Oct 2016)



------------------
This commit was generated by Migit
2016-10-24 10:00:51 +02:00
Stefan Seyfried
f3c729bab3 system/helpers: allow to build with c++11 compilers
Origin commit data
------------------
Branch: ni/coolstream
Commit: ae345d11d3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-24 09:55:32 +02:00
Stefan Seyfried
0ed93d8edb helpers.cpp: include fontrenderer.h
if Font class is used, the header should be included, too :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 645da64839
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-24 09:46:05 +02:00
Stefan Seyfried
74b278d191 driver/record: make CStreamRec non-public
CStreamRec is only used inside CRecordManager::Record, so it
can be implemented completely inside record.cpp. The positive
side effect is that avformat.h is not included everywhere (e.g.
from moviebrowser/mb.h) and thus AVFORMAT_CFLAGS does not need
to be added everywhere to fix build failures.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5cb683048
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-24 09:45:46 +02:00
Stefan Seyfried
1df6d63abc record, streamts: use modern AV_CODEC_ID enums
this allows to build with current ffmpeg


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5bf115db80
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-24 09:45:23 +02:00
vanhofen
06167cc8d0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec448e14fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-23 21:57:00 +02:00
vanhofen
c2c06e0d86 moviebrowser: show minutes in two-digits format
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4d93168cf6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)

Origin message was:
------------------
- moviebrowser: show minutes in two-digits format

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

------------------
This commit was generated by Migit
2016-10-23 21:51:34 +02:00