Commit Graph

230 Commits

Author SHA1 Message Date
vanhofen
9800bec147 remove NI-tags from progressbar color code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 75fc656e49
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-04-11 (Wed, 11 Apr 2018)

Origin message was:
------------------
- remove NI-tags from progressbar color code

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

------------------
This commit was generated by Migit
2018-04-11 23:58:15 +02:00
Thilo Graf
5223a302f9 infobar: rework infobar timeout behavior
Options were sometimes described ambiguously and previous behavior was no longer available.
Now the descriptions should be more plausible for current behavior.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 89770bae19
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-04-10 (Tue, 10 Apr 2018)



------------------
This commit was generated by Migit
2018-04-10 22:30:17 +02:00
vanhofen
18a0cb2ee3 luainstance: update keyname table
Origin commit data
------------------
Branch: ni/coolstream
Commit: 67ea34c1bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-19 (Tue, 19 Dec 2017)

Origin message was:
------------------
- luainstance: update keyname table

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

------------------
This commit was generated by Migit
2017-12-19 10:58:44 +01:00
vanhofen
476ce63d99 neutrino: unify modes handling; ...
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


Origin commit data
------------------
Branch: ni/coolstream
Commit: 028ec3cf3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: unify modes handling; ...

remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


------------------
This commit was generated by Migit
2017-11-20 15:19:06 +01:00
vanhofen
66784d42af add webradio; first steps
Origin commit data
------------------
Branch: ni/coolstream
Commit: a8b0fee599
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- add webradio; first steps

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

------------------
This commit was generated by Migit
2017-11-03 09:36:19 +01:00
vanhofen
8197052315 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 79b4837909
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-23 (Mon, 23 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-23 08:45:33 +02:00
Michael Liebmann
d1c1a544f3 CLuaInstCurl: Add script functions
- encodeUri
 - decodeUri
 - setUriData
 - Set Lua api version to 1.78


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9feb8efd23
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-10-23 (Mon, 23 Oct 2017)



------------------
This commit was generated by Migit
2017-10-23 07:54:19 +02:00
Michael Liebmann
31b8da10bc CLuaInstCurl: Fix CurlDownload() to send POST data
- Set Lua api version to 1.77


Origin commit data
------------------
Branch: ni/coolstream
Commit: 100fa78952
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-10-23 (Mon, 23 Oct 2017)



------------------
This commit was generated by Migit
2017-10-23 07:54:19 +02:00
vanhofen
a84d642cff add hd51; mostly ported from TangoCash's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 09ae4c3a51
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)

Origin message was:
------------------
- add hd51; mostly ported from TangoCash's neutrino-mp

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

------------------
This commit was generated by Migit
2017-10-05 12:52:53 +02:00
vanhofen
0a0c8a13bf Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 23:21:37 +02:00
vanhofen
463700033b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 23:19:49 +02:00
Stefan Seyfried
ef71d00d7f remove "using namespace std" from header files
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 13:43:57 +02:00
vanhofen
3df3b9eafe rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
Branch: ni/coolstream
Commit: 99cc7f850a
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

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

------------------
This commit was generated by Migit
2017-09-29 10:34:23 +02:00
vanhofen
c75a12894f Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/gui/bookmarkmanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 537ea51fcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)



------------------
This commit was generated by Migit
2017-09-29 08:35:05 +02:00
vanhofen
369436124b rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-09-29 08:27:42 +02:00
Stefan Seyfried
19c0e04c37 add comments to suppres -Wimplicit-fallthrough warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 971f3703a6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-26 12:41:05 +02:00
vanhofen
cd18fa9ca0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/rcinput.cpp
	src/gui/audioplayer.cpp
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a58f2cc447
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)



------------------
This commit was generated by Migit
2017-09-25 11:36:34 +02:00
Stefan Seyfried
a4040cbcb9 add comments to suppres -Wimplicit-fallthrough warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0ea72b9d51
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-25 11:25:50 +02:00
vanhofen
faa10f0ed6 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c68ae57571
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 11:07:32 +02:00
vanhofen
8e6aebc8d4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/icons/headers/pictureviewer.png
	data/locale/english.locale
	src/global.h
	src/gui/components/cc_frm_footer.h
	src/gui/eventlist.cpp
	src/gui/pictureviewer.cpp
	src/gui/widget/icons.h
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a8ef409ff6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 10:37:41 +02:00
Thilo Graf
afcb78a5c4 CLuaInstCCText: try to fix return value of CCTextGetLines()
Init was missing.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5b12952d8b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
vanhofen
049e4596d3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d8073b910
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)


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

------------------
This commit was generated by Migit
2017-05-23 17:59:21 +02:00
vanhofen
dd6ad99925 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c077b22e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-19 (Fri, 19 May 2017)


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

------------------
This commit was generated by Migit
2017-05-19 21:18:09 +02:00
Jacek Jendrzej
f183446d5c src/gui/lua/lua_cc_text.cpp avoid segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: ffe986f36b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-17 (Wed, 17 May 2017)


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

------------------
This commit was generated by Migit
2017-05-17 22:15:15 +02:00
vanhofen
dd4501697b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: ff2ee78317
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)



------------------
This commit was generated by Migit
2017-05-16 15:28:08 +02:00
gixxpunk
c43e77c038 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ad61c7e183
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-12 (Fri, 12 May 2017)


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

