mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,524 Commits 2 Branches 9 Tags
56c4f5943d2ec43014d6257ce0a56ee28ca2350c
Commit Graph

159 Commits

Author SHA1 Message Date
vanhofen
b21fed6d25 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: e40d4c44b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-12 22:05:01 +01:00
vanhofen
af321e4411 moviebrowser: limit cover to one third of m_cBoxFrameInfo1 width 
Origin commit data
------------------
Commit: a47a5cd422
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)

Origin message was:
------------------
- moviebrowser: limit cover to one third of m_cBoxFrameInfo1 width
 2016-11-12 22:03:05 +01:00
vanhofen
b3b0c90b2c moviebrowser: fix MB_INFO_SPACER's empty content 
Origin commit data
------------------
Commit: da604fb9a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)

Origin message was:
------------------
- moviebrowser: fix MB_INFO_SPACER's empty content
 2016-11-12 20:40:28 +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
Thilo Graf
dc607fd1df Merge branch 'master' into pu/msgbox 
Origin commit data
------------------
Commit: 97006c6615
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
 2016-11-11 21:33:12 +01:00
vanhofen
7a0efa6d68 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 184e6325c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
 2016-11-11 16:39:18 +01:00
vanhofen
3011b2fe15 moviebrowser: use own defaults for moviebrowser's view 
Origin commit data
------------------
Commit: 98ba673e19
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- moviebrowser: use own defaults for moviebrowser's view
 2016-11-11 16:38:24 +01:00
vanhofen
b1af01a476 moviebrowser: reset m_pcInfo1 box to default height, ... 
when turning m_settings.browserAdditional off


Origin commit data
------------------
Commit: ad7947d11a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- moviebrowser: reset m_pcInfo1 box to default height, ...

when turning m_settings.browserAdditional off
 2016-11-11 16:35:50 +01:00
vanhofen
f717e1ea75 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: abb8e5f02a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
 2016-11-11 13:59:11 +01:00
vanhofen
36a112936c moviebrowser: show sorting menu; displays only available options 
Origin commit data
------------------
Commit: 2cd4a9e410
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- moviebrowser: show sorting menu; displays only available options
 2016-11-11 13:46:55 +01:00
Thilo Graf
d34322b568 Merge branch 'master' into pu/msgbox 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: 3efaac5725
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
 2016-11-10 10:27:22 +01:00
vanhofen
98e986dafc Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: f0d9adbe46
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)
 2016-11-08 22:07:57 +01:00
vanhofen
efcc10c271 moviebrowser: simplify channellogo scaling code 
Origin commit data
------------------
Commit: 1590f4a276
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)

Origin message was:
------------------
- moviebrowser: simplify channellogo scaling code
 2016-11-08 22:00:08 +01:00
vanhofen
2a769e02ce Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 8d598b3d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 22:21:35 +01:00
vanhofen
130ba10bd4 moviebrowser: use small offset in header to display channellogo 
Origin commit data
------------------
Commit: 9b79662575
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- moviebrowser: use small offset in header to display channellogo
 2016-11-07 21:11:13 +01:00
vanhofen
5f1e7af7a9 listbox/moviebrowser: replace internal offsets with global defines 
Origin commit data
------------------
Commit: b24ec63577
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- listbox/moviebrowser: replace internal offsets with global defines
 2016-11-07 21:10:21 +01:00
vanhofen
87d5f81006 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 0159ed78a0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 20:42:11 +01:00
vanhofen
4de89cd1f6 moviebrowser: increase default browserFrameHeight 
Origin commit data
------------------
Commit: 16dfc2d5e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- moviebrowser: increase default browserFrameHeight
 2016-11-07 14:50:50 +01:00
vanhofen
7c249335f1 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/widget/listframe.cpp


Origin commit data
------------------
Commit: aa2517293f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 13:48:21 +01:00
vanhofen
eedddf19ce moviebrowser: allow round borders in filter selection 
Origin commit data
------------------
Commit: 5ca710ed4b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- moviebrowser: allow round borders in filter selection
 2016-11-07 13:45:55 +01:00
vanhofen
e2c1dbc75b Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 6a196e6645
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)
 2016-11-02 08:49:37 +01:00
vanhofen
329b279cad moviebrowser: smaller locales for footer; clearify "filter off" mode 
Origin commit data
------------------
Commit: 9d2661a1d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)

Origin message was:
------------------
- moviebrowser: smaller locales for footer; clearify "filter off" mode
 2016-11-02 08:27:21 +01:00
vanhofen
bffa9ac6b0 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 417acc9cc8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-31 (Mon, 31 Oct 2016)
 2016-10-31 23:23:45 +01:00
vanhofen
ce4da19f5d moviebrowser: fix filter selection 
Origin commit data
------------------
Commit: fc6e8fbbca
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-31 (Mon, 31 Oct 2016)

Origin message was:
------------------
- moviebrowser: fix filter selection
 2016-10-31 23:07:27 +01:00
