Stefan Seyfried
706a5ba010
Merge remote-tracking branch 'tuxbox/master'
...
Origin commit data
------------------
Commit: 8b47699447
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-02-11 (Sat, 11 Feb 2017)
2017-02-11 11:18:45 +01:00
Thilo Graf
829d045a99
CMenuWidget: remove dub code from init
...
Origin commit data
------------------
Commit: 0435ca20a3
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 16:35:03 +01:00
Thilo Graf
a3f59e7c4a
CMenuWidget: use only nameString as container for widget name
...
neutrino_locale_t name could be transformed always to real string to
unify this container
Origin commit data
------------------
Commit: 2dda93ed2b
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 15:52:39 +01:00
vanhofen
26dae069c7
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: e0084d8913
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-02 (Thu, 02 Feb 2017)
2017-02-02 13:13:34 +01:00
Thilo Graf
eff64072c2
Revert "CMenuWidget: ensure repaint of all header content if it is already painted"
...
This reverts commit 04cec1bdf4
.
Origin commit data
------------------
Commit: a2f9d4b462
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-02-02 (Thu, 02 Feb 2017)
2017-02-02 11:18:27 +01:00
Stefan Seyfried
f9341822cf
Merge remote-tracking branch 'tuxbox/master'
...
Origin commit data
------------------
Commit: 7497722646
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-02-01 (Wed, 01 Feb 2017)
2017-02-01 22:03:40 +01:00
Thilo Graf
04cec1bdf4
CMenuWidget: ensure repaint of all header content if it is already painted
...
TODO: This should be controlled inside header base class.
paint() method seems suitable.
I Will try to implement it soon.
Origin commit data
------------------
Commit: 97ed7cdaf7
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-01-30 (Mon, 30 Jan 2017)
2017-01-31 16:36:43 +01:00
Thilo Graf
686bc2ce6a
CMenuWidget: add missing hide() for details line
...
Details_line was not removed in all constellations when menu was closed.
Sample: open main menue and select an entry with connect-line, eg. plugins,
press key to come into submenu, then go back to main menue and close
menu with home key, result: it's possible that line is still on screen.
Origin commit data
------------------
Commit: 76008371ff
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-01-27 (Fri, 27 Jan 2017)
2017-01-31 16:36:42 +01:00
Stefan Seyfried
a73e775906
Merge remote-tracking branch 'tuxbox/master'
...
Origin commit data
------------------
Commit: 48ff7b36a2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-01-30 (Mon, 30 Jan 2017)
2017-01-30 21:36:09 +01:00
vanhofen
c64c3f48c6
Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: fa6cac3836
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-01-30 (Mon, 30 Jan 2017)
2017-01-30 16:33:02 +01:00
vanhofen
e28f6df00a
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
src/gui/components/cc_detailsline.cpp
src/gui/movieplayer.cpp
src/gui/osd_setup.cpp
src/neutrino.cpp
Origin commit data
------------------
Commit: 609d466302
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-01-30 (Mon, 30 Jan 2017)
2017-01-30 16:32:43 +01:00
Thilo Graf
bfba1692ca
Merge branch 'master' into pu/font
...
Origin commit data
------------------
Commit: 3a0aaa6c29
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-01-30 (Mon, 30 Jan 2017)
2017-01-30 12:23:51 +01:00
Thilo Graf
f0e520d0f3
CMenuWidget: ensure repaint of all header content if it is already painted
...
TODO: This should be controlled inside header base class.
paint() method seems suitable.
I Will try to implement it soon.
Origin commit data
------------------
Commit: a72f3a7867
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-01-30 (Mon, 30 Jan 2017)
2017-01-30 12:21:10 +01:00
Thilo Graf
b29b69a39b
CMenuWidget: Forcing removal of details line during removing of hint box.
...
Origin commit data
------------------
Commit: 6a3778ba93
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-01-30 (Mon, 30 Jan 2017)
2017-01-30 11:27:55 +01:00
vanhofen
1d873df948
Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
src/gui/volumebar.cpp
Origin commit data
------------------
Commit: cd8b9f9b04
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-01-29 (Sun, 29 Jan 2017)
2017-01-29 22:37:31 +01:00
Thilo Graf
06b5acf1a7
CMenuWidget: add missing hide() for details line
...
Details_line was not removed in all constellations when menu was closed.
Sample: open main menue and select an entry with connect-line, eg. plugins,
press key to come into submenu, then go back to main menue and close
menu with home key, result: it's possible that line is still on screen.
Origin commit data
------------------
Commit: a3ee3351b5
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-01-27 (Fri, 27 Jan 2017)
2017-01-29 21:52:52 +01:00
vanhofen
ae640b35c1
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
src/neutrino.cpp
Origin commit data
------------------
Commit: 4ace56d488
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-01-29 (Sun, 29 Jan 2017)
2017-01-29 21:30:01 +01:00
Jacek Jendrzej
542ba9679a
fix uninitialised values
...
Origin commit data
------------------
Commit: f76dda36df
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-01-29 (Sun, 29 Jan 2017)
2017-01-29 20:54:35 +01:00
Stefan Seyfried
c95aca9252
Merge remote-tracking branch 'tuxbox/master'
...
Origin commit data
------------------
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-01-22 (Sun, 22 Jan 2017)
2017-01-22 22:59:39 +01:00
vanhofen
0da8ea3928
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: 41c29a4210
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-12-24 (Sat, 24 Dec 2016)
2016-12-24 00:29:03 +01:00
Thilo Graf
adac232005
CMenuWidget: add menu name reinit
...
Ensures correct display of menu name while runtime.
For example: it's required on changed language settings, otherwise we have
old language in menu head.
Origin commit data
------------------
Commit: 114bba2ab7
Author: Thilo Graf <dbt@novatux.de >
Date: 2016-12-22 (Thu, 22 Dec 2016)
2016-12-22 23:49:01 +01:00
vanhofen
02880bee17
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: a0d262c596
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-12-20 (Tue, 20 Dec 2016)
2016-12-20 21:40:42 +01:00
vanhofen
86adfe9bda
menue: use SCROLLBAR_WIDTH define
...
Origin commit data
------------------
Commit: 97cfb36041
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-12-20 (Tue, 20 Dec 2016)
Origin message was:
------------------
- menue: use SCROLLBAR_WIDTH define
2016-12-20 10:26:59 +01:00
Thilo Graf
f8589d0ad4
CMenuWidget: add external methode to paint scrollbar
...
Origin commit data
------------------
Commit: abff070ad7
Author: Thilo Graf <dbt@novatux.de >
Date: 2016-12-19 (Mon, 19 Dec 2016)
2016-12-19 17:21:51 +01:00
Thilo Graf
d58e22b4ed
CMenuWidget: add external methode to paint scrollbar
...
Origin commit data
------------------
Commit: 644e8196db
Author: Thilo Graf <dbt@novatux.de >
Date: 2016-12-15 (Thu, 15 Dec 2016)
2016-12-17 22:39:14 +01:00
Stefan Seyfried
eab48f2ed9
Merge remote-tracking branch 'tuxbox/master'
...
Origin commit data
------------------
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2016-12-04 (Sun, 04 Dec 2016)
2016-12-04 18:02:51 +01:00
vanhofen
5c76067adf
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: b57a2b31cd
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-11-25 (Fri, 25 Nov 2016)
2016-11-25 18:57:11 +01:00
Jacek Jendrzej
77adc62153
supplement to 192a9d80ed
...
Origin commit data
------------------
Commit: 91e0f8070b
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2016-11-25 (Fri, 25 Nov 2016)
2016-11-25 16:45:26 +01:00
vanhofen
56879044cb
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
src/gui/audioplayer.cpp
src/gui/movieplayer.cpp
src/gui/pictureviewer.cpp
src/gui/upnpbrowser.cpp
Origin commit data
------------------
Commit: 2f3793fa1d
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-11-24 (Thu, 24 Nov 2016)
2016-11-24 21:45:31 +01:00
Jacek Jendrzej
192a9d80ed
src/gui/widget/menue.cpp try to fix widget segfault menu with keyboard and background restore
...
Origin commit data
------------------
Commit: a8ea7c60d5
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2016-11-24 (Thu, 24 Nov 2016)
2016-11-24 19:21:14 +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
vanhofen
b0d3e0f4ee
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: ca86828ff1
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-11-14 (Mon, 14 Nov 2016)
2016-11-14 23:02:33 +01:00
Thilo Graf
561957223c
Merge branch 'master' into pu/msgbox
...
Origin commit data
------------------
Commit: aa40d88300
Author: Thilo Graf <dbt@novatux.de >
Date: 2016-11-14 (Mon, 14 Nov 2016)
2016-11-14 20:38:01 +01:00
Jacek Jendrzej
4dbaafb40d
src/gui/widget/menue.cpp try fix hide info_box (in channellist)
...
Origin commit data
------------------
Commit: 99c57d3075
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2016-11-14 (Mon, 14 Nov 2016)
2016-11-14 19:27:09 +01:00
Stefan Seyfried
2e7aa7be4a
Merge remote-tracking branch 'tuxbox/master'
...
Origin commit data
------------------
Commit: 2c92d112d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2016-11-12 (Sat, 12 Nov 2016)
2016-11-12 18:06:26 +01:00
vanhofen
1bc70fc18f
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: d271a8999b
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-11-11 (Fri, 11 Nov 2016)
2016-11-11 00:51:58 +01:00
Thilo Graf
373c2967dd
Merge branch 'master' into pu/msgbox
...
Origin commit data
------------------
Commit: 96ffa4778a
Author: Thilo Graf <dbt@novatux.de >
Date: 2016-11-11 (Fri, 11 Nov 2016)
2016-11-11 00:51:20 +01:00
Thilo Graf
41a9339469
CMenuWidget: move signal before render methodes
...
At start of methode, unusual behavior could occur.
Origin commit data
------------------
Commit: 30f231c801
Author: Thilo Graf <dbt@novatux.de >
Date: 2016-11-11 (Fri, 11 Nov 2016)
2016-11-11 00:48:37 +01:00
Thilo Graf
5d9e739abf
Merge branch 'master' into pu/msgbox
...
Origin commit data
------------------
Commit: 9b9d2542e6
Author: Thilo Graf <dbt@novatux.de >
Date: 2016-10-28 (Fri, 28 Oct 2016)
2016-10-28 08:05:34 +02:00
vanhofen
75d4dd6fac
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: ecd3951b7d
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-10-27 (Thu, 27 Oct 2016)
2016-10-27 23:12:05 +02:00
Jacek Jendrzej
df51d9945e
src/gui/widget/menue.cpp fix segfault if items is empty
...
Origin commit data
------------------
Commit: 83976f40b4
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2016-10-27 (Thu, 27 Oct 2016)
2016-10-27 17:06:12 +02:00
Thilo Graf
ffad03c63d
Merge branch 'master' into pu/msgbox
...
Origin commit data
------------------
Commit: 28acb0fefa
Author: Thilo Graf <dbt@novatux.de >
Date: 2016-10-27 (Thu, 27 Oct 2016)
2016-10-27 10:13:45 +02:00
vanhofen
e3f0aba5e6
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
------------------
Commit: d376b79ff1
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-10-26 (Wed, 26 Oct 2016)
2016-10-26 23:46:59 +02:00
Michael Liebmann
b31ef0e0e0
CMenuWidget::saveScreen: Fix segfault
...
Origin commit data
------------------
Commit: a3e0a0e917
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2016-10-26 (Wed, 26 Oct 2016)
2016-10-26 15:16:11 +02:00
Thilo Graf
4300865679
Shadow: try to optimize shadow areas
...
* cleanup inner part of box on round corners, frames considered
* adopt implementations in some gui classes
* some debug lines removed
* test menu adopted
* try to fix corner caluculation to avoid transparent holes
Origin commit data
------------------
Commit: a17d61de8c
Author: Thilo Graf <dbt@novatux.de >
Date: 2016-08-30 (Tue, 30 Aug 2016)
2016-10-24 10:31:25 +02:00
Stefan Seyfried
54189f271a
Merge remote-tracking branch 'tuxbox/master'
...
* needs compile fixes
* needs additional tests, of course :-)
Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2016-10-22 (Sat, 22 Oct 2016)
2016-10-22 11:37:40 +02:00
vanhofen
e18c48cf31
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/cst-next
...
Origin commit data
------------------
Commit: 26f5742797
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-10-19 (Wed, 19 Oct 2016)
2016-10-19 14:39:32 +02:00
vanhofen
7c36bd6884
various: use DARK text color on DARK background
...
Origin commit data
------------------
Commit: 957b1e05df
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-10-19 (Wed, 19 Oct 2016)
Origin message was:
------------------
- various: use DARK text color on DARK background
2016-10-19 14:35:38 +02:00
vanhofen
aad3e74e72
menue: fix listModeKey handling
...
Origin commit data
------------------
Commit: 870981c889
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-10-19 (Wed, 19 Oct 2016)
Origin message was:
------------------
- menue: fix listModeKey handling
2016-10-19 14:06:24 +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