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

epgview: add movie database selection

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b0cbabeca
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-09-24 (Fri, 24 Sep 2021)

Origin message was:
------------------
- epgview: add movie database selection

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2021-09-24 22:52:05 +02:00
parent ed081adc60
commit 11774308c0
5 changed files with 105 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/deutsch.locale
View File

@@ -1293,6 +1293,8 @@ mbkey.copy_several Film kopieren und teilen
mbkey.cover Filmcover erzeugen/löschen mbkey.cover Filmcover erzeugen/löschen
mbkey.cut Film schneiden mbkey.cut Film schneiden
mbkey.truncate Film kürzen mbkey.truncate Film kürzen
mdb.head Movie Database
mdb.choose Movie Database wählen
mdb.save_poster Bild speichern mdb.save_poster Bild speichern
mdb.save_poster_hint Bild speichern mit "%s" mdb.save_poster_hint Bild speichern mit "%s"
menu.back Zurück menu.back Zurück

6
data/locale/english.locale
View File

@@ -1087,7 +1087,7 @@ imdb.data_title Original title
imdb.data_votes Votes imdb.data_votes Votes
imdb.data_website Website imdb.data_website Website
imdb.data_writer Screenplay author imdb.data_writer Screenplay author
imdb.info IMDb-Info imdb.head IMDb
imdb.read_data Search IMDb data ... imdb.read_data Search IMDb data ...
inetradio.name Internetradio inetradio.name Internetradio
inetradio_autostart Internetradio auto-start inetradio_autostart Internetradio auto-start
@@ -1293,6 +1293,8 @@ mbkey.copy_several Copy and split movie
mbkey.cover Create/remove movie cover mbkey.cover Create/remove movie cover
mbkey.cut Cut movie mbkey.cut Cut movie
mbkey.truncate Truncate movie mbkey.truncate Truncate movie
mdb.head Movie database
mdb.choose Choose movie database
mdb.save_poster Save poster mdb.save_poster Save poster
mdb.save_poster_hint Save poster with "%s" mdb.save_poster_hint Save poster with "%s"
menu.back Back menu.back Back
@@ -2913,7 +2915,7 @@ timing.static_messages Interactive messages
timing.volumebar Volume bar timing.volumebar Volume bar
tmdb.api_key TMDb API key tmdb.api_key TMDb API key
tmdb.enabled TMDb support tmdb.enabled TMDb support
tmdb.info TMDb-Info tmdb.head TMDb
tmdb.read_data Search TMDb data ... tmdb.read_data Search TMDb data ...
tunersetup.cable Cable (DVB-C) tunersetup.cable Cable (DVB-C)
tunersetup.hybrid Hybrid (DVB-C/T/T2) tunersetup.hybrid Hybrid (DVB-C/T/T2)

156
src/gui/epgview.cpp
View File

