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

OSD Setup: Move volume settings in a separate submenu.

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d33901e5e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-09 (Thu, 09 May 2013)

Origin message was:
------------------
* OSD Setup: Move volume settings in a separate submenu.

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

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2013-05-09 17:54:51 +02:00
parent e72c03e5f7
commit cd11f3173a
7 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/deutsch.locale
View File

@@ -1109,6 +1109,7 @@ menu.hint_video_modes Definiert, welche Videosysteme mit der VF-Taste der Fernbe
menu.hint_video_pip Bild in Bild Größe und Position
menu.hint_video_saturation Change picture saturation
menu.hint_video_scart_mode Wählen Sie den Modus des Ausgangssignals für den SCART-Anschluss
menu.hint_volume Wählen Sie die Anzeigeoptionen für die Lautstärke
menu.hint_volume_digits Zifferndarstellung der Lautstärkeanzeige ein- oder ausschalten
menu.hint_volume_pos Wählen Sie die Position der Lautstärkeanzeige aus
menu.hint_zap_cycle Wählen Sie, ob nur innerhalb des aktiven Bouquets umgeschaltet werden kann
@@ -1186,6 +1187,7 @@ miscsettings.shutdown_count_hint2 den Deep-Standby geschalten wird (0 = aus)
miscsettings.shutdown_real Standbymodus
miscsettings.shutdown_real_rcdelay Verzögertes Ausschalten
miscsettings.sleeptimer Ausschalten nach Inaktivität
miscsettings.volume Lautstärke
miscsettings.zapto_pre_time Umschaltstart-Vorlaufzeit (Minuten)
motorcontrol.calc_positions Positionen (Neu)-Berechne(n))
motorcontrol.disable_limit Deaktiviere (soft) Limit

2
data/locale/english.locale
View File

@@ -1109,6 +1109,7 @@ menu.hint_video_modes VF key will cycle between enabled modes
menu.hint_video_pip Picture in picture size and position
menu.hint_video_saturation Change picture saturation
menu.hint_video_scart_mode Select analog output mode for SCART connectors
menu.hint_volume Configure Volume GUI options
menu.hint_volume_digits Numeric display of the volumebar on/off
menu.hint_volume_pos Select volume indicator position
menu.hint_zap_cycle When swithing channels, stay in current bouquet
@@ -1186,6 +1187,7 @@ miscsettings.shutdown_count_hint2 to deep standby (0 = off).
miscsettings.shutdown_real Enable standby
miscsettings.shutdown_real_rcdelay Delayed shutdown
miscsettings.sleeptimer Inactivity shutdown timer
miscsettings.volume Volume
miscsettings.zapto_pre_time Zapto Start Time Correction (minutes)
motorcontrol.calc_positions (Re)-Calculate Positions
motorcontrol.disable_limit Disable (soft) Limits

57
src/gui/osd_setup.cpp
View File

