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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/components/cc_detailsline.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 609d466302
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)
This commit is contained in:
vanhofen
2017-01-30 16:32:43 +01:00
parent 1d873df948 b29b69a39b
commit e28f6df00a
11 changed files with 92 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/osd_setup.cpp
View File

@@ -48,6 +48,7 @@
#include <gui/audiomute.h>
#include <gui/color_custom.h>
#include <gui/infoclock.h>
#include <gui/timeosd.h>
#include <gui/infoviewer_bb.h> //NI
#include <gui/ni_menu.h> //NI
#include <gui/widget/icons.h>
@@ -69,6 +70,7 @@ extern CRemoteControl * g_RemoteControl;
extern const char * locale_real_names[];
extern std::string ttx_font_file;
extern CTimeOSD *FileTimeOSD;
COsdSetup::COsdSetup(int wizard_mode)
{
@@ -1387,19 +1389,19 @@ void COsdSetup::showOsdInfoclockSetup(CMenuWidget *menu_infoclock)
{
menu_infoclock->addIntroItems(LOCALE_MISCSETTINGS_INFOCLOCK);
CMenuOptionChooser *mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOCLOCK, &g_settings.mode_clock, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::RC_red);
CMenuOptionChooser *mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOCLOCK, &g_settings.mode_clock, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this, CRCInput::RC_red);
mc->setHint("", LOCALE_MENU_HINT_CLOCK_MODE);
menu_infoclock->addItem(mc);
menu_infoclock->addItem(GenericMenuSeparatorLine);
// size of info clock
CMenuOptionNumberChooser* mn = new CMenuOptionNumberChooser(LOCALE_CLOCK_SIZE_HEIGHT, &g_settings.infoClockFontSize, true, 30, 120);
CMenuOptionNumberChooser* mn = new CMenuOptionNumberChooser(LOCALE_CLOCK_SIZE_HEIGHT, &g_settings.infoClockFontSize, true, 30, 120, this);
mn->setHint("", LOCALE_MENU_HINT_CLOCK_SIZE);
menu_infoclock->addItem(mn);
// clock with seconds
mc = new CMenuOptionChooser(LOCALE_CLOCK_SECONDS, &g_settings.infoClockSeconds, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
mc = new CMenuOptionChooser(LOCALE_CLOCK_SECONDS, &g_settings.infoClockSeconds, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this);
mc->setHint("", LOCALE_MENU_HINT_CLOCK_SECONDS);
menu_infoclock->addItem(mc);
@@ -1539,6 +1541,12 @@ bool COsdSetup::changeNotify(const neutrino_locale_t OptionName, void * data)
//return true for repaint hint
return true;
}
else if ((ARE_LOCALES_EQUAL(OptionName, LOCALE_MISCSETTINGS_INFOCLOCK)) ||
(ARE_LOCALES_EQUAL(OptionName, LOCALE_CLOCK_SIZE_HEIGHT)) ||
(ARE_LOCALES_EQUAL(OptionName, LOCALE_CLOCK_SECONDS))) {
CInfoClock::getInstance()->ClearDisplay();
FileTimeOSD->Init();
}
return false;
}