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
56d77c49012ec25e865c070ec4f254a75bc07509
recycled-ni-neutrino/src/gui
History
vanhofen 56d77c4901 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/Makefile.am
	src/gui/user_menue.cpp


Origin commit data
------------------
Commit: 79a2dc262b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
2016-12-15 11:49:05 +01:00
..
bedit
Merge remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +01:00
components
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-12-15 11:49:05 +01:00
lua
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-12-02 23:39:21 +01:00
moviebrowser
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-12-06 20:46:37 +01:00
widget
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-12-15 11:49:05 +01:00
adzap.cpp
avoid null pointer use
2016-04-21 18:14:46 +02:00
adzap.h
remove unused and some clang compil fixes
2016-04-17 13:46:16 +02:00
audio_select.cpp
some compil warning fixes
2016-04-22 16:46:21 +02:00
audio_select.h
…
audio_setup.cpp
Merge remote-tracking branch 'uncool/cst-next'
2015-12-13 17:41:55 +01:00
audio_setup.h
start_wizard: use a global enum; switch detection from bool to int
2015-05-15 03:46:50 +02:00
audiomute.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-10-22 11:37:40 +02:00
audiomute.h
audiomute: add getStatus() function
2015-01-09 15:03:30 +01:00
audioplayer_setup.cpp
NI \o/
2016-05-19 22:59:54 +02:00
audioplayer_setup.h
…
audioplayer.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +01:00
audioplayer.h
rnd for random_shuffle
2016-03-28 15:03:29 +02:00
bookmarkmanager.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +01:00
bookmarkmanager.h
bookmark manager: only add bookmark if OK pressed
2015-03-16 11:57:22 +01:00
bouquetlist.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-12-12 10:29:42 +01:00
bouquetlist.h
remove unneeded include of system/lastchannel.h
2016-05-19 16:58:38 +02:00
buildinfo.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +01:00
buildinfo.h
some enum warrnings compil fixes
2015-02-15 22:16:47 +01:00
cam_menu.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +01:00
cam_menu.h
…
cec_setup.cpp
remove w_max()-calls to define menu-width, because ...
2015-04-24 09:11:04 +02:00
cec_setup.h
…
channellist.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-12-15 11:49:05 +01:00
channellist.h
channellist: try to fix right status-icon alignment
2016-12-12 08:30:22 +01: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
Merge remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +01:00
epgplus.h
epgplus.h: replace includes with forward declaration
2015-02-14 14:31:12 +01:00
epgview.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +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
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-06 13:02:25 +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 remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +01:00
filebrowser.h
fonts: add and use own font for all footers
2016-08-15 19:02:42 +02:00
followscreenings.cpp
followscreenings.cpp: Fix option "always"
2016-12-04 12:03:03 +01:00
followscreenings.h
followscreenings: port code from martiis-neutrino-mp
2016-07-01 15:26:06 +02:00
hdd_info.cpp
adapt listModeKey() function to our code
2016-09-09 10:46:12 +02:00
hdd_info.h
NI \o/
2016-05-19 22:59:54 +02:00
hdd_menu.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +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
CImageInfo: remove CC_APPEND
2016-11-28 21:44:00 +01:00
imageinfo.h
CImageInfo: remove CC_APPEND
2016-11-28 21:44:00 +01: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
components: rework classes
2015-12-27 14:42:27 +01:00
infoicons_setup.cpp
NI \o/
2016-05-19 22:59:54 +02:00
infoicons_setup.h
NI \o/
2016-05-19 22:59:54 +02:00
infoicons.cpp
infoicons: simplify icon detection
2016-12-13 11:19:12 +01:00
infoicons.h
NI \o/
2016-05-19 22:59:54 +02:00
infoviewer_bb.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-12-15 11:49:05 +01:00
infoviewer_bb.h
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-12 11:22:50 +01:00
infoviewer.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +01:00
infoviewer.h
Merge remote-tracking branch 'tuxbox/master'
2016-10-22 11:37:40 +02:00
keybind_setup.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +01:00
keybind_setup.h
remove unused and some clang compil fixes
2016-04-17 13:46:16 +02:00
lcd4l_setup.cpp
lcd4l_setup: remove obsolete hintbox include
2016-11-21 00:21:14 +01:00
lcd4l_setup.h
lcd4l_setup: move from ni_menu to own cpp|h
2016-05-24 16:08:24 +02:00
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 branch 'ni/tuxbox' into ni/mp/tuxbox
2016-12-15 11:49:05 +01: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 remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +01:00
miscsettings_menu.h
add option to read saved epg data frequently
2016-11-20 19:24:08 +01:00
motorcontrol.cpp
rename BUTTON_TOP to BUTTON_UP; it isn't a top-button
2016-12-07 15:37:03 +01:00
motorcontrol.h
remove unused and some clang compil fixes
2016-04-17 13:46:16 +02:00
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-12-06 20:46:37 +01:00
movieplayer.h
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-06 13:02:25 +01:00
netfs_setup.cpp
netfs_setup: simplify hintbox calls
2016-11-21 00:21:50 +01:00
netfs_setup.h
NI \o/
2016-05-19 22:59:54 +02:00
network_service.cpp
Merge remote-tracking branch 'uncool/cst-next'
2015-12-13 17:41:55 +01:00
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
start_wizard: use a global enum; switch detection from bool to int
2015-05-15 03:46:50 +02:00
nfs.cpp
NI \o/
2016-05-19 22:59:54 +02:00
nfs.h
…
ni_menu.cpp
ni_menu: simplify and fix hintbox calls
2016-11-21 00:22:25 +01:00
ni_menu.h
move FLAGDIR definition to global.h; ...
2016-05-25 23:15:37 +02:00
opkg_manager.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +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
NI \o/
2016-05-19 22:59:54 +02:00
osd_progressbar_setup.h
…
osd_setup.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-12-15 11:49:05 +01:00
osd_setup.h
NI \o/
2016-05-19 22:59:54 +02:00
osdlang_setup.cpp
Merge remote-tracking branch 'uncool/cst-next'
2015-12-13 17:41:55 +01:00
osdlang_setup.h
start_wizard: use a global enum; switch detection from bool to int
2015-05-15 03:46:50 +02:00
parentallock_setup.cpp
parental protection: make zaptime configurable
2014-11-11 14:40:52 +03:00
parentallock_setup.h
remove w_max()-calls to define menu-width, because ...
2015-04-24 09:11:04 +02:00
personalize.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +01:00
personalize.h
remove unneeded include of system/lastchannel.h
2016-05-19 16:58:38 +02:00
pictureviewer_help.h
CPictureViewerGui: add helpbox
2016-10-24 10:31:27 +02:00
pictureviewer_setup.cpp
avoid null pointer use
2016-04-21 18:14:46 +02:00
pictureviewer_setup.h
…
pictureviewer.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +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: simplify integratePlugins(); ...
2014-11-10 22:41:08 +01:00
plugins_hide.cpp
NI \o/
2016-05-19 22:59:54 +02:00
plugins_hide.h
NI \o/
2016-05-19 22:59:54 +02:00
plugins.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +01:00
plugins.h
Merge branch 'ni/mp' into ni/cst-next
2016-08-26 19:13:47 +02:00
proxyserver_setup.cpp
remove w_max()-calls to define menu-width, because ...
2015-04-24 09:11:04 +02:00
proxyserver_setup.h
…
rc_lock.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +01:00
rc_lock.h
rc_lock: rework class; switch to singleton; add icon; vfd-support
2016-01-20 20:26:52 +01:00
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 remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +01:00
scan_setup.h
Merge remote-tracking branch 'uncool/cst-next'
2015-12-13 17:41:55 +01:00
scan.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +01:00
scan.h
Merge remote-tracking branch 'check/cst-next'
2014-12-25 18:03:08 +01:00
screensaver.cpp
Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next
2016-10-10 16:45:30 +02:00
screensaver.h
NI \o/
2016-05-19 22:59:54 +02:00
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
NI \o/
2016-05-19 22:59:54 +02:00
settings_manager.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +01:00
settings_manager.h
start_wizard: use a global enum; switch detection from bool to int
2015-05-15 03:46:50 +02:00
sleeptimer.cpp
global.h: Use forward-declarations to reduce number of dependencies
2015-04-16 13:39:35 +02:00
sleeptimer.h
…
start_wizard.cpp
Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
2016-12-06 20:50:02 +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-12-12 10:29:42 +01:00
test_menu.h
CTestMenu: add sample to visualize current running records
2016-12-10 00:19:16 +01:00
themes.cpp
themes: change default colors
2016-12-12 13:56:43 +01:00
themes.h
CThemes: make saveFile and readFile accept const char* param
2015-02-14 14:31:11 +01:00
timeosd.cpp
Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next
2016-10-10 16:45:30 +02:00
timeosd.h
CTimeOSD: disable setHeight() in CTimeOSD, height is bound to settings
2015-12-27 14:42:29 +01:00
timerlist.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-12-12 10:29:42 +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
replace __FILE__ with __file__
2016-01-14 22:29:00 +01:00
update_menue.cpp
update_menu: put opkg update in front
2016-01-05 15:06:18 +01:00
update_menue.h
gui/update_menue.cpp: fix crash in dtor, CMenuForwarder is deleted on menu delete
2014-10-16 13:56:15 +04:00
update_settings.cpp
Merge remote-tracking branch 'uncool/cst-next'
2015-12-13 17:41:55 +01:00
update_settings.h
remove unused and some clang compil fixes
2016-04-17 13:46:16 +02:00
update.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +01:00
update.h
NI \o/
2016-05-19 22:59:54 +02:00
upnpbrowser.cpp
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-11-24 21:45:31 +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-12-15 11:49:05 +01:00
user_menue_setup.h
usermenu: sort/cleanup code by items; just code cosmetics
2016-12-13 10:53:24 +01:00
user_menue.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-12-15 11:49:05 +01:00
user_menue.h
locale: add usermenu title locales ...
2016-01-02 12:18:06 +01:00
vfd_setup.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-10-22 11:37:40 +02:00
vfd_setup.h
gui/vfd_setup.cpp: modify brightness menu so vfd follow selected menu item on scroll
2014-10-22 16:15:32 +04:00
videosettings.cpp
Merge remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +01:00
videosettings.h
remove unused and some clang compil fixes
2016-04-17 13:46:16 +02:00
volumebar.cpp
Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next
2016-10-10 16:45:30 +02:00
volumebar.h
remove unused and some clang compil fixes
2016-04-17 13:46:16 +02:00
webtv_setup.cpp
webtv_setup: allow to reload webtv xml files
2016-08-09 12:06:18 +02:00
webtv_setup.h
NI \o/
2016-05-19 22:59:54 +02:00
zapit_setup.cpp
remove w_max()-calls to define menu-width, because ...
2015-04-24 09:11:04 +02:00
zapit_setup.h
…