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

fix SeparatorLine

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 74d05eb940
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2022-09-14 (Wed, 14 Sep 2022)


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

------------------
This commit was generated by Migit
This commit is contained in:
BPanther
2022-09-14 20:47:52 +02:00
committed by vanhofen
parent cbe583d07f
commit 02d24efbb5
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

@@ -607,7 +607,7 @@ int CScanSetup::showScanMenu()
settings->setWizardMode(is_wizard); settings->setWizardMode(is_wizard);
//back //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 #if 0
//save scan settings //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*/ /*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; brief_hints = brief_hint;
@@ -1598,17 +1598,19 @@ void CMenuWidget::addIntroItems(const std::string& s_subhead_text, neutrino_loca
addItem(GenericMenuNext); addItem(GenericMenuNext);
break; break;
} }
if (section_text != NONEXISTANT_LOCALE) if (SeparatorLine) {
addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, section_text)); if (section_text != NONEXISTANT_LOCALE)
else if (buttontype != BTN_TYPE_NO) addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, section_text));
addItem(GenericMenuSeparatorLine); 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); 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() 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_NO = 0,
BRIEF_HINT_YES = 1 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(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); 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(); bool hasItem();
void resetWidget(bool delete_items = false); void resetWidget(bool delete_items = false);
void insertItem(const uint& item_id, CMenuItem* menuItem); void insertItem(const uint& item_id, CMenuItem* menuItem);