Thread: [Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-398-ge34c5ad
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
tuxbox-cvs-commits
|
From: Thilo G. <tux...@ne...> - 2014-07-03 18:34:30
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via e34c5ad4e29132d04bbc4ae5b0fe0aadae18b644 (commit)
via 3aea153f13360ff308e93b86b1f0af7b47e97e34 (commit)
via caf47a2488ad2f93d634defaa76ca0d6011af8aa (commit)
via a3eba28ffb2fcb6248a88e3f01dd27d11f74be01 (commit)
via e656a5ceab0bc16a5a814471456d5565b75f7816 (commit)
via bdfff6797ce8ab6c48b2a22ba4b5d8769c3291df (commit)
via 86c724eeec86e6376de85d10c2a65eef44b722a0 (commit)
via 72ea568b77248d37551e42e6e0d4608c148ea5f6 (commit)
via 7d2b13dc4f6909e9cd257701205727ef324cddd1 (commit)
via 7e87a6f9389019c7717e622de6b54fa18819f198 (commit)
via 691578491d37c66dcc45e905ba1f110ba2af9683 (commit)
via e4d3f8bb065c80a2d66dc23ba492096881568666 (commit)
via 7d5f5e9f04f38e3064d9c97a437d28bd4971e29c (commit)
via f3767d7ecde1ebeb5511bdf1659b1b5790649737 (commit)
via 2315d9e695d40a05d1c6d63fd4dd0882aacdac5e (commit)
via 2414c6c9e827d2041b3a22fcc221af3c6e5eb60d (commit)
via d6a9bf3f11c34a89ae98d9064256446de602f0ba (commit)
via a7e6b21659868746d2c5aa4e3e73e22e64b7c0ba (commit)
via 211d760fd09d9737e9d868b27c330ef9738e35b0 (commit)
via 5333d110be07709dd9e465002089ec2a9a330cf3 (commit)
via 612044f1e767b3f746c52274fe5e8a18f70061f6 (commit)
from ffea7f69cec8b47d66d4dc027371fb6b1ad32012 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e34c5ad4e29132d04bbc4ae5b0fe0aadae18b644
Author: Christian Schuett <Gau...@ho...>
Date: Thu Jun 19 20:30:39 2014 +0200
Neutrino movieinfo: don't show epgInfo2 if it equals epgInfo1
based on patch by martii <m4...@gm...> in Neutrino-MP Git
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/movieinfo.cpp b/tuxbox/neutrino/src/gui/movieinfo.cpp
index d995888..f004d7a 100644
--- a/tuxbox/neutrino/src/gui/movieinfo.cpp
+++ b/tuxbox/neutrino/src/gui/movieinfo.cpp
@@ -497,8 +497,11 @@ void CMovieInfo::showMovieInfo(MI_MOVIE_INFO& movie_info)
char date_char[100];
// prepare print buffer
print_buffer = movie_info.epgInfo1;
- print_buffer += "\n";
- print_buffer += movie_info.epgInfo2;
+ if (movie_info.epgInfo1 != movie_info.epgInfo2)
+ {
+ print_buffer += "\n";
+ print_buffer += movie_info.epgInfo2;
+ }
if( !movie_info.productionCountry.empty() || movie_info.productionDate != 0)
{
commit 3aea153f13360ff308e93b86b1f0af7b47e97e34
Author: Christian Schuett <Gau...@ho...>
Date: Wed Jun 18 19:33:18 2014 +0200
Neutrino eventlist: make alphabetically sorted list case insensitive
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/eventlist.cpp b/tuxbox/neutrino/src/gui/eventlist.cpp
index 5b51751..8cbcf8e 100644
--- a/tuxbox/neutrino/src/gui/eventlist.cpp
+++ b/tuxbox/neutrino/src/gui/eventlist.cpp
@@ -69,12 +69,13 @@ bool sortById (const CChannelEvent& a, const CChannelEvent& b)
return a.eventID < b.eventID ;
}
#endif
-bool sortByDescription (const CChannelEvent& a, const CChannelEvent& b)
+static bool sortByDescription (const CChannelEvent& a, const CChannelEvent& b)
{
- if(a.description == b.description)
+ int i = strcasecmp(a.description.c_str(), b.description.c_str());
+ if (i == 0)
return a.startTime < b.startTime;
else
- return a.description < b.description ;
+ return (i < 0);
}
static bool sortByDateTime (const CChannelEvent& a, const CChannelEvent& b)
{
commit caf47a2488ad2f93d634defaa76ca0d6011af8aa
Author: Christian Schuett <Gau...@ho...>
Date: Fri Jun 13 23:49:47 2014 +0200
Neutrino EPG viewer: replace left/right chars with corresponding icons
based on idea by martii <m4...@gm...> in Neutrino-MP Git
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/epgview.cpp b/tuxbox/neutrino/src/gui/epgview.cpp
index 588ee0b..012c502 100644
--- a/tuxbox/neutrino/src/gui/epgview.cpp
+++ b/tuxbox/neutrino/src/gui/epgview.cpp
@@ -128,10 +128,11 @@ void CEpgData::start()
ox = w_max (720, 70);
oy = h_max (576, 50);
+ frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_LEFT, &boticonwidth, &boticonheight);
topheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE]->getHeight();
topboxheight = topheight + 6;
botheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->getHeight();
- botboxheight = botheight + 6;
+ botboxheight = std::max(botheight, boticonheight) + 6;
buttonheight = std::max(16, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()) + BUTTONBAR_FONT_OFFSET;
sx = getScreenStartX (ox);
@@ -654,16 +655,13 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
}
GetPrevNextEPGData( epgData.eventID, &epgData.epg_times.startzeit );
- if ((prev_id != 0) && !call_fromfollowlist)
+ if (!call_fromfollowlist)
{
- frameBuffer->paintBoxRel(sx+ 5, sy+ oy- botboxheight+ 4, botboxheight- 8, botboxheight- 8, COL_MENUCONTENT_PLUS_3);
- g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->RenderString(sx+ 10, sy+ oy- 3, widthr, "<", COL_MENUCONTENT + 3);
- }
-
- if ((next_id != 0) && !call_fromfollowlist)
- {
- frameBuffer->paintBoxRel(sx+ ox- botboxheight+ 8- 5, sy+ oy- botboxheight+ 4, botboxheight- 8, botboxheight- 8, COL_MENUCONTENT_PLUS_3);
- g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->RenderString(sx+ ox- botboxheight+ 8, sy+ oy- 3, widthr, ">", COL_MENUCONTENT + 3);
+ int iy = sy + oy - botboxheight/2 - boticonheight/2;
+ if (prev_id != 0)
+ frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_LEFT, sx + 6, iy);
+ if (next_id != 0)
+ frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_RIGHT, sx + ox - boticonwidth - 6, iy);
}
if ( doLoop )
@@ -688,9 +686,6 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
case CRCInput::RC_left:
if ((prev_id != 0) && !call_fromfollowlist)
{
- frameBuffer->paintBoxRel(sx+ 5, sy+ oy- botboxheight+ 4, botboxheight- 8, botboxheight- 8, COL_MENUCONTENT_PLUS_1);
- g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->RenderString(sx+ 10, sy+ oy- 3, widthr, "<", COL_MENUCONTENT + 1);
-
show(channel_id, prev_id, &prev_zeit, false);
showPos=0;
}
@@ -699,9 +694,6 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
case CRCInput::RC_right:
if ((next_id != 0) && !call_fromfollowlist)
{
- frameBuffer->paintBoxRel(sx+ ox- botboxheight+ 8- 5, sy+ oy- botboxheight+ 4, botboxheight- 8, botboxheight- 8, COL_MENUCONTENT_PLUS_1);
- g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->RenderString(sx+ ox- botboxheight+ 8, sy+ oy- 3, widthr, ">", COL_MENUCONTENT + 1);
-
show(channel_id, next_id, &next_zeit, false);
showPos=0;
}
@@ -1016,7 +1008,7 @@ const struct button_label epgviewButtons[3] =
void CEpgData::showTimerEventBar(bool _show)
{
- int ButtonWidth = (ox - 16) / 4; // 4 cells
+ int ButtonWidth = (ox - 12) / 4; // 4 cells
int by = sy + oy + 2;
// hide only?
@@ -1030,14 +1022,14 @@ void CEpgData::showTimerEventBar(bool _show)
// Button: Timer Record & Channelswitch
if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF)
- ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, sx + 8, by, ButtonWidth, 1, &epgviewButtons[0]);
+ ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, sx + 6, by, ButtonWidth, 1, &epgviewButtons[0]);
// Button: Timer Channelswitch
- ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, sx + 8 + ButtonWidth, by, ButtonWidth, 1, &epgviewButtons[1]);
+ ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, sx + 6 + ButtonWidth, by, ButtonWidth, 1, &epgviewButtons[1]);
// Button: more screenings
if (!followlist.empty() && !call_fromfollowlist)
- ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, sx + 8 + 2 * ButtonWidth, by, ButtonWidth, 1, &epgviewButtons[2], 2 * ButtonWidth - 2 * (ICON_LARGE_WIDTH + 2) - 4);
+ ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, sx + 6 + 2 * ButtonWidth, by, ButtonWidth, 1, &epgviewButtons[2], 2 * ButtonWidth - 2 * (ICON_LARGE_WIDTH + 2) - 4);
}
diff --git a/tuxbox/neutrino/src/gui/epgview.h b/tuxbox/neutrino/src/gui/epgview.h
index dc23a5a..5e46982 100644
--- a/tuxbox/neutrino/src/gui/epgview.h
+++ b/tuxbox/neutrino/src/gui/epgview.h
@@ -83,6 +83,7 @@ class CEpgData
std::vector<epg_pair> epgText;
int topheight,topboxheight;
int botheight,botboxheight;
+ int boticonwidth,boticonheight;
int buttonheight;
int medlineheight,medlinecount;
bool bigFonts;
commit a3eba28ffb2fcb6248a88e3f01dd27d11f74be01
Author: Christian Schuett <Gau...@ho...>
Date: Fri Jun 13 21:00:55 2014 +0200
Neutrino: remove unnecessary std::string::c_str() calls
there is no need to do this conversion when calling Font::RenderString()
or Font::getRenderWidth()
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/bedit/bouqueteditor_channels.cpp b/tuxbox/neutrino/src/gui/bedit/bouqueteditor_channels.cpp
index 4430bb5..4ba5b87 100644
--- a/tuxbox/neutrino/src/gui/bedit/bouqueteditor_channels.cpp
+++ b/tuxbox/neutrino/src/gui/bedit/bouqueteditor_channels.cpp
@@ -128,7 +128,7 @@ void CBEChannelWidget::paint()
void CBEChannelWidget::paintHead()
{
frameBuffer->paintBoxRel(x,y, width,theight+0, COL_MENUHEAD_PLUS_0, RADIUS_MID, CORNER_TOP);
- g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x+10,y+theight+2, width, caption.c_str() , COL_MENUHEAD);
+ g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x+10,y+theight+2, width, caption, COL_MENUHEAD);
}
const struct button_label CBEChannelWidgetButtons[4] =
diff --git a/tuxbox/neutrino/src/gui/bedit/bouqueteditor_chanselect.cpp b/tuxbox/neutrino/src/gui/bedit/bouqueteditor_chanselect.cpp
index d841168..29e0bb8 100644
--- a/tuxbox/neutrino/src/gui/bedit/bouqueteditor_chanselect.cpp
+++ b/tuxbox/neutrino/src/gui/bedit/bouqueteditor_chanselect.cpp
@@ -159,7 +159,7 @@ void CBEChannelSelectWidget::paintHead()
{
// paint head
frameBuffer->paintBoxRel(x,y, width, theight, COL_MENUHEAD_PLUS_0, RADIUS_MID, CORNER_TOP);
- g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x+10,y+theight+2, width, caption.c_str() , COL_MENUHEAD);
+ g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x+10,y+theight+2, width, caption, COL_MENUHEAD);
}
const struct button_label CBEBouquetSelectWidgetButtons[2] =
diff --git a/tuxbox/neutrino/src/gui/channellist.cpp b/tuxbox/neutrino/src/gui/channellist.cpp
index 378d3c2..8d0ca3d 100644
--- a/tuxbox/neutrino/src/gui/channellist.cpp
+++ b/tuxbox/neutrino/src/gui/channellist.cpp
@@ -1214,7 +1214,7 @@ void CChannelList::paintDetails(unsigned int index)
desc = desc + " (" + satpos_str + ")";
}
- g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, y+ height+ 5+ 3*fheight, full_width - 30, desc.c_str(), COL_MENUCONTENTDARK, 0, true);
+ g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, y+ height+ 5+ 3*fheight, full_width - 30, desc, COL_MENUCONTENTDARK, 0, true);
}
else if( !displayNext && g_settings.channellist_foot == FOOT_NEXT) {
char buf[128] = {0};
diff --git a/tuxbox/neutrino/src/gui/imageinfo.cpp b/tuxbox/neutrino/src/gui/imageinfo.cpp
index 9e52ef5..327ef95 100644
--- a/tuxbox/neutrino/src/gui/imageinfo.cpp
+++ b/tuxbox/neutrino/src/gui/imageinfo.cpp
@@ -295,7 +295,7 @@ void CImageInfo::paintLicense(int y_startposition)
int fh = ssheight+12;
for (int i = 0; i<13; i++) // paint all lines
{
- g_Font[font_small_text]->RenderString(xpos, y_startposition, width-10, LLine[i].c_str(), COL_MENUCONTENT, 0, true);
+ g_Font[font_small_text]->RenderString(xpos, y_startposition, width-10, LLine[i], COL_MENUCONTENT, 0, true);
y_startposition += (fh >>1);
}
diff --git a/tuxbox/neutrino/src/gui/infoviewer.cpp b/tuxbox/neutrino/src/gui/infoviewer.cpp
index 759ceb9..0cf4ffb 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.cpp
+++ b/tuxbox/neutrino/src/gui/infoviewer.cpp
@@ -1856,7 +1856,7 @@ void CInfoViewer::showInfoFile()
// text
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->RenderString(
- xStart + RADIUS_SMALL, BoxStartY + height, xEnd - xStart - RADIUS_SMALL*2, (std::string)infotext, COL_INFOBAR, height, false);
+ xStart + RADIUS_SMALL, BoxStartY + height, xEnd - xStart - RADIUS_SMALL*2, infotext, COL_INFOBAR, height);
}
void CInfoViewer::killTitle()
diff --git a/tuxbox/neutrino/src/gui/widget/listbox.cpp b/tuxbox/neutrino/src/gui/widget/listbox.cpp
index 7d115a8..35840f7 100644
--- a/tuxbox/neutrino/src/gui/widget/listbox.cpp
+++ b/tuxbox/neutrino/src/gui/widget/listbox.cpp
@@ -81,7 +81,7 @@ void CListBox::paint()
void CListBox::paintHead()
{
frameBuffer->paintBoxRel(x,y, width,theight+0, COL_MENUHEAD_PLUS_0);
- g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x + 10, y + theight + 2, width, caption.c_str(), COL_MENUHEAD);
+ g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x + 10, y + theight + 2, width, caption, COL_MENUHEAD);
}
const struct button_label CListBoxButtons[4] =
diff --git a/tuxbox/neutrino/src/gui/widget/menue.cpp b/tuxbox/neutrino/src/gui/widget/menue.cpp
index 9c10e88..914a166 100644
--- a/tuxbox/neutrino/src/gui/widget/menue.cpp
+++ b/tuxbox/neutrino/src/gui/widget/menue.cpp
@@ -554,7 +554,7 @@ void CMenuWidget::paint()
height = h_max(wanted_height, 0);
- int neededWidth = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(nameString.c_str(), true); // UTF-8
+ int neededWidth = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(nameString, true); // UTF-8
if (neededWidth > width - 48)
width = w_max(neededWidth + 49, 0);
@@ -622,7 +622,7 @@ void CMenuWidget::paint()
if (!iconfile.empty())
frameBuffer->paintIcon(iconfile, x + 8, y + hheight / 2 - hiconheight / 2);
- g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x + hiconoffset + 10, y + hheight + 2, width - hiconoffset - 10, nameString.c_str(), COL_MENUHEAD, 0, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x + hiconoffset + 10, y + hheight + 2, width - hiconoffset - 10, nameString, COL_MENUHEAD, 0, true); // UTF-8
item_start_y = y+hheight;
paintItems();
commit e656a5ceab0bc16a5a814471456d5565b75f7816
Author: Christian Schuett <Gau...@ho...>
Date: Sun Jun 1 17:35:02 2014 +0200
Neutrino filebrowser: update footer if filelist is empty now or was before
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/filebrowser.cpp b/tuxbox/neutrino/src/gui/filebrowser.cpp
index a2b720a..222dd6d 100644
--- a/tuxbox/neutrino/src/gui/filebrowser.cpp
+++ b/tuxbox/neutrino/src/gui/filebrowser.cpp
@@ -369,6 +369,8 @@ void CFileBrowser::ChangeDir(const std::string & filename, int selection)
{
newpath += '/';
}
+
+ bool filelistWasEmpty = filelist.empty();
filelist.clear();
Path = newpath;
name = newpath;
@@ -397,8 +399,11 @@ void CFileBrowser::ChangeDir(const std::string & filename, int selection)
selected = 0;
if ((selection != -1) && (selection < (int)filelist.size()))
selected = selection;
+
paintHead();
paint();
+ if (filelistWasEmpty != filelist.empty())
+ paintFoot();
}
//------------------------------------------------------------------------
@@ -761,9 +766,9 @@ bool CFileBrowser::exec(const char * const dirname)
selection = selected;
paintHead();
+ m_SMSKeyInput.resetOldKey();
ChangeDir(name, selection);
//paint();
- m_SMSKeyInput.resetOldKey();
paintFoot();
int oldselected = selected;
commit bdfff6797ce8ab6c48b2a22ba4b5d8769c3291df
Author: Christian Schuett <Gau...@ho...>
Date: Thu May 29 21:23:00 2014 +0200
Neutrino eventlist: use correct width and height when painting 1st line
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/eventlist.cpp b/tuxbox/neutrino/src/gui/eventlist.cpp
index 729023f..5b51751 100644
--- a/tuxbox/neutrino/src/gui/eventlist.cpp
+++ b/tuxbox/neutrino/src/gui/eventlist.cpp
@@ -121,11 +121,7 @@ void EventList::init()
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_HELP, &iconw, &iconh);
theight = std::max(iconh, g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_TITLE]->getHeight());
fheight1 = g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMLARGE]->getHeight();
- {
- int h1 = g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMSMALL]->getHeight();
- int h2 = g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->getHeight();
- fheight2 = (h1 > h2) ? h1 : h2;
- }
+ fheight2 = std::max(g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMSMALL]->getHeight(), g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->getHeight());
fheight = fheight1 + fheight2 + 2;
fwidth1 = g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->getRenderWidth("DDD, 00:00, ");
fwidth2 = g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMSMALL]->getRenderWidth("[999 min] ");
@@ -698,8 +694,8 @@ void EventList::paintItem(unsigned int pos)
}
// 1st line
- g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->RenderString(x+5, ypos+ fheight1+3, fwidth1+5, datetime1_str, color, 0, true); // UTF-8
- g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->RenderString(x+5+fwidth1, ypos+ fheight1+3, width-fwidth1-10- 20, datetime2_str, color, 0, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->RenderString(x+5, ypos+ fheight2+3, fwidth1+5, datetime1_str, color, 0, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->RenderString(x+5+fwidth1, ypos+ fheight2+3, width-fwidth1-10- 20, datetime2_str, color, 0, true); // UTF-8
int seit = (evtlist[curpos].startTime - time(NULL)) / 60;
if ( (seit> 0) && (seit<100) && (duration_str.length()!=0) )
@@ -708,13 +704,14 @@ void EventList::paintItem(unsigned int pos)
sprintf((char*) &beginnt, "in %d min", seit);
int w = g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMSMALL]->getRenderWidth(beginnt) + 10;
- g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMSMALL]->RenderString(x+width-fwidth2-5- 20- w, ypos+ fheight1+3, fwidth2, beginnt, color);
+ g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMSMALL]->RenderString(x+width-fwidth2-5- 20- w, ypos+ fheight2+3, w, beginnt, color);
}
- g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMSMALL]->RenderString(x+width-fwidth2-5- 20, ypos+ fheight1+3, fwidth2, duration_str, color, 0, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMSMALL]->RenderString(x+width-fwidth2-5- 20, ypos+ fheight2+3, fwidth2, duration_str, color, 0, true); // UTF-8
// 2nd line
g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMLARGE]->RenderString(x+ 20, ypos+ fheight, width- 25- 20, evtlist[curpos].description, color);
unsigned char is_timer = isTimer(evtlist[curpos].startTime,evtlist[curpos].duration,evtlist[curpos].get_channel_id());
+ ypos -= 3;
if(is_timer == (EventList::CONFLICT<<4))
{
commit 86c724eeec86e6376de85d10c2a65eef44b722a0
Author: Christian Schuett <Gau...@ho...>
Date: Sat May 10 20:51:25 2014 +0200
Neutrino infoviewer: check for time being set
partly based on patch by martii <m4...@gm...> in Neutrino-MP Git
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/infoviewer.cpp b/tuxbox/neutrino/src/gui/infoviewer.cpp
index 45aa4cd..759ceb9 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.cpp
+++ b/tuxbox/neutrino/src/gui/infoviewer.cpp
@@ -211,6 +211,9 @@ void CInfoViewer::showSatfind()
void CInfoViewer::paintTime( bool show_dot, bool firstPaint )
{
+ if (!gotTime)
+ gotTime = g_Sectionsd->getIsTimeSet();
+
if ( gotTime )
{
ChanNameY = BoxStartY + (ChanHeight>>1) + SHADOW_OFFSET; //oberkante schatten?
@@ -358,6 +361,9 @@ void CInfoViewer::showMovieTitle(const int _playstate, const std::string &title,
BoxStartY = g_settings.screen_EndY - 20 - InfoHeightY - InfoHeightY_Info;
BoxEndY = g_settings.screen_EndY - 20 - InfoHeightY_Info;
+ if (!gotTime)
+ gotTime = g_Sectionsd->getIsTimeSet();
+
if (fadeIn)
{
frameBuffer->setAlphaFade(COL_INFOBAR, 8, convertSetupAlpha2Alpha(100));
commit 72ea568b77248d37551e42e6e0d4608c148ea5f6
Author: Christian Schuett <Gau...@ho...>
Date: Sat May 10 20:21:18 2014 +0200
Neutrino infoviewer: only show remaining time if time is set
based on patch by Stefan Seyfried <se...@tu...> in
Neutrino-MP Git
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/infoviewer.cpp b/tuxbox/neutrino/src/gui/infoviewer.cpp
index 167431d..45aa4cd 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.cpp
+++ b/tuxbox/neutrino/src/gui/infoviewer.cpp
@@ -1723,11 +1723,11 @@ void CInfoViewer::show_Data(bool calledFromEvent)
{
int seit = (abs(jetzt - info_CurrentNext.current_zeit.startzeit) + 30) / 60;
int rest = (info_CurrentNext.current_zeit.dauer / 60) - seit;
- if (jetzt < info_CurrentNext.current_zeit.startzeit)
- {
- progressbarPos = 0;
+ progressbarPos = 0;
+ if (!gotTime)
+ sprintf((char*)&runningRest, "%d min", info_CurrentNext.current_zeit.dauer / 60);
+ else if (jetzt < info_CurrentNext.current_zeit.startzeit)
sprintf((char*)&runningRest, "in %d min", seit);
- }
else
{
progressbarPos = (jetzt - info_CurrentNext.current_zeit.startzeit) * 112 / info_CurrentNext.current_zeit.dauer;
commit 7d2b13dc4f6909e9cd257701205727ef324cddd1
Author: Christian Schuett <Gau...@ho...>
Date: Sat May 10 19:55:26 2014 +0200
Neutrino listbox: use paintButtons in foot
based on patch by Jacek Jendrzej <cra...@go...> in Coolstream Git
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/widget/listbox.cpp b/tuxbox/neutrino/src/gui/widget/listbox.cpp
index 79ad79f..7d115a8 100644
--- a/tuxbox/neutrino/src/gui/widget/listbox.cpp
+++ b/tuxbox/neutrino/src/gui/widget/listbox.cpp
@@ -30,6 +30,7 @@
#include <global.h>
#include <neutrino.h>
+#include <gui/widget/buttons.h>
#include <gui/widget/icons.h>
#include <driver/screen_max.h>
@@ -83,25 +84,21 @@ void CListBox::paintHead()
g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x + 10, y + theight + 2, width, caption.c_str(), COL_MENUHEAD);
}
+const struct button_label CListBoxButtons[4] =
+{
+ { NEUTRINO_ICON_BUTTON_OKAY , LOCALE_TIMERLIST_MODIFY },
+ { NEUTRINO_ICON_BUTTON_GREEN, LOCALE_BOUQUETEDITOR_ADD },
+ { NEUTRINO_ICON_BUTTON_RED , LOCALE_BOUQUETEDITOR_DELETE },
+ { NEUTRINO_ICON_BUTTON_HOME , LOCALE_BOUQUETEDITOR_RETURN }
+};
+
void CListBox::paintFoot()
{
int y_foot = y + height - ButtonHeight;
- int y_text = y + height - 2;
- int ButtonWidth = width / 4;
+ int ButtonWidth = (width - 16) / 4;
frameBuffer->paintBoxRel(x, y_foot, width, ButtonHeight, COL_MENUHEAD_PLUS_0);
frameBuffer->paintHLine(x, x+width, y, COL_INFOBAR_SHADOW_PLUS_0);
-
- frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_OKAY, x + width - 4 * ButtonWidth + 8, y_foot + 1);
- g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(x + width - 4 * ButtonWidth + 38, y_text, width, "edit", COL_INFOBAR);
-
- frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_GREEN, x + width - 3 * ButtonWidth + 8, y_foot + 4);
- g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(x + width - 3 * ButtonWidth + 29, y_text, width - 26, "add", COL_INFOBAR);
-
- frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_RED, x + width - 2 * ButtonWidth + 8, y_foot + 4);
- g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(x + width - 2 * ButtonWidth + 29, y_text, width - 26, "remove", COL_INFOBAR);
-
- frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_HOME, x + width - ButtonWidth + 8, y_foot + 1);
- g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(x + width - ButtonWidth + 38, y_text, width, "ready", COL_INFOBAR);
+ ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 8, y_foot + 2, ButtonWidth, 4, CListBoxButtons, 0, false, COL_MENUHEAD_PLUS_0);
}
void CListBox::paintItem(int pos)
commit 7e87a6f9389019c7717e622de6b54fa18819f198
Author: Christian Schuett <Gau...@ho...>
Date: Mon May 5 21:38:40 2014 +0200
Neutrino: don't leave SCART mode when recording starts
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/driver/vcrcontrol.cpp b/tuxbox/neutrino/src/driver/vcrcontrol.cpp
index c3a1a6b..cfe01ac 100644
--- a/tuxbox/neutrino/src/driver/vcrcontrol.cpp
+++ b/tuxbox/neutrino/src/driver/vcrcontrol.cpp
@@ -362,8 +362,10 @@ void CVCRControl::CFileAndServerDevice::RestoreNeutrino(void)
g_Sectionsd->setServiceChanged(g_RemoteControl->current_channel_id, false);
}
- // alten mode wieder herstellen (ausser wen zwischenzeitlich auf oder aus sb geschalten wurde)
+ // alten mode wiederherstellen (ausser wenn zwischenzeitlich auf oder aus standby oder SCART geschaltet wurde)
if(CNeutrinoApp::getInstance()->getMode() != last_mode &&
+ CNeutrinoApp::getInstance()->getMode() != NeutrinoMessages::mode_scart &&
+ last_mode != NeutrinoMessages::mode_scart &&
CNeutrinoApp::getInstance()->getMode() != NeutrinoMessages::mode_standby &&
last_mode != NeutrinoMessages::mode_standby)
g_RCInput->postMsg( NeutrinoMessages::CHANGEMODE , last_mode);
@@ -392,12 +394,15 @@ void CVCRControl::CFileAndServerDevice::CutBackNeutrino(const t_channel_id chann
if (channel_id != 0) // wenn ein channel angegeben ist
{
last_mode = CNeutrinoApp::getInstance()->getMode();
- if (mode != last_mode && (last_mode != NeutrinoMessages::mode_standby || mode != CNeutrinoApp::getInstance()->getLastMode()))
+ if (mode != last_mode && (mode != CNeutrinoApp::getInstance()->getLastMode() ||
+ last_mode != NeutrinoMessages::mode_standby && last_mode != NeutrinoMessages::mode_scart))
{
CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::CHANGEMODE , mode | NeutrinoMessages::norezap );
// Wenn wir im Standby waren, dann brauchen wir f�rs streamen nicht aufwachen...
if(last_mode == NeutrinoMessages::mode_standby)
CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::CHANGEMODE , NeutrinoMessages::mode_standby);
+ else if(last_mode == NeutrinoMessages::mode_scart) // possibly switch back to SCART mode
+ CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::VCR_ON, 0 );
}
if(g_Zapit->getCurrentServiceID() != channel_id) // und momentan noch nicht getuned ist
{
commit 691578491d37c66dcc45e905ba1f110ba2af9683
Author: GetAway <get...@t-...>
Date: Sun Apr 27 16:29:26 2014 +0200
Neutrino: remove deprecated USE_VBI_INTERFACE
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/pluginlist.cpp b/tuxbox/neutrino/src/gui/pluginlist.cpp
index d17d7a1..56b242f 100644
--- a/tuxbox/neutrino/src/gui/pluginlist.cpp
+++ b/tuxbox/neutrino/src/gui/pluginlist.cpp
@@ -57,16 +57,6 @@
#include <driver/screen_max.h>
#include <zapit/client/zapittools.h>
-
-/* for alexW images with old drivers:
- * #define USE_VBI_INTERFACE 1
- */
-
-#ifdef USE_VBI_INTERFACE
- #define AVIA_VBI_START_VTXT 1
- #define AVIA_VBI_STOP_VTXT 2
-#endif
-
#include <daemonc/remotecontrol.h>
CPluginList::CPluginList(const neutrino_locale_t Name, const uint listtype)
diff --git a/tuxbox/neutrino/src/gui/plugins.cpp b/tuxbox/neutrino/src/gui/plugins.cpp
index e86b8a8..2b9f36d 100644
--- a/tuxbox/neutrino/src/gui/plugins.cpp
+++ b/tuxbox/neutrino/src/gui/plugins.cpp
@@ -51,16 +51,6 @@
#include <neutrino.h>
#include <zapit/client/zapittools.h>
-
-/* for alexW images with old drivers:
- * #define USE_VBI_INTERFACE 1
- */
-
-#ifdef USE_VBI_INTERFACE
- #define AVIA_VBI_START_VTXT 1
- #define AVIA_VBI_STOP_VTXT 2
-#endif
-
#include <daemonc/remotecontrol.h>
#define PLUGINDIR_MNT "/mnt/plugins"
@@ -409,14 +399,7 @@ void CPlugins::startPlugin(int number, int param, int param2)
if (plugin_list[number].vtxtpid)
{
vtpid = g_RemoteControl->current_PIDs.PIDs.vtxtpid;
-#ifdef USE_VBI_INTERFACE
- int fd = open("/dev/dbox/vbi0", O_RDWR);
- if (fd > 0)
- {
- ioctl(fd, AVIA_VBI_STOP_VTXT, 0);
- close(fd);
- }
-#endif
+
if(param>0)
vtpid=param;
startparam = makeParam(P_ID_VTXTPID, vtpid, startparam);
@@ -529,22 +512,6 @@ void CPlugins::startPlugin(int number, int param, int param2)
frameBuffer->paletteSet();
frameBuffer->paintBackgroundBox(0,0,720,576);
}
-
-#ifdef USE_VBI_INTERFACE
- if (plugin_list[number].vtxtpid)
- {
- if (vtpid != 0)
- {
- // versuche, den gtx/enx_vbi wieder zu starten
- int fd = open("/dev/dbox/vbi0", O_RDWR);
- if (fd > 0)
- {
- ioctl(fd, AVIA_VBI_START_VTXT, vtpid);
- close(fd);
- }
- }
- }
-#endif
}
/* unload shared libs */
commit e4d3f8bb065c80a2d66dc23ba492096881568666
Author: Christian Schuett <Gau...@ho...>
Date: Wed Apr 23 22:16:11 2014 +0200
Neutrino EPG Plus: simplify page change code
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <dbt@nov...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X