Skip to content

Commit

Permalink
dm8000: more lcd infos
Browse files Browse the repository at this point in the history
  • Loading branch information
@BPanther
BPanther committed Jun 22, 2024
1 parent c50e88a commit 452b8c5
Show file tree
Hide file tree
Showing 16 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion src/gui/bookmarkmanager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ void CBookmarkManager::paintItem(int pos)
// LCD Display
if (i_selected)
{
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, theBookmark.getName());
#else
CVFD::getInstance()->showMenuText(0, theBookmark.getName(), -1, true); // UTF-8
Expand Down
2 changes: 1 addition & 1 deletion src/gui/bouquetlist.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ void CBouquetList::paintItem(int pos)
if (i_selected)
{
if (npos < (int) Bouquets.size())
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, lname);
#else
CVFD::getInstance()->showMenuText(0, lname, -1, true);
Expand Down
4 changes: 2 additions & 2 deletions src/gui/channellist.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2280,13 +2280,13 @@ void CChannelList::updateVfd()
char nameAndDescription[255];
snprintf(nameAndDescription, sizeof(nameAndDescription), "%s - %s",
chan->getName().c_str(), p_event->description.c_str());
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, nameAndDescription);
#else
CVFD::getInstance()->showMenuText(0, nameAndDescription, -1, true); // UTF-8
#endif
} else
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, chan->getName().c_str());
#else
CVFD::getInstance()->showMenuText(0, chan->getName().c_str(), -1, true); // UTF-8
Expand Down
2 changes: 1 addition & 1 deletion src/gui/filebrowser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1213,7 +1213,7 @@ void CFileBrowser::paintItem(unsigned int pos)
actual_file->Name = fname_temp;

if (currpos == selected)
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, FILESYSTEM_ENCODING_TO_UTF8_STRING(actual_file->getFileName()).c_str());
#else
CVFD::getInstance()->showMenuText(0, FILESYSTEM_ENCODING_TO_UTF8_STRING(actual_file->getFileName()).c_str(), -1, true); // UTF-8
Expand Down
4 changes: 2 additions & 2 deletions src/gui/moviebrowser/mb.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1519,7 +1519,7 @@ void CMovieBrowser::refreshLCD(void)
if (m_vMovieInfo.empty() || m_movieSelectionHandler == NULL)
return;

#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, m_movieSelectionHandler->epgTitle.c_str());
#else
CVFD::getInstance()->showMenuText(0, m_movieSelectionHandler->epgTitle.c_str(), -1, true); // UTF-8
Expand Down Expand Up @@ -3928,7 +3928,7 @@ int CMenuSelector::paint(bool selected)
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(stringstartposName, y + height, dx - (stringstartposName - x), optionName, color);

if (selected)
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, optionName);
#else
CVFD::getInstance()->showMenuText(0, optionName, -1, true); // UTF-8
Expand Down
4 changes: 2 additions & 2 deletions src/gui/movieplayer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ void CMoviePlayerGui::updateLcd(bool display_playtime)
}

// CVFD::getInstance()->setMode(LCD_MODE);
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, lcd.c_str());
#else
CVFD::getInstance()->showMenuText(0, lcd.c_str(), -1, true);
Expand Down Expand Up @@ -564,7 +564,7 @@ void CMoviePlayerGui::updateLcd(bool display_playtime)
break;
}
lcd += name;
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, lcd.c_str());
#else
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8);
Expand Down
4 changes: 2 additions & 2 deletions src/gui/pictureviewer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ void CPictureViewerGui::view(unsigned int index, bool unscaled)
m_unscaled = unscaled;
selected=index;

#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, playlist[index].Name.c_str());
#else
CVFD::getInstance()->showMenuText(0, playlist[index].Name.c_str());
Expand Down Expand Up @@ -847,7 +847,7 @@ void CPictureViewerGui::endView()

void CPictureViewerGui::deletePicFile(unsigned int index, bool mode)
{
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, playlist[index].Name.c_str());
#else
CVFD::getInstance()->showMenuText(0, playlist[index].Name.c_str());
Expand Down
4 changes: 2 additions & 2 deletions src/gui/scan.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ neutrino_msg_t CScanTs::handleMsg(neutrino_msg_t msg, neutrino_msg_data_t data)
paintLine(xpos2, ypos_transponder, w - (8*fw), buffer);
total = data;
snprintf(str, sizeof(buffer), "scan: %d/%d", done, total);
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, str);
#else
CVFD::getInstance()->showMenuText(0, str, -1, true);
Expand All @@ -423,7 +423,7 @@ neutrino_msg_t CScanTs::handleMsg(neutrino_msg_t msg, neutrino_msg_data_t data)
sprintf(buffer, "%d/%d", done, total);
paintLine(xpos2, ypos_transponder, w - (8*fw), buffer);
snprintf(str, sizeof(buffer), "scan %d/%d", done, total);
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, str);
#else
CVFD::getInstance()->showMenuText(0, str, -1, true);
Expand Down
2 changes: 1 addition & 1 deletion src/gui/timerlist.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1392,7 +1392,7 @@ void CTimerList::paintItem(int pos)
default:
;
}
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, line1.c_str());
#else
CVFD::getInstance()->showMenuText(0, line1.c_str(), -1, true);
Expand Down
4 changes: 2 additions & 2 deletions src/gui/upnpbrowser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -953,7 +953,7 @@ bool CUpnpBrowserGui::selectItem(std::string id)

