mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)
This commit is contained in:
vanhofen
2017-09-12 22:32:07 +02:00
parent f37efba8f7 367977ada4
commit c6c61f6b22
41 changed files with 802 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/osd_setup.cpp
View File

@@ -51,7 +51,6 @@
#include <gui/color_custom.h>
#include <gui/infoclock.h>
#include <gui/timeosd.h>
#include <gui/ni_menu.h> //NI
#include <gui/widget/icons.h>
#include <gui/widget/colorchooser.h>
#include <gui/widget/stringinput.h>
@@ -65,6 +64,7 @@
#include <zapit/femanager.h>
#include <system/debug.h>
#include <system/helpers.h>
#include <system/setting_helpers.h>
#include "cs_api.h"
extern CRemoteControl * g_RemoteControl;
@@ -703,7 +703,7 @@ int COsdSetup::showOsdSetup()
if (file_exists("/var/etc/.scart_osd_fix"))
scart_osd_fix_exist = 1;
CNITouchFileNotifier * scartFileNotifier = new CNITouchFileNotifier("scart_osd_fix");
CFlagFileNotifier * scartFileNotifier = new CFlagFileNotifier("scart_osd_fix");
mc = new CMenuOptionChooser(LOCALE_SCART_OSD_FIX, &scart_osd_fix_exist, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, !g_settings.screen_preset, scartFileNotifier);
mc->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_SCART_OSD_FIX);
osd_menu->addItem(mc);