mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
6b0e887585d5e73bb9eea328cc855d394b4e4dd9
recycled-ni-neutrino/src/gui
History
vanhofen 6b0e887585 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



------------------
This commit was generated by Migit
2016-11-21 12:46:49 +01:00
..
bedit
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
components
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
lua
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
moviebrowser
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
widget
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
adzap.cpp
…
adzap.h
…
audio_select.cpp
…
audio_select.h
…
audio_setup.cpp
…
audio_setup.h
…
audiomute.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-10-22 11:37:40 +02:00
audiomute.h
…
audioplayer_setup.cpp
…
audioplayer_setup.h
…
audioplayer.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
audioplayer.h
…
bookmarkmanager.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
bookmarkmanager.h
…
bouquetlist.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
bouquetlist.h
…
buildinfo.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
buildinfo.h
…
cam_menu.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
cam_menu.h
…
cec_setup.cpp
…
cec_setup.h
…
channellist.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
channellist.h
channellist: paint events in additional box in a separated thread
2016-09-28 21:12:32 +02:00
color_custom.h
rename customcolor.h -> color_custom.h; reduce unneeded inludes
2016-10-10 14:19:55 +02:00
color.cpp
colors: change color for marked items under cursor; user's request
2016-10-23 21:45:43 +02:00
color.h
color.h: remove obsolete color COL_MENUCONTENTSELECTED_PLUS_1
2016-10-19 10:58:14 +02:00
dboxinfo.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-10-22 11:37:40 +02:00
dboxinfo.h
Merge remote-tracking branch 'tuxbox/master'
2016-10-22 11:37:40 +02:00
dmx_tspidbandwidth.c
…
epgplus.cpp
CMsgBox: rework msgbox classes with Window class implementation
2016-10-24 10:31:24 +02:00
epgplus.h
…
epgview.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
epgview.h
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
2016-08-10 16:01:20 +02:00
eventlist.cpp
eventlist: fix button_label size
2016-11-21 00:14:45 +01:00
eventlist.h
eventlist: remove obsolete bool show from CEventList::showFunctionBar
2016-10-12 20:55:28 +02:00
favorites.cpp
CFavorites: simplify hintbox calls
2016-11-20 22:46:49 +01:00
favorites.h
…
filebrowser.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
filebrowser.h
fonts: add and use own font for all footers
2016-08-15 19:02:42 +02:00
followscreenings.cpp
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-11-19 21:11:54 +01:00
followscreenings.h
…
hdd_info.cpp
adapt listModeKey() function to our code
2016-09-09 10:46:12 +02:00
hdd_info.h
…
hdd_menu.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
hdd_menu.h
Merge remote-tracking branch 'tuxbox/master'
2016-10-22 11:37:40 +02:00
imageinfo_ni.cpp
Merge branch 'ni/cst-next' into ni/mp/cst-next
2016-10-10 17:27:55 +02:00
imageinfo_ni.h
imageinfo_ni: Fix memory error
2016-09-25 00:23:45 +02:00
imageinfo.cpp
Locales: use generic gui name in messages and windows
2016-11-18 17:46:17 +01:00
imageinfo.h
CImageInfo: add yweb version info
2016-10-03 01:54:06 +02:00
imdb.cpp
imdb/movieinfo: cleanup from unused code
2016-08-09 18:54:10 +02:00
imdb.h
imdb/movieinfo: cleanup from unused code
2016-08-09 18:54:10 +02:00
info_menue.cpp
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-11-19 21:11:54 +01:00
info_menue.h
…
infoclock.cpp
rename SHADOW_OFFSET -> OFFSET_SHADOW
2016-10-10 14:19:55 +02:00
infoclock.h
…
infoicons_setup.cpp
…
infoicons_setup.h
…
infoicons.cpp
Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next
2016-10-10 16:45:30 +02:00
infoicons.h
…
infoviewer_bb.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-10-22 11:37:40 +02:00
infoviewer_bb.h
…
infoviewer.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
infoviewer.h
Merge remote-tracking branch 'tuxbox/master'
2016-10-22 11:37:40 +02:00
keybind_setup.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
keybind_setup.h
…
lcd4l_setup.cpp
lcd4l_setup: remove obsolete hintbox include
2016-11-21 00:21:14 +01:00
lcd4l_setup.h
…
lcd4l.cpp
lcd4l: reduce console spam in module detection
2016-11-16 20:43:28 +01:00
lcd4l.h
lcd4l: reduce console spam in module detection
2016-11-16 20:43:28 +01:00
Makefile.am
Merge remote-tracking branch 'tuxbox/master'
2016-10-22 11:37:40 +02:00
mediaplayer_setup.cpp
Moviebrowser: start outsourcing moviebrowser code
2016-09-20 08:03:50 +02:00
mediaplayer_setup.h
…
mediaplayer.cpp
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
2016-08-06 23:06:36 +02:00
mediaplayer.h
…
miscsettings_menu.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
miscsettings_menu.h
add option to read saved epg data frequently
2016-11-20 19:24:08 +01:00
motorcontrol.cpp
CMsgBox: rework msgbox classes with Window class implementation
2016-10-24 10:31:24 +02:00
motorcontrol.h
…
movieinfo.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-10-22 11:37:40 +02:00
movieinfo.h
movieinfo: internally rename epgEpgId -> epgId
2016-09-20 08:03:51 +02:00
movieplayer.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
movieplayer.h
Moviebrowser: start outsourcing moviebrowser code
2016-09-20 08:03:50 +02:00
netfs_setup.cpp
netfs_setup: simplify hintbox calls
2016-11-21 00:21:50 +01:00
netfs_setup.h
…
network_service.cpp
…
network_service.h
…
network_setup.cpp
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-11-21 00:14:20 +01:00
network_setup.h
…
nfs.cpp
…
nfs.h
…
ni_menu.cpp
ni_menu: simplify and fix hintbox calls
2016-11-21 00:22:25 +01:00
ni_menu.h
…
opkg_manager.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
opkg_manager.h
COPKGManager: Fix display description for locally installed packages
2016-10-13 09:53:52 +02:00
osd_progressbar_setup.cpp
…
osd_progressbar_setup.h
…
osd_setup.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
osd_setup.h
…
osdlang_setup.cpp
…
osdlang_setup.h
…
parentallock_setup.cpp
…
parentallock_setup.h
…
personalize.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
personalize.h
…
pictureviewer_help.h
CPictureViewerGui: add helpbox
2016-10-24 10:31:27 +02:00
pictureviewer_setup.cpp
…
pictureviewer_setup.h
…
pictureviewer.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
pictureviewer.h
CPictureViewerGui: add helpbox
2016-10-24 10:31:27 +02:00
pipsetup.cpp
CMsgBox: rework msgbox classes with Window class implementation
2016-10-24 10:31:24 +02:00
pipsetup.h
…
pluginlist.cpp
CMsgBox: rework msgbox classes with Window class implementation
2016-10-24 10:31:24 +02:00
pluginlist.h
…
plugins_hide.cpp
…
plugins_hide.h
…
plugins.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
plugins.h
Merge branch 'ni/mp' into ni/cst-next
2016-08-26 19:13:47 +02:00
proxyserver_setup.cpp
…
proxyserver_setup.h
…
rc_lock.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
rc_lock.h
…
record_setup.cpp
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-11-19 21:11:54 +01:00
record_setup.h
…
scan_setup.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
scan_setup.h
…
scan.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
scan.h
…
screensaver.cpp
Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next
2016-10-10 16:45:30 +02:00
screensaver.h
…
screensetup.cpp
CMsgBox: rework msgbox classes with Window class implementation
2016-10-24 10:31:24 +02:00
screensetup.h
…
settings_manager_teams.cpp
settings_manager_teams: simplify hintbox calls
2016-11-21 00:22:50 +01:00
settings_manager_teams.h
…
settings_manager.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
settings_manager.h
…
sleeptimer.cpp
…
sleeptimer.h
…
start_wizard.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
start_wizard.h
…
streaminfo2.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
streaminfo2.h
streaminfo2: allow fade in/out
2016-09-30 00:02:01 +02:00
subchannel_select.cpp
…
subchannel_select.h
…
test_menu.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
test_menu.h
CMsgBox: rework msgbox classes with Window class implementation
2016-10-24 10:31:24 +02:00
themes.cpp
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-11-19 21:11:54 +01:00
themes.h
…
timeosd.cpp
Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next
2016-10-10 16:45:30 +02:00
timeosd.h
…
timerlist.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
timerlist.h
add possibility to add Name,Url,Port, Username and Password if needed.
2016-10-28 22:20:27 +02:00
tmdb.cpp
cTmdb: simplyfy hintbox calls
2016-11-20 22:54:51 +01:00
tmdb.h
tmdb: cleanup from unused code
2016-08-09 17:48:56 +02:00
update_ext.cpp
CMsgBox: rework msgbox classes with Window class implementation
2016-10-24 10:31:24 +02:00
update_ext.h
…
update_menue.cpp
…
update_menue.h
…
update_settings.cpp
…
update_settings.h
…
update.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
update.h
…
upnpbrowser.cpp
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-11-21 00:14:20 +01:00
upnpbrowser.h
upnpbrowser: use OFFSET defines; fix color under cursor; minor cleanups
2016-10-13 15:14:03 +02:00
user_menue_setup.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
user_menue_setup.h
…
user_menue.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-10-22 11:37:40 +02:00
user_menue.h
…
vfd_setup.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-10-22 11:37:40 +02:00
vfd_setup.h
…
videosettings.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-11-21 12:46:49 +01:00
videosettings.h
…
volumebar.cpp
Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next
2016-10-10 16:45:30 +02:00
volumebar.h
…
webtv_setup.cpp
webtv_setup: allow to reload webtv xml files
2016-08-09 12:06:18 +02:00
webtv_setup.h
…
zapit_setup.cpp
…
zapit_setup.h
…