void CUpnpBrowserGui::paintDeviceInfo()
{
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, m_devices[m_selecteddevice].friendlyname.c_str());
#else
CVFD::getInstance()->showMenuText(0, m_devices[m_selecteddevice].friendlyname.c_str(), -1, true);
Expand Down Expand Up @@ -1127,7 +1127,7 @@ void CUpnpBrowserGui::paintItemInfo(UPnPEntry *entry)
int preferred=entry->preferred;

// LCD
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, entry->title.c_str());
#else
CVFD::getInstance()->showMenuText(0, entry->title.c_str(), -1, true);
Expand Down
2 changes: 1 addition & 1 deletion src/gui/vfd_setup.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ int CVfdSetup::showSetup()
vfds->addItem(oj);
}

#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
g_settings.lcd_info_line = 0;
g_settings.lcd_scroll = 0;
#else
Expand Down
2 changes: 1 addition & 1 deletion src/gui/widget/keyboard_input.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ int CKeyboardInput::exec(CMenuTarget *parent, const std::string &)
if (changed)
{
changed = false;
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, inputString->c_str());
#else
CVFD::getInstance()->showMenuText(1, inputString->c_str(), selected + 1);
Expand Down
4 changes: 2 additions & 2 deletions src/gui/widget/menue.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ void CMenuItem::paintItemCaption(const bool select_mode, const char *right_text,
ssize_t len = strlen(left_text) + strlen(right_text) + 2;
char str[len];
snprintf(str, len, "%s %s", left_text, right_text);
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, str);
#else
CVFD::getInstance()->showMenuText(0, str, -1, true);
Expand All @@ -235,7 +235,7 @@ void CMenuItem::paintItemCaption(const bool select_mode, const char *right_text,
}
else
{
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, left_text);
#else
CVFD::getInstance()->showMenuText(0, left_text, -1, true);
Expand Down
2 changes: 1 addition & 1 deletion src/gui/widget/stringinput.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ int CStringInput::exec(CMenuTarget *parent, const std::string &)
frameBuffer->blit();
if (*valueString != dispval)
{
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, valueString->c_str());
#else
CVFD::getInstance()->showMenuText(1, valueString->c_str(), selected + 1);
Expand Down
6 changes: 3 additions & 3 deletions src/gui/widget/stringinput_ext.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ int CExtendedInput::exec(CMenuTarget *parent, const std::string &)
{
if (*valueString != dispval)
{
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, valueString->c_str());
#else
CVFD::getInstance()->showMenuText(1, valueString->c_str(), selectedChar + 1);
Expand Down Expand Up @@ -238,7 +238,7 @@ int CExtendedInput::exec(CMenuTarget *parent, const std::string &)
{
inputFields[oldSelectedChar]->paint(x + offset, y + hheight + offset, false);
inputFields[selectedChar]->paint(x + offset, y + hheight + offset, true);
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, valueString->c_str());
#else
CVFD::getInstance()->showMenuText(1, valueString->c_str(), selectedChar + 1);
Expand Down Expand Up @@ -278,7 +278,7 @@ int CExtendedInput::exec(CMenuTarget *parent, const std::string &)
{
inputFields[oldSelectedChar]->paint(x + offset, y + hheight + offset, false);
inputFields[selectedChar]->paint(x + offset, y + hheight + offset, true);
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, valueString->c_str());
#else
CVFD::getInstance()->showMenuText(1, valueString->c_str(), selectedChar + 1);
Expand Down
10 changes: 5 additions & 5 deletions src/neutrino.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4350,7 +4350,7 @@ void CNeutrinoApp::saveEpg(int _mode)
}
CVFD::getInstance()->Clear();
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, g_Locale->getText(LOCALE_EPG_SAVING));
#else
CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_EPG_SAVING));
Expand Down Expand Up @@ -4498,7 +4498,7 @@ void CNeutrinoApp::standbyMode(bool bOnOff, bool fromDeepStandby)
#ifdef ENABLE_GRAPHLCD
nGLCD::StandbyMode(true);
#endif
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, "standby...");
#else
CVFD::getInstance()->ShowText("standby...");
Expand Down Expand Up @@ -4580,7 +4580,7 @@ void CNeutrinoApp::standbyMode(bool bOnOff, bool fromDeepStandby)
// Active standby off
powerManager->SetStandby(false, false);
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, "resume");
#else
CVFD::getInstance()->ShowText("resume");
Expand Down Expand Up @@ -5052,7 +5052,7 @@ void stop_daemons(bool stopall, bool for_flash)
if (for_flash) {
CVFD::getInstance()->Clear();
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, "Stop daemons...");
#else
CVFD::getInstance()->ShowText("Stop daemons...");
Expand Down Expand Up @@ -5636,7 +5636,7 @@ void CNeutrinoApp::CheckFastScan(bool standby, bool reload)
}
if (standby || (new_fst != scansettings.fst_version)) {
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
#if BOXMODEL_DM820 || BOXMODEL_DM7080
#if BOXMODEL_DM820 || BOXMODEL_DM7080 || BOXMODEL_DM8000
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, g_Locale->getText(LOCALE_SATSETUP_FASTSCAN_HEAD));
#else
CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_SATSETUP_FASTSCAN_HEAD));
Expand Down

0 comments on commit 452b8c5

Please sign in to comment.