vanhofen
c5125da443 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
------------------
Commit: 30e1c0ef71
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)
 2016-10-29 12:45:02 +02:00
vanhofen
1e5da313e7 moviebrowser: allow channellist-design in moviebrowser 
Origin commit data
------------------
Commit: 142ae901b0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)

Origin message was:
------------------
- moviebrowser: allow channellist-design in moviebrowser
 2016-10-29 10:02:07 +02:00
Thilo Graf
49f57968ed Merge branch 'master' into pu/msgbox 
Origin commit data
------------------
Commit: ac59ce80b1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-26 (Wed, 26 Oct 2016)
 2016-10-26 09:56:49 +02:00
vanhofen
3d37c18a62 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
------------------
Commit: 318b4926e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
 2016-10-25 12:22:47 +02:00
vanhofen
b7f8c2c220 moviebrowser: port configuration of moviebrowser fonts from NI-Neutrino 
Origin commit data
------------------
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
 2016-10-25 12:19:48 +02:00
Thilo Graf
4dcc1b41d8 Merge branch 'master' into pu/msgbox 
Origin commit data
------------------
Commit: be5ab3ab57
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
 2016-10-25 11:47:33 +02:00
vanhofen
3984ee312a moviebrowser: add spacer row to last play/rec windows 
Origin commit data
------------------
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
 2016-10-25 11:06:12 +02:00
vanhofen
6f122b3b3f moviebrowser: fix max_width in info-box 
Origin commit data
------------------
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
 2016-10-25 11:06:12 +02:00
Thilo Graf
505b57685b CMovieBrowser: add current content background color as image backkground 
Avoids transparent shadow artefacts during repaint of images


Origin commit data
------------------
Commit: 9d09bc36ce
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-05 (Wed, 05 Oct 2016)
 2016-10-24 10:31:26 +02:00
Thilo Graf
11b3307251 CMsgBox: rework msgbox classes with Window class implementation 
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details


Origin commit data
------------------
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)
 2016-10-24 10:31:24 +02:00
vanhofen
da3d97b77e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: ec448e14fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)
 2016-10-23 21:57:00 +02:00
vanhofen
15ef261541 moviebrowser: show minutes in two-digits format 
Origin commit data
------------------
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
 2016-10-23 21:51:34 +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
2510d548e0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	lib/timerdclient/timerdtypes.h
	src/gui/channellist.cpp
	src/system/httptool.h


Origin commit data
------------------
Commit: 0bb2f888c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
 2016-10-21 11:23:51 +02:00
vanhofen
c670b9c47f moviebrowser: add possibility to add spacers to moviebrowser 
Origin commit data
------------------
Commit: 75a2665b87
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)

Origin message was:
------------------
- moviebrowser: add possibility to add spacers to moviebrowser
 2016-10-21 10:47:37 +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
vanhofen
892603fe68 rename customcolor.h -> color_custom.h; reduce unneeded inludes 
Origin commit data
------------------
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
 2016-10-10 14:19:55 +02:00
vanhofen
5889f018c0 add and use OFFSET_INTER definition 
Origin commit data
------------------
Commit: 98500fdeb6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- add and use OFFSET_INTER definition
 2016-10-10 14:19:55 +02:00
Thilo Graf
0fca9a3e2a Moviebrowser: outsource help class 
Origin commit data
------------------
Commit: c4827704ac
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-07 (Fri, 07 Oct 2016)
 2016-10-07 17:38:25 +02:00
vanhofen
9b1904e84d Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 6c8ea9793f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-06 (Thu, 06 Oct 2016)
 2016-10-06 21:18:48 +02:00
Thilo Graf
440153c2d7 Moviebrowser: complete licence texts 
Origin commit data
------------------
Commit: fe8e3896a0
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-05 (Wed, 05 Oct 2016)
 2016-10-05 17:48:25 +02:00
vanhofen
93a0de1cc1 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/global.h


Origin commit data
------------------
Commit: 005bd91ea9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)
 2016-10-01 11:04:00 +02:00
vanhofen
32668ed67a moviebrowser: undock display of filling level from infobar setting 
Origin commit data
------------------
Commit: cc5f776780
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-30 (Fri, 30 Sep 2016)

Origin message was:
------------------
- moviebrowser: undock display of filling level from infobar setting
 2016-09-30 08:53:30 +02:00
vanhofen
49386530ec movieinfo: internally rename epgEpgId -> epgId 
Origin commit data
------------------
Commit: aa8a3849f4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgEpgId -> epgId
 2016-09-10 00:32:35 +02:00
vanhofen
138af5fcaf movieinfo: internally rename epgId -> channelId 
Origin commit data
------------------
Commit: 625cbb6122
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgId -> channelId
 2016-09-10 00:32:35 +02:00
vanhofen
08e1339fcf movieinfo: internally rename epgChannel -> ChannelName 
Origin commit data
------------------
Commit: a85d539bd0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgChannel -> ChannelName
 2016-09-10 00:32:35 +02:00