[CST] Focus 4d4d24e7fa gui/scan_setup.cpp: fix old merge ...

Origin commit data
------------------
Branch: ni/coolstream
Commit: 72d53fa44d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)


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

------------------
This commit was generated by Migit

2013-01-31 18:01:19 +04:00

..

bedit

Merge branch 'dvbsi++' into next

2013-01-11 14:21:44 +04:00

widget

Makefiles.am: add conditional include for libcoolstream

2013-01-11 14:17:16 +04:00

audio_select.cpp

remove doubles include

2012-09-11 20:31:33 +02:00

audio_select.h

…

audio_setup.cpp

remove doubles include

2012-09-11 20:31:33 +02:00

audio_setup.h

…

audioplayer_setup.cpp

remove doubles include

2012-09-11 20:31:33 +02:00

audioplayer_setup.h

…

audioplayer.cpp

gui/audioplayer.cpp: return menu_return::RETURN_EXIT_ALL on standby/shutdown,

2012-11-16 15:45:39 +04:00

audioplayer.h

add keys to control the audioplayer from pictureviewer

2012-11-30 22:06:27 +01:00

bookmarkmanager.cpp

remove doubles include

2012-09-11 20:31:33 +02:00

bookmarkmanager.h

neutrino: fix config file locations.

2012-11-13 12:45:17 +08:00

bouquetlist.cpp

src/gui/bouquetlist.cpp: close FAV window with rc-fav only in FAV mode

2012-11-05 16:45:34 +01:00

bouquetlist.h

gui/bouquetlist.cpp: add updateSelection(),

2012-10-22 14:23:16 +04:00

cam_menu.cpp

gui/cam_menu.cpp: workaround for possible wrong CI menu item count from libcs

2012-12-04 18:55:29 +04:00

cam_menu.h

…

cec_setup.cpp

initialize not initialized var

2012-11-05 09:24:51 +01:00

cec_setup.h

…

channellist.cpp

src/gui/channellist.cpp: minitv osd fix

2013-01-31 11:14:38 +01:00

channellist.h

add optional mini-tv to channellist

2013-01-30 19:17:52 +01:00

color.cpp

…

color.h

…

customcolor.h

…

dboxinfo.cpp

gui/dboxinfo.cpp: show free mem without cached/buffers; add 5 seconds timer to update window

2012-09-21 17:45:19 +04:00

dboxinfo.h

…

dmx_tspidbandwidth.c

…

epgplus.cpp

never used

2012-12-07 12:01:45 +01:00

epgplus.h

remove doubles include

2012-09-11 20:31:33 +02:00

epgview.cpp

src/gui/epgview.cpp: further corrections for followlist

2012-11-04 22:13:36 +01:00

epgview.h

src/gui/epgview.cpp: further corrections for followlist

2012-11-04 22:13:36 +01:00

eventlist.cpp

src/gui/epgview.cpp: further corrections for followlist

2012-11-04 22:13:36 +01:00

eventlist.h

eventlist: -add notifier to search menu, ported from tuxcvs, THX Gaucho316

2012-11-01 18:55:03 +01:00

favorites.cpp

…

favorites.h

…

filebrowser.cpp

gui/filebrowser.cpp: save return status to check if all gui must be closed

2012-11-16 15:36:59 +04:00

filebrowser.h

gui/filebrowser.cpp: save return status to check if all gui must be closed

2012-11-16 15:36:59 +04:00

hdd_menu.cpp

use my_system instead of system

2012-10-02 12:42:31 +02:00

hdd_menu.h

…

imageinfo.cpp

src/gui/imageinfo.cpp: change SVN Version to GIT Version

2012-10-28 13:08:55 +01:00

imageinfo.h

…

info_menue.cpp

disable tech.info if channelist is empty (fix possible segfault)

2012-10-20 13:26:27 +02:00

info_menue.h

…

infoclock.cpp

fix gcc 4.7.x warnings

2012-07-07 13:09:08 +02:00

infoclock.h

remove doubles include

2012-09-11 20:31:33 +02:00

infoviewer_bb.cpp

infoviewer_bb.cpp: Optimize display of simple resolution in the info bar

2012-11-16 07:14:01 +01:00

infoviewer_bb.h

infoviewer_bb.cpp,h: fix determination of hdd-usage in thread

2012-11-06 22:05:45 +01:00

infoviewer.cpp

gui/infoviewer.cpp: check live frontend for delivery system

2013-01-16 15:48:21 +04:00

infoviewer.h

supplement to faad967b97, simplification

2012-12-08 16:28:53 +01:00