@@ -1184,18 +1184,51 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
printf("timerd not available\n"); printf("timerd not available\n");
} }
break; break;
// imdb/omdb info // imdb/omdb info and tmdb info
case CRCInput::RC_green: case CRCInput::RC_green:
{ {
if (tmdb_active) bool omdb_start = false;
bool tmdb_start = false;
if (g_settings.omdb_enabled && g_settings.tmdb_enabled)
{ {
tmdb_active = false; CMsgBox msgBox(g_Locale->getText(LOCALE_MDB_CHOOSE), LOCALE_MDB_HEAD);
tmdb_stars = 0; msgBox.setShowedButtons(CMsgBox::mbNo | CMsgBox::mbYes);
epgText = epgText_saved; msgBox.setButtonText(CMsgBox::mbNo, g_Locale->getText(LOCALE_IMDB_HEAD));
textCount = epgText.size(); msgBox.setButtonText(CMsgBox::mbYes, g_Locale->getText(LOCALE_TMDB_HEAD));
msgBox.paint();
msgBox.exec();
msgBox.hide();
switch (msgBox.getResult())
{
case CMsgBox::mbrNo: // imdb
omdb_start = true;
break;
case CMsgBox::mbrYes: // tmdb
tmdb_start = true;
break;
default:
break;
}
} }
if (g_settings.omdb_enabled) else if (g_settings.omdb_enabled)
omdb_start = true;
else if (g_settings.tmdb_enabled)
tmdb_start = true;
else
break;
if (omdb_start)
{ {
if (tmdb_active)
{
tmdb_active = false;
tmdb_stars = 0;
epgText = epgText_saved;
textCount = epgText.size();
}
showPos = 0; showPos = 0;
if (!imdb_active) if (!imdb_active)
{ {
@@ -1225,21 +1258,17 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
showText(showPos, sy + toph); showText(showPos, sy + toph);
} }
} }
break; else if (tmdb_start)
}
// tmdb info
case CRCInput::RC_yellow:
{
if (imdb_active)
{
imdb_active = false;
imdb_stars = 0;
showTimerEventBar(true, !mp_info && isCurrentEPG(channel_id), mp_info); //show buttons
epgText = epgText_saved;
textCount = epgText.size();
}
if (g_settings.tmdb_enabled)
{ {
if (imdb_active)
{
imdb_active = false;
imdb_stars = 0;
showTimerEventBar(true, !mp_info && isCurrentEPG(channel_id), mp_info); //show buttons
epgText = epgText_saved;
textCount = epgText.size();
}
showPos = 0; showPos = 0;
if (!tmdb_active) if (!tmdb_active)
{ {
@@ -1270,33 +1299,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
} }
break; break;
} }
case CRCInput::RC_blue: case CRCInput::RC_yellow:
{
ResetMDb();
if(!followlist.empty() && !call_fromfollowlist){
hide();
time_t tmp_sZeit = epgData.epg_times.startzeit;
uint64_t tmp_eID = epgData.eventID;
CEventList *ee = new CEventList;
res = ee->exec(channel_id, g_Locale->getText(LOCALE_EPGVIEWER_MORE_SCREENINGS_SHORT),"","",followlist); // UTF-8
delete ee;
if (res == menu_return::RETURN_EXIT_ALL)
loop = false;
else {
if (!bigFonts && g_settings.bigFonts) {
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->getSize() * BIGFONT_FACTOR));
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getSize() * BIGFONT_FACTOR));
}
bigFonts = g_settings.bigFonts;
show(channel_id,tmp_eID,&tmp_sZeit,false);
showPos=0;
}
}
break;
}
case CRCInput::RC_0:
{ {
if (!mp_info) if (!mp_info)
{ {
@@ -1331,6 +1334,37 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
} }
break; break;
} }
case CRCInput::RC_blue:
{
ResetMDb();
if (!followlist.empty() && !call_fromfollowlist)
{
hide();
time_t tmp_sZeit = epgData.epg_times.startzeit;
uint64_t tmp_eID = epgData.eventID;
CEventList *ee = new CEventList;
res = ee->exec(channel_id, g_Locale->getText(LOCALE_EPGVIEWER_MORE_SCREENINGS_SHORT),"","",followlist); // UTF-8
delete ee;
if (res == menu_return::RETURN_EXIT_ALL)
loop = false;
else
{
if (!bigFonts && g_settings.bigFonts)
{
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->getSize() * BIGFONT_FACTOR));
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getSize() * BIGFONT_FACTOR));
}
bigFonts = g_settings.bigFonts;
show(channel_id, tmp_eID, &tmp_sZeit, false);
showPos=0;
}
}
break;
}
case CRCInput::RC_help: case CRCInput::RC_help:
ResetMDb(); ResetMDb();
@@ -1622,16 +1656,14 @@ struct button_label EpgButtons[][5] =
{ {
// TV_BUTTONS // TV_BUTTONS
{ NEUTRINO_ICON_BUTTON_RED, LOCALE_TIMERBAR_RECORDEVENT }, { NEUTRINO_ICON_BUTTON_RED, LOCALE_TIMERBAR_RECORDEVENT },
{ NEUTRINO_ICON_BUTTON_GREEN, LOCALE_IMDB_INFO }, { NEUTRINO_ICON_BUTTON_GREEN, LOCALE_MDB_HEAD },
{ NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_TMDB_INFO }, { NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_TIMERBAR_CHANNELSWITCH },
{ NEUTRINO_ICON_BUTTON_BLUE, LOCALE_EPGVIEWER_MORE_SCREENINGS_SHORT }, { NEUTRINO_ICON_BUTTON_BLUE, LOCALE_EPGVIEWER_MORE_SCREENINGS_SHORT }
{ NEUTRINO_ICON_BUTTON_0, LOCALE_TIMERBAR_CHANNELSWITCH }
}, },
{ {
// MP_BUTTONS // MP_BUTTONS
{ NEUTRINO_ICON_BUTTON_RED, LOCALE_EPG_SAVING }, { NEUTRINO_ICON_BUTTON_RED, LOCALE_EPG_SAVING },
{ NEUTRINO_ICON_BUTTON_GREEN, LOCALE_IMDB_INFO }, { NEUTRINO_ICON_BUTTON_GREEN, LOCALE_MDB_HEAD }
{ NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_TMDB_INFO }
} }
}; };
@@ -1652,7 +1684,7 @@ void CEpgData::showTimerEventBar (bool pshow, bool adzap, bool mp_info)
} }
int UsedButtons = mp_info ? MP_BUTTONS : TV_BUTTONS; int UsedButtons = mp_info ? MP_BUTTONS : TV_BUTTONS;
int MaxButtons = mp_info ? 3 : 5; //TODO: auto-calc from struct int MaxButtons = mp_info ? 2 : 4; //TODO: auto-calc from struct
std::string adzap_button; std::string adzap_button;
if (adzap) if (adzap)
@@ -1662,18 +1694,12 @@ void CEpgData::showTimerEventBar (bool pshow, bool adzap, bool mp_info)
adzap_button += g_Locale->getText(LOCALE_UNIT_SHORT_MINUTE); adzap_button += g_Locale->getText(LOCALE_UNIT_SHORT_MINUTE);
} }
// check imdb button // check mdb button
if (g_settings.omdb_enabled) if (g_settings.omdb_enabled || g_settings.tmdb_enabled)
EpgButtons[UsedButtons][1].button = NEUTRINO_ICON_BUTTON_GREEN; EpgButtons[UsedButtons][1].button = NEUTRINO_ICON_BUTTON_GREEN;
else else
EpgButtons[UsedButtons][1].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL; EpgButtons[UsedButtons][1].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL;
// check tmdb button
if (g_settings.tmdb_enabled)
EpgButtons[UsedButtons][2].button = NEUTRINO_ICON_BUTTON_YELLOW;
else
EpgButtons[UsedButtons][2].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL;
if (mp_info) if (mp_info)
::paintButtons(x, y, w, MaxButtons, EpgButtons[MP_BUTTONS], w, h); ::paintButtons(x, y, w, MaxButtons, EpgButtons[MP_BUTTONS], w, h);
else else
@@ -1685,9 +1711,9 @@ void CEpgData::showTimerEventBar (bool pshow, bool adzap, bool mp_info)
EpgButtons[TV_BUTTONS][3].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL; EpgButtons[TV_BUTTONS][3].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL;
if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF)
::paintButtons(x, y, w, MaxButtons, EpgButtons[TV_BUTTONS], w, h, "", false, COL_MENUFOOT_TEXT, adzap ? adzap_button.c_str() : NULL, 4); ::paintButtons(x, y, w, MaxButtons, EpgButtons[TV_BUTTONS], w, h, "", false, COL_MENUFOOT_TEXT, adzap ? adzap_button.c_str() : NULL, 2);
else // don't show recording button else // don't show recording button
::paintButtons(x, y, w, MaxButtons, &EpgButtons[TV_BUTTONS][1], w, h, "", false, COL_MENUFOOT_TEXT, adzap ? adzap_button.c_str() : NULL, 3); ::paintButtons(x, y, w, MaxButtons, &EpgButtons[TV_BUTTONS][1], w, h, "", false, COL_MENUFOOT_TEXT, adzap ? adzap_button.c_str() : NULL, 1);
} }
} }

