Commit Graph

13430 Commits

Author SHA1 Message Date
vanhofen
83be9c1fe3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6dd6df52fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-18 21:53:44 +02:00
gixxpunk
570ba4305b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 315a87f2be
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-18 16:31:55 +02:00
Jacek Jendrzej
c615da9fd2 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2dd24f8c21
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-18 15:55:41 +02:00
Jacek Jendrzej
fac44e3ba4 osd_setup.cpp fix memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: 82a0cdeb68
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-18 14:57:11 +02:00
Jacek Jendrzej
c79807fc3a fix memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: 511d953a18
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-18 14:11:34 +02:00
Jacek Jendrzej
a225129631 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: a23737a626
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-18 10:53:42 +02:00
Jacek Jendrzej
3fe7617f20 fix mem leak
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7942c9987
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-18 08:56:02 +02:00
Thilo Graf
3d8f8e6732 CKeyChooserItem: fix possible memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a48398bb4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-17 (Sun, 17 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-17 22:24:44 +02:00
Thilo Graf
d508812c48 CHintBox: fix possible unintended cut of text
Last line size was not considered.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 87b53a8597
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-17 (Sun, 17 Sep 2017)



------------------
This commit was generated by Migit
2017-09-17 21:50:59 +02:00
Thilo Graf
7b1f217192 CPersonalizeGui: fix visualize of passive and active locked items
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c0d0b06d0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-17 (Sun, 17 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-17 13:52:54 +02:00
Thilo Graf
94fe4513e1 CMenuItem: add members set/get info icon inside menu items
Origin commit data
------------------
Branch: ni/coolstream
Commit: f0660dc66c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-17 (Sun, 17 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-17 13:52:43 +02:00
vanhofen
333fccef85 setting_helpers: fix flagfile handling in CFlagFileNotifier()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 57bdeba636
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-16 (Sat, 16 Sep 2017)

Origin message was:
------------------
- setting_helpers: fix flagfile handling in CFlagFileNotifier()

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

------------------
This commit was generated by Migit
2017-09-16 14:04:06 +02:00
Jacek Jendrzej
8a451b3cdf Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: ea89db1ec2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-16 (Sat, 16 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-16 13:26:53 +02:00
vanhofen
bee773c61a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e868c860a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-16 (Sat, 16 Sep 2017)



------------------
This commit was generated by Migit
2017-09-16 13:01:20 +02:00
Jacek Jendrzej
af4f69402f remove unused locale
Origin commit data
------------------
Branch: ni/coolstream
Commit: be671bcdc9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-16 (Sat, 16 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-16 12:53:03 +02:00
vanhofen
d6a0db586f keychooser: just small renamings for a better view
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2cc8978f4b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- keychooser: just small renamings for a better view

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

------------------
This commit was generated by Migit
2017-09-16 11:29:46 +02:00
vanhofen
672ad153a3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: bcb50dacc6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-16 (Sat, 16 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-16 11:04:54 +02:00
vanhofen
308f44a17b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/widget/colorchooser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 10c224c00e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-16 (Sat, 16 Sep 2017)



------------------
This commit was generated by Migit
2017-09-16 11:03:04 +02:00
Thilo Graf
981adbbf78 CColorChooser: fix possible artefacts on screen after closed window
Window was painted with shadow but hide() method didn't know about this.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 38f80a5ca6
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)



------------------
This commit was generated by Migit
2017-09-15 22:23:01 +02:00
Jacek Jendrzej
37b9f2611e readd fontmenu scaling hint
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3732eb851a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-15 (Fri, 15 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-15 21:27:36 +02:00
Jacek Jendrzej
06ce66bbd8 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: e3998c1ced
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-15 (Fri, 15 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-15 20:44:49 +02:00
vanhofen
7fda7b7b5a icons: rename slider icons to more logical names
Origin commit data
------------------
Branch: ni/coolstream
Commit: cd539af1f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- icons: rename slider icons to more logical names

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

------------------
This commit was generated by Migit
2017-09-15 20:18:26 +02:00
vanhofen
3f1a3ed531 rename SLIDER defines
Origin commit data
------------------
Branch: ni/coolstream
Commit: d873aef1e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- rename SLIDER defines

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

------------------
This commit was generated by Migit
2017-09-15 20:17:48 +02:00
vanhofen
19e717043e icons: new slider icons with material colors
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb22f29d3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- icons: new slider icons with material colors

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

------------------
This commit was generated by Migit
2017-09-15 20:17:07 +02:00
vanhofen
f5bdb499cb menu: rework slider; ...
* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a748de445
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- menu: rework slider; ...

* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


------------------
This commit was generated by Migit
2017-09-15 20:16:13 +02:00
vanhofen
9dffc0a4da colorchooser: rework tis gui-element; ...
* use OFFSET defines
* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


Origin commit data
------------------
Branch: ni/coolstream
Commit: 442f1adff0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- colorchooser: rework tis gui-element; ...

* use OFFSET defines
* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


------------------
This commit was generated by Migit
2017-09-15 20:15:25 +02:00
vanhofen
ffd1fed4d0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e9dbee89df
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-15 19:07:00 +02:00
vanhofen
3c8c3247ab keychooser: just small renamings for a better view
Origin commit data
------------------
Branch: ni/coolstream
Commit: a648203955
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- keychooser: just small renamings for a better view

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

------------------
This commit was generated by Migit
2017-09-15 19:04:57 +02:00
vanhofen
c2e72b711c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/widget/keychooser.h


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



------------------
This commit was generated by Migit
2017-09-15 18:26:42 +02:00
vanhofen
ed0a6297c9 menue: don't move menu in centered mode to the right; ...
when hintboxes do overlay the menu it looks crooked


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

Origin message was:
------------------
- menue: don't move menu in centered mode to the right; ...

when hintboxes do overlay the menu it looks crooked


------------------
This commit was generated by Migit
2017-09-15 18:23:31 +02:00
vanhofen
51dde95a4e menue: always show frame around the hintbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 38237f07b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- menue: always show frame around the hintbox

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

------------------
This commit was generated by Migit
2017-09-15 18:23:31 +02:00
vanhofen
c27de33335 keychooser: use CMenuDForwarder instead of CMenuForwarder
Origin commit data
------------------
Branch: ni/coolstream
Commit: 10d236fd16
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- keychooser: use CMenuDForwarder instead of CMenuForwarder

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

------------------
This commit was generated by Migit
2017-09-15 16:40:14 +02:00
vanhofen
db665c0704 keychooser: strip unneeded code; use hintbox instead of handcrafted paints
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5370086103
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- keychooser: strip unneeded code; use hintbox instead of handcrafted paints

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

------------------
This commit was generated by Migit
2017-09-15 16:34:23 +02:00
vanhofen
baf7d3aae0 keychooser: use CMenuDForwarder instead of CMenuForwarder
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6b01a39d03
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- keychooser: use CMenuDForwarder instead of CMenuForwarder

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

------------------
This commit was generated by Migit
2017-09-15 12:59:43 +02:00
vanhofen
62784fee02 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b4701fdcb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-15 12:53:19 +02:00
vanhofen
70872b11ac keychooser: strip unneeded code; use hintbox instead of handcrafted paints
Origin commit data
------------------
Branch: ni/coolstream
Commit: 04c1cbe15e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- keychooser: strip unneeded code; use hintbox instead of handcrafted paints

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

------------------
This commit was generated by Migit
2017-09-15 12:41:06 +02:00
vanhofen
673f1580ec Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b72cda244d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-14 22:02:00 +02:00
vanhofen
e54707c21c icons: rename slider icons to more logical names
Origin commit data
------------------
Branch: ni/coolstream
Commit: b00caf1c31
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- icons: rename slider icons to more logical names

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

------------------
This commit was generated by Migit
2017-09-14 22:00:41 +02:00
vanhofen
81aff7eebd rename SLIDER defines
Origin commit data
------------------
Branch: ni/coolstream
Commit: 978d72ac00
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- rename SLIDER defines

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

------------------
This commit was generated by Migit
2017-09-14 22:00:41 +02:00
vanhofen
30dc46a245 icons: new slider icons with material colors
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b09d125fc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- icons: new slider icons with material colors

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

------------------
This commit was generated by Migit
2017-09-14 21:37:44 +02:00
vanhofen
68f37aaddd menu: rework slider; ...
* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c22aa7058
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- menu: rework slider; ...

* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


------------------
This commit was generated by Migit
2017-09-14 21:37:44 +02:00
vanhofen
b5415cb413 colorchooser: rework tis gui-element; ...
* use OFFSET defines
* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


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

Origin message was:
------------------
- colorchooser: rework tis gui-element; ...

* use OFFSET defines
* rename some variables
* use paintBoxFrame() instead of background-icon; this avoids scaling
 issues on higher resolutions; scaled icons are ugly


------------------
This commit was generated by Migit
2017-09-14 21:37:44 +02:00
vanhofen
4f14db498f fix merge error
Origin commit data
------------------
Branch: ni/coolstream
Commit: 95d09d638b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- fix merge error

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

------------------
This commit was generated by Migit
2017-09-14 16:47:43 +02:00
vanhofen
f3ccea3915 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/update_settings.cpp


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



------------------
This commit was generated by Migit
2017-09-14 16:30:58 +02:00
vanhofen
4dc0113a94 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/info_menue.cpp
	src/gui/widget/menue.cpp
	src/nhttpd/yconfig.h
	src/system/helpers.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9152c228ed
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)



------------------
This commit was generated by Migit
2017-09-14 16:23:15 +02:00
Michael Liebmann
c230e44bc9 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: bdfccc2f22
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-14 15:37:58 +02:00
Michael Liebmann
c69ffa0305 system/helpers.cpp: Add cstr_replace()
- This is a faster C version of str_replace()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 020936acbe
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
system/helpers.cpp: Add cstr_replace()

 - This is a faster C version of str_replace()


------------------
This commit was generated by Migit
2017-09-14 15:37:36 +02:00
Jacek Jendrzej
e250ac7837 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ebb47f519
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-14 13:54:04 +02:00
Jacek Jendrzej
8e9b2a2b63 remove unused
Origin commit data
------------------
Branch: ni/coolstream
Commit: 97442240f8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-14 13:29:47 +02:00
Thilo Graf
5426b516a8 update version to 3.5.1
Origin commit data
------------------
Branch: ni/coolstream
Commit: fd99913d9f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-14 12:16:17 +02:00