mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-09-01 01:41:23 +02:00
- rename BOXMODEL_CS => BOXMODEL_CST
Conflicts: data/scripts/Makefile.am src/gui/cam_menu.cpp src/gui/imageinfo_ni.cpp src/gui/osd_setup.cpp src/gui/update.cpp src/gui/update.h src/gui/update_menue.cpp src/neutrino.cpp src/system/setting_helpers.cpp Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
@@ -724,7 +724,18 @@ int COsdSetup::showOsdSetup()
|
||||
mc->setHint("", LOCALE_MENU_HINT_OSD_PRESET);
|
||||
osd_menu->addItem(mc);
|
||||
}
|
||||
#if 0
|
||||
#if !defined BOXMODEL_CST_HD2
|
||||
int scart_osd_fix_exist = 0;
|
||||
if (file_exists("/var/etc/.scart_osd_fix"))
|
||||
scart_osd_fix_exist = 1;
|
||||
|
||||
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);
|
||||
#endif
|
||||
#endif
|
||||
#if 0
|
||||
// round corners
|
||||
mc = new CMenuOptionChooser(LOCALE_EXTRA_ROUNDED_CORNERS, &g_settings.theme.rounded_corners, MENU_CORNERSETTINGS_TYPE_OPTIONS, MENU_CORNERSETTINGS_TYPE_OPTION_COUNT, true, this);
|
||||
@@ -766,6 +777,9 @@ int COsdSetup::showOsdSetup()
|
||||
CAudioMute::getInstance()->enableMuteIcon(true);
|
||||
}
|
||||
|
||||
// #if !defined BOXMODEL_CST_HD2
|
||||
// delete scartFileNotifier;
|
||||
// #endif
|
||||
delete colorInfoclockNotifier;
|
||||
delete screensaverNotifier;
|
||||
delete channellistNotifier;
|
||||
|
Reference in New Issue
Block a user