osd_setup: Make detail line and menu hints configurable.

This commit is contained in:
2022-01-06 16:20:07 +01:00
parent b340d3f019
commit 801b8600ed
8 changed files with 30 additions and 5 deletions

View File

@@ -1475,6 +1475,7 @@ menu.hint_mbkey_cover Weisen Sie eine Taste zu, um Filmcover während der Wieder
menu.hint_media Abspielen von Musik, Internetradio und Filmen; Betrachten Sie Bilder
menu.hint_menu_fonts Ändern Sie die Schriftgrößen im Menü
menu.hint_menu_hints Zeigt Ihnen Hinweise zu den Menüpunkten an. Sie erreichen das auch jederzeit mit der Taste 'Hilfe'
menu.hint_menu_hints_line Aktiviert/deaktiviert die Visualisierung von Hinweisen zu relevanten Menüeinträgen mittels einer Line (abhängig vom Theme).
menu.hint_menu_pos Legen Sie die Anzeigeposition der Menüs fest
menu.hint_menus Wählen Sie die Anzeigeoptionen für die Menüs
menu.hint_message_fonts Anpassen der Schrift in Meldungsfenstern
@@ -2618,6 +2619,7 @@ settings.backup_dir Nach %s sichern?\n"Nein" wählt ein anderes Verzeichnis
settings.backup_failed Sicherung fehlgeschlagen!
settings.help Hilfe
settings.menu_hints Hinweise anzeigen
settings.menu_hints_line Linie zu den Menü-Hinweisen zeichnen
settings.menu_pos Position
settings.menus Menüs
settings.missingoptionsconffile Die Einstellungen wurden erweitert.\nDie neuen Werte werden auf Standard gesetzt.

View File

@@ -1475,6 +1475,7 @@ menu.hint_mbkey_cover Assign button to create movie cover while playback or dele
menu.hint_media Play movies, audio files\nWatch pictures
menu.hint_menu_fonts Change menu font sizes
menu.hint_menu_hints Show this hints. Also you can switch\nit any time using 'help' button
menu.hint_menu_hints_line Activates/deactivates the visualization of hints on relevant menu items using a line (depending on the theme).
menu.hint_menu_pos Select menu position
menu.hint_menus Configure menu options
menu.hint_message_fonts Change message text font sizes
@@ -2618,6 +2619,7 @@ settings.backup_dir Save to %s?\n"No" chooses another directory.
settings.backup_failed Backup failed!
settings.help Help
settings.menu_hints Show menu hints
settings.menu_hints_line Paint a line to the menu hints
settings.menu_pos Menu position
settings.menus Menus
settings.missingoptionsconffile The settings have been updated.\nNew Options will be set to default.

View File

@@ -91,7 +91,7 @@ CComponentsDetailsLine::~CComponentsDetailsLine()
void CComponentsDetailsLine::paint(const bool &do_save_bg)
{
hide();
cc_allow_paint = g_settings.theme.show_menu_hints_line;
col_body = col_body_std;
if (hasChanges())

View File

@@ -101,7 +101,6 @@ COsdSetup::COsdSetup(int wizard_mode)
is_wizard = wizard_mode;
width = 50;
show_menu_hints = 0;
show_tuner_icon = 0;
}
@@ -1214,10 +1213,14 @@ void COsdSetup::showOsdMenusSetup(CMenuWidget *menu_menus)
submenu_menus->addItem(mc);
// menu hints
show_menu_hints = g_settings.show_menu_hints;
mc = new CMenuOptionChooser(LOCALE_SETTINGS_MENU_HINTS, &show_menu_hints, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this);
mc = new CMenuOptionChooser(LOCALE_SETTINGS_MENU_HINTS, &g_settings.show_menu_hints, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this);
mc->setHint("", LOCALE_MENU_HINT_MENU_HINTS);
submenu_menus->addItem(mc);
// menu hints line (details_line)
mc = new CMenuOptionChooser(LOCALE_SETTINGS_MENU_HINTS_LINE, &g_settings.theme.show_menu_hints_line, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this);
mc->setHint("", LOCALE_MENU_HINT_MENU_HINTS_LINE);
submenu_menus->addItem(mc);
}
#define HDD_STATFS_OPTION_COUNT 3
@@ -1606,6 +1609,13 @@ bool COsdSetup::changeNotify(const neutrino_locale_t OptionName, void * data)
CVolumeHelper::getInstance()->refresh();
return false;
}
// menu_hints_line
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_SETTINGS_MENU_HINTS_LINE))
{
submenu_menus->hide();
g_settings.theme.show_menu_hints_line = * (int*) data;
return true;
}
#ifdef ENABLE_LCD4LINUX
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CHANNELLIST_SHOW_EVENTLOGO))
{

View File

@@ -396,6 +396,9 @@ void CThemes::setTheme(CConfigFile &configfile)
// message frames
configfile.setInt32( "message_frame_enable", t.message_frame_enable);
// details line in menu and lists
configfile.setInt32("show_menu_hints_line", t.show_menu_hints_line);
}
void CThemes::getTheme(CConfigFile &configfile)
@@ -519,6 +522,9 @@ void CThemes::getTheme(CConfigFile &configfile)
// message frames
t.message_frame_enable = configfile.getInt32( "message_frame_enable", 0);
// details line in menu and lists
t.show_menu_hints_line = configfile.getInt32("show_menu_hints_line", true);
if (g_settings.theme_name.empty())
applyDefaultTheme();
}

View File

@@ -1502,6 +1502,7 @@ typedef enum
LOCALE_MENU_HINT_MEDIA,
LOCALE_MENU_HINT_MENU_FONTS,
LOCALE_MENU_HINT_MENU_HINTS,
LOCALE_MENU_HINT_MENU_HINTS_LINE,
LOCALE_MENU_HINT_MENU_POS,
LOCALE_MENU_HINT_MENUS,
LOCALE_MENU_HINT_MESSAGE_FONTS,
@@ -2645,6 +2646,7 @@ typedef enum
LOCALE_SETTINGS_BACKUP_FAILED,
LOCALE_SETTINGS_HELP,
LOCALE_SETTINGS_MENU_HINTS,
LOCALE_SETTINGS_MENU_HINTS_LINE,
LOCALE_SETTINGS_MENU_POS,
LOCALE_SETTINGS_MENUS,
LOCALE_SETTINGS_MISSINGOPTIONSCONFFILE,

View File

@@ -1502,6 +1502,7 @@ const char * locale_real_names[] =
"menu.hint_media",
"menu.hint_menu_fonts",
"menu.hint_menu_hints",
"menu.hint_menu_hints_line",
"menu.hint_menu_pos",
"menu.hint_menus",
"menu.hint_message_fonts",
@@ -2645,6 +2646,7 @@ const char * locale_real_names[] =
"settings.backup_failed",
"settings.help",
"settings.menu_hints",
"settings.menu_hints_line",
"settings.menu_pos",
"settings.menus",
"settings.missingoptionsconffile",

View File

@@ -170,6 +170,7 @@ struct SNeutrinoTheme
int rounded_corners;
int message_frame_enable;
int show_menu_hints_line;
};
struct timer_remotebox_item
@@ -1005,7 +1006,7 @@ struct SNeutrinoSettings
// menu
int menu_pos;
int show_menu_hints;
int show_menu_hints_line;
// int show_menu_hints_line;
// epgview
int bigFonts;