6
src/system/locals.h
View File

@@ -1114,7 +1114,7 @@ typedef enum
LOCALE_IMDB_DATA_VOTES, LOCALE_IMDB_DATA_VOTES,
LOCALE_IMDB_DATA_WEBSITE, LOCALE_IMDB_DATA_WEBSITE,
LOCALE_IMDB_DATA_WRITER, LOCALE_IMDB_DATA_WRITER,
LOCALE_IMDB_INFO, LOCALE_IMDB_HEAD,
LOCALE_IMDB_READ_DATA, LOCALE_IMDB_READ_DATA,
LOCALE_INETRADIO_NAME, LOCALE_INETRADIO_NAME,
LOCALE_INETRADIO_AUTOSTART, LOCALE_INETRADIO_AUTOSTART,
@@ -1320,6 +1320,8 @@ typedef enum
LOCALE_MBKEY_COVER, LOCALE_MBKEY_COVER,
LOCALE_MBKEY_CUT, LOCALE_MBKEY_CUT,
LOCALE_MBKEY_TRUNCATE, LOCALE_MBKEY_TRUNCATE,
LOCALE_MDB_HEAD,
LOCALE_MDB_CHOOSE,
LOCALE_MDB_SAVE_POSTER, LOCALE_MDB_SAVE_POSTER,
LOCALE_MDB_SAVE_POSTER_HINT, LOCALE_MDB_SAVE_POSTER_HINT,
LOCALE_MENU_BACK, LOCALE_MENU_BACK,
@@ -2940,7 +2942,7 @@ typedef enum
LOCALE_TIMING_VOLUMEBAR, LOCALE_TIMING_VOLUMEBAR,
LOCALE_TMDB_API_KEY, LOCALE_TMDB_API_KEY,
LOCALE_TMDB_ENABLED, LOCALE_TMDB_ENABLED,
LOCALE_TMDB_INFO, LOCALE_TMDB_HEAD,
LOCALE_TMDB_READ_DATA, LOCALE_TMDB_READ_DATA,
LOCALE_TUNERSETUP_CABLE, LOCALE_TUNERSETUP_CABLE,
LOCALE_TUNERSETUP_HYBRID, LOCALE_TUNERSETUP_HYBRID,