@@ -394,6 +394,8 @@ const CMenuOptionChooser::keyval OPTIONS_COLORED_EVENTS_OPTIONS[OPTIONS_COLORED_
//show osd setup
int COsdSetup::showOsdSetup()
{
int shortcut = 1;
//osd main menu
osd_menu = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, width, MN_WIDGET_ID_OSDSETUP);
osd_menu->setWizardMode(is_wizard);
@@ -431,35 +433,42 @@ int COsdSetup::showOsdSetup()
osd_menu->addItem(mf);
//progressbar
mf = new CMenuForwarder(LOCALE_MISCSETTINGS_PROGRESSBAR, true, NULL, new CProgressbarSetup(), NULL, CRCInput::RC_1);
mf = new CMenuForwarder(LOCALE_MISCSETTINGS_PROGRESSBAR, true, NULL, new CProgressbarSetup(), NULL, CRCInput::convertDigitToKey(shortcut++));
mf->setHint("", LOCALE_MENU_HINT_PROGRESSBAR);
osd_menu->addItem(mf);
//infobar
CMenuWidget osd_menu_infobar(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_INFOBAR);
showOsdInfobarSetup(&osd_menu_infobar);
mf = new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR, true, NULL, &osd_menu_infobar, NULL, CRCInput::RC_2);
mf = new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR, true, NULL, &osd_menu_infobar, NULL, CRCInput::convertDigitToKey(shortcut++));
mf->setHint("", LOCALE_MENU_HINT_INFOBAR_SETUP);
osd_menu->addItem(mf);
//channellist
CMenuWidget osd_menu_chanlist(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_CHANNELLIST);
showOsdChanlistSetup(&osd_menu_chanlist);
mf = new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, &osd_menu_chanlist, NULL, CRCInput::RC_3);
mf = new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, &osd_menu_chanlist, NULL, CRCInput::convertDigitToKey(shortcut++));
mf->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SETUP);
osd_menu->addItem(mf);
//eventlist
CMenuWidget osd_menu_eventlist(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_EVENTLIST);
showOsdEventlistSetup(&osd_menu_eventlist);
mf = new CMenuForwarder(LOCALE_EVENTLIST_NAME, true, NULL, &osd_menu_eventlist, NULL, CRCInput::RC_4);
mf = new CMenuForwarder(LOCALE_EVENTLIST_NAME, true, NULL, &osd_menu_eventlist, NULL, CRCInput::convertDigitToKey(shortcut++));
mf->setHint("", LOCALE_MENU_HINT_EVENTLIST_SETUP);
osd_menu->addItem(mf);
//volume
CMenuWidget osd_menu_volume(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_VOLUME);
showOsdVolumeSetup(&osd_menu_volume);
mf = new CMenuForwarder(LOCALE_MISCSETTINGS_VOLUME, true, NULL, &osd_menu_volume, NULL, CRCInput::convertDigitToKey(shortcut++));
mf->setHint("", LOCALE_MENU_HINT_VOLUME);
osd_menu->addItem(mf);
//screenshot
CMenuWidget osd_menu_screenshot(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_SCREENSHOT);
showOsdScreenShotSetup(&osd_menu_screenshot);
mf = new CMenuForwarder(LOCALE_SCREENSHOT_MENU, true, NULL, &osd_menu_screenshot, NULL, CRCInput::RC_5);
mf = new CMenuForwarder(LOCALE_SCREENSHOT_MENU, true, NULL, &osd_menu_screenshot, NULL, CRCInput::convertDigitToKey(shortcut++));
mf->setHint("", LOCALE_MENU_HINT_SCREENSHOT_SETUP);
osd_menu->addItem(mf);
@@ -485,21 +494,6 @@ int COsdSetup::showOsdSetup()
mc->setHint("", LOCALE_MENU_HINT_SUBCHANNEL_POS);
osd_menu->addItem(mc);
// volume position
mc = new CMenuOptionChooser(LOCALE_EXTRA_VOLUME_POS, &g_settings.volume_pos, VOLUMEBAR_DISP_POS_OPTIONS, VOLUMEBAR_DISP_POS_OPTIONS_COUNT, true, this);
mc->setHint("", LOCALE_MENU_HINT_VOLUME_POS);
osd_menu->addItem(mc);
// volume digits
mc = new CMenuOptionChooser(LOCALE_EXTRA_VOLUME_DIGITS, &g_settings.volume_digits, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this);
mc->setHint("", LOCALE_MENU_HINT_VOLUME_DIGITS);
osd_menu->addItem(mc);
// show mute at volume 0
mc = new CMenuOptionChooser(LOCALE_EXTRA_SHOW_MUTE_ICON, &g_settings.show_mute_icon, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
mc->setHint("", LOCALE_MENU_HINT_SHOW_MUTE_ICON);
osd_menu->addItem(mc);
// menu position
mc = new CMenuOptionChooser(LOCALE_SETTINGS_MENU_POS, &g_settings.menu_pos, MENU_DISP_POS_OPTIONS, MENU_DISP_POS_OPTIONS_COUNT, true, this);
mc->setHint("", LOCALE_MENU_HINT_MENU_POS);
@@ -856,6 +850,29 @@ void COsdSetup::showOsdEventlistSetup(CMenuWidget *menu_eventlist)
menu_eventlist->addItem(mc);
}
// volume
void COsdSetup::showOsdVolumeSetup(CMenuWidget *menu_volume)
{
CMenuOptionChooser * mc;
menu_volume->addIntroItems(LOCALE_MISCSETTINGS_VOLUME);
// volume position
mc = new CMenuOptionChooser(LOCALE_EXTRA_VOLUME_POS, &g_settings.volume_pos, VOLUMEBAR_DISP_POS_OPTIONS, VOLUMEBAR_DISP_POS_OPTIONS_COUNT, true, this);
mc->setHint("", LOCALE_MENU_HINT_VOLUME_POS);
menu_volume->addItem(mc);
// volume digits
mc = new CMenuOptionChooser(LOCALE_EXTRA_VOLUME_DIGITS, &g_settings.volume_digits, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this);
mc->setHint("", LOCALE_MENU_HINT_VOLUME_DIGITS);
menu_volume->addItem(mc);
// show mute at volume 0
mc = new CMenuOptionChooser(LOCALE_EXTRA_SHOW_MUTE_ICON, &g_settings.show_mute_icon, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
mc->setHint("", LOCALE_MENU_HINT_SHOW_MUTE_ICON);
menu_volume->addItem(mc);
}
bool COsdSetup::changeNotify(const neutrino_locale_t OptionName, void * data)
{
if(ARE_LOCALES_EQUAL(OptionName, LOCALE_COLORMENU_CONTRAST_FONTS))

1
src/gui/osd_setup.h
View File

@@ -58,6 +58,7 @@ class COsdSetup : public CMenuTarget, public CChangeObserver
void showOsdInfobarSetup(CMenuWidget *menu_infobar);
void showOsdChanlistSetup(CMenuWidget *menu_chanlist);
void showOsdEventlistSetup(CMenuWidget *menu_eventlist);
void showOsdVolumeSetup(CMenuWidget *menu_volume);
void showOsdScreenShotSetup(CMenuWidget *menu_screenshot);
void AddFontSettingItem(CMenuWidget &font_Settings, const SNeutrinoSettings::FONT_TYPES number_of_fontsize_entry);

1
src/neutrino_menue.h
View File

@@ -62,6 +62,7 @@ enum MN_WIDGET_ID
MN_WIDGET_ID_OSDSETUP_MENUCOLORS,
MN_WIDGET_ID_OSDSETUP_TIMEOUT,
MN_WIDGET_ID_OSDSETUP_SCREENSHOT,
MN_WIDGET_ID_OSDSETUP_VOLUME,
//actually it does not matter, but these 6 entries must be the same order as in menu
MN_WIDGET_ID_OSDSETUP_FONTSIZE_MENU,
MN_WIDGET_ID_OSDSETUP_FONTSIZE_CHANNELLIST,

2
src/system/locals.h
View File

@@ -1136,6 +1136,7 @@ typedef enum
LOCALE_MENU_HINT_VIDEO_PIP,
LOCALE_MENU_HINT_VIDEO_SATURATION,
LOCALE_MENU_HINT_VIDEO_SCART_MODE,
LOCALE_MENU_HINT_VOLUME,
LOCALE_MENU_HINT_VOLUME_DIGITS,
LOCALE_MENU_HINT_VOLUME_POS,
LOCALE_MENU_HINT_ZAP_CYCLE,
@@ -1213,6 +1214,7 @@ typedef enum
LOCALE_MISCSETTINGS_SHUTDOWN_REAL,
LOCALE_MISCSETTINGS_SHUTDOWN_REAL_RCDELAY,
LOCALE_MISCSETTINGS_SLEEPTIMER,
LOCALE_MISCSETTINGS_VOLUME,
LOCALE_MISCSETTINGS_ZAPTO_PRE_TIME,
LOCALE_MOTORCONTROL_CALC_POSITIONS,
LOCALE_MOTORCONTROL_DISABLE_LIMIT,

2
src/system/locals_intern.h
View File

@@ -1136,6 +1136,7 @@ const char * locale_real_names[] =
"menu.hint_video_pip",
"menu.hint_video_saturation",
"menu.hint_video_scart_mode",
"menu.hint_volume",
"menu.hint_volume_digits",
"menu.hint_volume_pos",
"menu.hint_zap_cycle",
@@ -1213,6 +1214,7 @@ const char * locale_real_names[] =
"miscsettings.shutdown_real",
"miscsettings.shutdown_real_rcdelay",
"miscsettings.sleeptimer",
"miscsettings.volume",
"miscsettings.zapto_pre_time",
"motorcontrol.calc_positions",
"motorcontrol.disable_limit",