keybind_setup.cpp

neutrino: fix file locations. use the predetermined CONFIGDIR instead of hardcoding paths.

2013-01-25 10:33:40 +08:00

keybind_setup.h

gui/keybind_setup.cpp: add changeNotify for remote repeat

2012-05-31 16:51:44 +04:00

Makefile.am

Merge branch 'dvbsi++' into next

2013-01-16 16:36:07 +04:00

mediaplayer_setup.cpp

remove doubles include

2012-09-11 20:31:33 +02:00

mediaplayer_setup.h

…

mediaplayer.cpp

src/gui/mediaplayer.cpp: fix memleaks when using CMenuForwarder

2012-11-20 13:21:33 +01:00

mediaplayer.h

remove doubles include

2012-09-11 20:31:33 +02:00

miscsettings_menu.cpp

gui/miscsettings_menu.cpp: use CFEManager::haveSat in place of glocal delivery system

2013-01-16 15:49:24 +04:00

miscsettings_menu.h

src/gui/miscsettings_menu.cpp: -add COnOffNotifier for EPG menu

2012-11-08 17:24:10 +01:00

motorcontrol.cpp

gui/motorcontrol.cpp: use new scan settings names

2013-01-16 15:56:16 +04:00

motorcontrol.h

…

moviebrowser.cpp

moviebrowser.cpp: accept covers without appended date/time

2012-12-18 21:58:00 +01:00

moviebrowser.h

Moviebrowser: Ask if the file of a running recording to be deleted.

2012-11-26 15:03:58 +01:00

movieinfo.cpp

movieinfo: supplement to 56a92c2a4e

2012-09-24 11:26:42 +02:00

movieinfo.h

movieinfo: supplement to 56a92c2a4e

2012-09-24 11:26:42 +02:00

movieplayer.cpp

gui/movieplayer.cpp: enable DTS on apollo

2013-01-16 15:51:39 +04:00

movieplayer.h

gui/movieplayer.cpp: get return status from filebrowser/moviebrowser

2012-11-16 15:38:43 +04:00

network_service.cpp

gui/network_service.cpp: use sh -c to start network service

2012-11-02 18:08:23 +04:00

network_service.h

gui/network_service.cpp: simple network service menu

2012-06-26 16:48:29 +04:00

network_setup.cpp

network_setup.cpp: add more suitable hints to hostname-setup

2012-11-07 13:02:40 +01:00

network_setup.h

gui/network_setup.cpp: fix memleaks when using CMenuForwarder

2012-05-05 13:42:14 +04:00

nfs.cpp

nfs.cpp: disable mount option if mountpoint is mounted

2012-10-11 14:59:52 +02:00

nfs.h

nfs.cpp:Update mount icon after mounting, ported from tuxbox cvs

2012-10-11 14:10:01 +02:00

osd_setup.cpp

add optional mini-tv to channellist

2013-01-30 19:17:52 +01:00

osd_setup.h

Neutrino: rework COnOffNotifier and use it if possible, ported from tuxbox cvs

2012-10-11 14:11:05 +02:00

osdlang_setup.cpp

neutrino: fix file locations. use the predetermined CONFIGDIR instead of hardcoding paths.

2013-01-25 10:33:40 +08:00

osdlang_setup.h

…

parentallock_setup.cpp

remove doubles include

2012-09-11 20:31:33 +02:00

parentallock_setup.h

update license text in some files

2012-07-08 22:01:11 +02:00

personalize.cpp

user_menu: personalize also yellow and green buttons

2012-11-05 21:26:19 +01:00

personalize.h

user_menu: personalize also yellow and green buttons

2012-11-05 21:26:19 +01:00

pictureviewer_setup.cpp

remove doubles include

2012-09-11 20:31:33 +02:00

pictureviewer_setup.h

…

pictureviewer.cpp

Pictureviewer: Remove duplicate locale from help text

2012-12-04 22:14:57 +01:00

pictureviewer.h

add keys to control the audioplayer from pictureviewer

2012-11-30 22:06:27 +01:00

pluginlist.cpp

remove obsolete and unused includes

2012-06-14 11:01:37 +04:00

pluginlist.h

…

plugins.cpp

src/gui/plugins.cpp: fix sort pluins without index

2012-12-04 19:57:02 +01:00

plugins.h

src/gui/plugins.cpp: fix sort pluins without index

2012-12-04 19:57:02 +01:00

proxyserver_setup.cpp

remove doubles include

2012-09-11 20:31:33 +02:00

proxyserver_setup.h

…

rc_lock.cpp