------------------
This commit was generated by Migit
2017-05-12 08:42:16 +02:00
Thilo Graf
064b2cc588 cc_frm_header.cpp/h: remove CTextBox types for title allignment
Title object has only width of current text content. This causes CTextBox
types have not a really visible effect. Now we have only three align types for title
and these are related to cc-text object position.

Involved classes adjusted too.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 942a27e3ef
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-11 (Thu, 11 May 2017)



------------------
This commit was generated by Migit
2017-05-11 12:15:16 +02:00
Jacek Jendrzej
25645799c5 use lua_Integer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 843703b175
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-10 (Wed, 10 May 2017)


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

------------------
This commit was generated by Migit
2017-05-10 15:35:44 +02:00
Thilo Graf
1fe98a3e4d CLuaInstCCWindow: try to fix window title align parameter
Additional (lua_Integer)CTextBox::NO_AUTO_LINEBREAK) overwrites
passed parameter and has no effect, because NO_AUTO_LINEBREAK is
already default.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 27eb80eb5b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)



------------------
This commit was generated by Migit
2017-05-10 10:42:08 +02:00
vanhofen
355698c6f4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale


Origin commit data
------------------
Branch: ni/coolstream
Commit: 66e3c79ee1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)



------------------
This commit was generated by Migit
2017-05-09 13:19:56 +02:00
Thilo Graf
aab9c8df90 CLuaInstCCWindow: fix passed shadow paramater
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1f978f01ad
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-09 (Tue, 09 May 2017)


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

------------------
This commit was generated by Migit
2017-05-09 12:09:20 +02:00
vanhofen
8af0c9668b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7bccd83b07
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-27 14:02:32 +02:00
vanhofen
096a9f37b0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/color.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: aaa3757e2e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-22 (Sat, 22 Apr 2017)



------------------
This commit was generated by Migit
2017-04-22 17:07:50 +02:00
vanhofen
53459ad6c0 luainstance: add missing COL_SCROLLBAR colors
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3669130b14
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-22 (Sat, 22 Apr 2017)

Origin message was:
------------------
- luainstance: add missing COL_SCROLLBAR colors

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

------------------
This commit was generated by Migit
2017-04-22 17:02:48 +02:00
vanhofen
7994a9d2e1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: f16d4b86d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-31 (Fri, 31 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-31 17:42:55 +02:00
vanhofen
fcb3a99ce0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ecb0bdca43
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-31 (Fri, 31 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-31 17:42:07 +02:00
Thilo Graf
ed105ffa82 Lua: try to implement progresswindow
Origin commit data
------------------
Branch: ni/coolstream
Commit: 83cfd68f88
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-31 (Fri, 31 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-31 10:12:35 +02:00
Thilo Graf
04c49e5006 LUA-Api: add alignment parameter for text in window header
Possible modes are :
	* "DEFAULT" (left)
	* "CENTER"
	* "RIGHT"

TODO: doc


Origin commit data
------------------
Branch: ni/coolstream
Commit: a788eee298
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-31 (Fri, 31 Mar 2017)



------------------
This commit was generated by Migit
2017-03-31 10:12:35 +02:00
vanhofen
e309b99543 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: be308c82f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-28 21:29:30 +02:00
vanhofen
f867d99444 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b4adf56866
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-28 21:28:54 +02:00
vanhofen
99b8e43a28 jsoncpp: update to current version 1.8.0
Use amalgamated src from https://github.com/open-source-parsers/jsoncpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b945336a79
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)

Origin message was:
------------------
- jsoncpp: update to current version 1.8.0

Use amalgamated src from https://github.com/open-source-parsers/jsoncpp


------------------
This commit was generated by Migit
2017-03-28 21:23:10 +02:00
vanhofen
ca99393430 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit
2017-03-12 22:03:03 +01:00
vanhofen
c51684e1c7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d784e8fb0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-12 21:59:02 +01:00
Thilo Graf
5368732f2f CComponentsFooter: simplify implementation of button labels
button_label_l and button_label_s are now
merged to button_label_cc with prepared default values for text and locales.This type contains all possible
button label properties. Values for locales and string
are evaluated in setButtonLabels(), so it's possible to remove some
overloaded methodes.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c766a970dc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-11 (Sat, 11 Mar 2017)



------------------
This commit was generated by Migit
2017-03-11 00:45:25 +01:00
vanhofen
3d3e8163b8 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6673ffd4ea
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-03 10:38:14 +01:00
vanhofen
2199baaa25 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0074876592
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-03 10:34:24 +01:00
vanhofen
352c9011f9 luainstance: re-add typo TO_WIDE to stay backward compatible
Origin commit data
------------------
Branch: ni/coolstream
Commit: 75ff8687dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- luainstance: re-add typo TO_WIDE to stay backward compatible

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

------------------
This commit was generated by Migit
2017-03-03 08:57:42 +01:00
vanhofen
52d9768acc luainstance: add missing RADIUS_NONE; fix typo in dynfont handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6afe247bc3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- luainstance: add missing RADIUS_NONE; fix typo in dynfont handling

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

------------------
This commit was generated by Migit
2017-03-03 08:55:35 +01:00
vanhofen
55c039615f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 91fbed7586
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-03 00:07:20 +01:00
vanhofen
7767cfe619 luainstance: add offsets to lua; set Lua api version to 1.70
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6eb1bb1ea4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-02 (Thu, 02 Mar 2017)

Origin message was:
------------------
- luainstance: add offsets to lua; set Lua api version to 1.70

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

------------------
This commit was generated by Migit
2017-03-02 23:00:49 +01:00