diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index ace22e166..4410bd15e 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -600,7 +600,7 @@ int CScanSetup::showScanMenu() settings->setWizardMode(is_wizard); //back - settings->addIntroItems(/*is_wizard ? NONEXISTANT_LOCALE : */ LOCALE_SERVICEMENU_SCANTS); + settings->addIntroItems(/*is_wizard ? NONEXISTANT_LOCALE : */ LOCALE_SERVICEMENU_SCANTS, NONEXISTANT_LOCALE, 0, 0, false); #if 0 //save scan settings diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index e04b0378d..79f42610b 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -1578,7 +1578,7 @@ void CMenuWidget::paintItems() } /*adds the typical menu intro with optional subhead, separator, back or cancel button and separatorline to menu*/ -void CMenuWidget::addIntroItems(const std::string& s_subhead_text, neutrino_locale_t section_text, int buttontype, bool brief_hint) +void CMenuWidget::addIntroItems(const std::string &s_subhead_text, neutrino_locale_t section_text, int buttontype, bool brief_hint, bool SeparatorLine) { brief_hints = brief_hint; @@ -1598,17 +1598,19 @@ void CMenuWidget::addIntroItems(const std::string& s_subhead_text, neutrino_loca addItem(GenericMenuNext); break; } - - if (section_text != NONEXISTANT_LOCALE) - addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, section_text)); - else if (buttontype != BTN_TYPE_NO) - addItem(GenericMenuSeparatorLine); + + if (SeparatorLine) { + if (section_text != NONEXISTANT_LOCALE) + addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, section_text)); + else if (buttontype != BTN_TYPE_NO) + addItem(GenericMenuSeparatorLine); + } } -void CMenuWidget::addIntroItems(neutrino_locale_t l_subhead_text, neutrino_locale_t section_text, int buttontype, bool brief_hint) +void CMenuWidget::addIntroItems(neutrino_locale_t l_subhead_text, neutrino_locale_t section_text, int buttontype, bool brief_hint, bool SeparatorLine) { std::string str = l_subhead_text == NONEXISTANT_LOCALE ? "" : g_Locale->getText(l_subhead_text); - addIntroItems(str, section_text, buttontype, brief_hint); + addIntroItems(str, section_text, buttontype, brief_hint, SeparatorLine); } void CMenuWidget::saveScreen() diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index 9ffd11de1..602521f09 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -632,8 +632,8 @@ class CMenuWidget : public CMenuTarget, public CComponentsSignals BRIEF_HINT_NO = 0, BRIEF_HINT_YES = 1 }; - void addIntroItems(neutrino_locale_t l_subhead_text = NONEXISTANT_LOCALE, neutrino_locale_t section_text = NONEXISTANT_LOCALE, int buttontype = BTN_TYPE_BACK, bool brief_hint = BRIEF_HINT_NO); - void addIntroItems(const std::string& s_subhead_text, neutrino_locale_t section_text = NONEXISTANT_LOCALE, int buttontype = BTN_TYPE_BACK, bool brief_hint = BRIEF_HINT_NO); + void addIntroItems(neutrino_locale_t l_subhead_text = NONEXISTANT_LOCALE, neutrino_locale_t section_text = NONEXISTANT_LOCALE, int buttontype = BTN_TYPE_BACK, bool brief_hint = BRIEF_HINT_NO, bool SeparatorLine = true); + void addIntroItems(const std::string &s_subhead_text, neutrino_locale_t section_text = NONEXISTANT_LOCALE, int buttontype = BTN_TYPE_BACK, bool brief_hint = BRIEF_HINT_NO, bool SeparatorLine = true); bool hasItem(); void resetWidget(bool delete_items = false); void insertItem(const uint& item_id, CMenuItem* menuItem);