rc_lock: lock for rc_lock, use only once, supplement to b0b4b885ed

2012-10-22 15:52:07 +02:00

rc_lock.h

rc_lock: lock for rc_lock, use only once, supplement to b0b4b885ed

2012-10-22 15:52:07 +02:00

record_setup.cpp

settings: add option to enable/disable slow record warning

2012-10-16 19:53:47 +04:00

record_setup.h

gui/record_setup.cpp: add changeNotify, remove notifiers

2012-05-31 15:52:30 +04:00

ringbuffer.c

…

scan_setup.cpp

gui/scan_setup.cpp: fix old merge

2013-01-31 18:01:19 +04:00

scan_setup.h

gui/scan_setup.h: add diseqc order chooser

2013-01-24 13:47:49 +04:00

scan.cpp

gui/scan.cpp: add delivery type member, use it to find scanned type

2013-01-16 15:58:13 +04:00

scan.h

gui/scan.cpp: add delivery type member, use it to find scanned type

2013-01-16 15:58:13 +04:00

screensetup.cpp

remove doubles include

2012-09-11 20:31:33 +02:00

screensetup.h

…

settings_manager.cpp

neutrino: fix file locations. use the predetermined CONFIGDIR instead of hardcoding paths.

2013-01-25 10:33:40 +08:00

settings_manager.h

…

sleeptimer.cpp

GUI: remove CMenuWidget->hide() calls - CMenuWidget->exec() always hide before return

2012-05-07 15:37:02 +04:00

sleeptimer.h

…

start_wizard.cpp

gui/start_wizard.cpp: copy initial settings using CONFIGDIR

2013-01-29 14:44:45 +04:00

start_wizard.h

…

streaminfo2.cpp

gui/streaminfo2.cpp: fix transponder->type

2013-01-16 15:51:14 +04:00

streaminfo2.h

use new for buf, fix possible memlaek

2012-09-18 18:38:03 +02:00

subchannel_select.cpp

remove doubles include

2012-09-11 20:31:33 +02:00

subchannel_select.h

…

test_menu.cpp

gui/test_menu.cpp: change satNameNoDiseqc to satName

2013-01-16 15:55:31 +04:00

test_menu.h

neutrino_menue.cpp: move TEST_MENU define to gui/test_menu.h

2012-05-22 16:56:39 +04:00

themes.cpp

GUI: remove CMenuWidget->hide() calls - CMenuWidget->exec() always hide before return

2012-05-07 15:37:02 +04:00

themes.h

…

timeosd.cpp

remove doubles include

2012-09-11 20:31:33 +02:00

timeosd.h

…

timerlist.cpp

gui/timerlist.cpp: filter bouquets channels

2013-01-30 11:54:49 +04:00

timerlist.h

…

update_ext.cpp

extended update: move ext_update.* to update_ext.*

2013-01-14 15:31:43 +01:00

update_ext.h

src/gui/update_ext.h: supplement to 76a0ef0797

2013-01-16 12:03:40 +01:00

update_menue.cpp

src/gui/update_menue.cpp: Fix assignment color buttons

2012-11-17 00:51:43 +01:00

update_menue.h

remove doubles include

2012-09-11 20:31:33 +02:00

update_settings.cpp

gui/update_settings.cpp: always enable both url and local dir option:

2012-11-16 19:49:25 +04:00

update_settings.h

remove doubles include

2012-09-11 20:31:33 +02:00

update.cpp

gui/update.cpp: use mtd0 as default on apollo, disable uboot/uldr partitions write

2013-01-29 14:24:47 +04:00

update.h

gui/update.cpp: add local variable for update mode

2012-11-16 19:47:25 +04:00

upnpbrowser.cpp

Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++

2012-06-18 20:04:58 +04:00

upnpbrowser.h

remove doubles include

2012-09-11 20:31:33 +02:00

user_menue_setup.cpp

remove doubles include

2012-09-11 20:31:33 +02:00

user_menue_setup.h

…

user_menue.cpp

disable tech.info if channelist is empty (fix possible segfault)

2012-10-20 13:26:27 +02:00

user_menue.h

…

vfd_setup.cpp

remove doubles include

2012-09-11 20:31:33 +02:00

vfd_setup.h

…

videosettings.cpp

gui/videosettings.cpp: fix compile

2013-01-18 11:25:49 +04:00

videosettings.h

…

zapit_setup.cpp

gui/zapit_setup.cpp: filter bouquets channels,

2013-01-30 11:39:51 +04:00

zapit_setup.h

gui/zapit_setup.cpp: filter bouquets channels,

2013-01-30 11:39:51 +04:00