mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 15:02:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix SeparatorLine

Browse Source
This commit is contained in:
BPanther
2022-09-14 20:47:52 +02:00
committed by Thilo Graf
parent afe23e002b
commit b139d94a0b
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/scan_setup.cpp
View File

@@ -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

18
src/gui/widget/menue.cpp
View File

@@ -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()

4
src/gui/widget/menue.h
View File

@@ -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);