6
src/system/locals_intern.h
View File

@@ -1114,7 +1114,7 @@ const char * locale_real_names[] =
"imdb.data_votes", "imdb.data_votes",
"imdb.data_website", "imdb.data_website",
"imdb.data_writer", "imdb.data_writer",
"imdb.info", "imdb.head",
"imdb.read_data", "imdb.read_data",
"inetradio.name", "inetradio.name",
"inetradio_autostart", "inetradio_autostart",
@@ -1320,6 +1320,8 @@ const char * locale_real_names[] =
"mbkey.cover", "mbkey.cover",
"mbkey.cut", "mbkey.cut",
"mbkey.truncate", "mbkey.truncate",
"mdb.head",
"mdb.choose",
"mdb.save_poster", "mdb.save_poster",
"mdb.save_poster_hint", "mdb.save_poster_hint",
"menu.back", "menu.back",
@@ -2940,7 +2942,7 @@ const char * locale_real_names[] =
"timing.volumebar", "timing.volumebar",
"tmdb.api_key", "tmdb.api_key",
"tmdb.enabled", "tmdb.enabled",
"tmdb.info", "tmdb.head",
"tmdb.read_data", "tmdb.read_data",
"tunersetup.cable", "tunersetup.cable",
"tunersetup.hybrid", "tunersetup.hybrid",