[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-62-g4131910
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-62-g4131910
|
From: Thilo G. <tux...@ne...> - 2013-03-20 07:00:25
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 4131910966d8e6bd33ba92b7d7db179ba2e088b9 (commit)
via ed450e164dec029152a19cf00ddddbce10faf54c (commit)
via 76dbda03bf959bb9a83b624eb96de70a78a82478 (commit)
via bb0961cbcceb6411f9d10fed92fccfa753e0159a (commit)
via 8844a62fab2a41f16cde5f92f722b0a8dca42515 (commit)
via dd4e304799b7b818ebd1b583e0448f6d057b4e4f (commit)
via d111c4e6c462f3032d8137fa42bdb37c44572fe6 (commit)
via 06223d8149981c055c407bda93fd13fceb08eca6 (commit)
via d6d6813aa578d4a918c633b4e46a6e9c9c303948 (commit)
via 346b925b26e17f501b2552dbe3e19a13c09dc9d6 (commit)
via 21e23bf1da812e6f1aa08d8c222414f17d3038e7 (commit)
from a0de98af3b9ad40ee7d015e5fce203feb84d5f10 (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 4131910966d8e6bd33ba92b7d7db179ba2e088b9
Author: Christian Schuett <Gau...@ho...>
Date: Tue Mar 19 21:04:30 2013 +0100
Neutrino: fix calculating max button width in button bar
prevent button text from overflowing the button bar
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/data/locale/deutsch.locale b/tuxbox/neutrino/data/locale/deutsch.locale
index e18d2f7..fd9d341 100644
--- a/tuxbox/neutrino/data/locale/deutsch.locale
+++ b/tuxbox/neutrino/data/locale/deutsch.locale
@@ -424,6 +424,7 @@ eventfinder.start_search Starte Suche
eventlistbar.channelswitch Umschalten
eventlistbar.eventsort Sortieren
eventlistbar.recordevent Aufnehmen
+eventlistbar.reload Aktualisieren
experimentalsettings Experimentelle Einstellungen
experimentalsettings.head Experimentelle Einstellungen
favorites.addchannel Der aktuelle Kanal wird dem Bouquet \n"Meine Favoriten" hinzugefügt. \nDie Speicherung benötigt einen Moment...
@@ -936,6 +937,8 @@ movieplayer.goto.h2 +,- -> relativer Sprung
movieplayer.head Movieplayer
movieplayer.nostreamingserver Es konnte keine Verbindung\nzum Streamingserver hergestellt werden.
movieplayer.pleasewait Bitte warten Sie.\nDie Verbindung zum Streamingserver wird hergestellt.
+movieplayer.plugin Plugin
+movieplayer.resync Resync
movieplayer.toomanybookmarks Sie haben bereits zu viele Bookmarks angelegt.\nEs muà erst ein anderes gelöscht werden.
movieplayer.tshelp1 Stop
movieplayer.tshelp10 ca. 10 Minuten zurück
diff --git a/tuxbox/neutrino/data/locale/english.locale b/tuxbox/neutrino/data/locale/english.locale
index f14024e..894db50 100644
--- a/tuxbox/neutrino/data/locale/english.locale
+++ b/tuxbox/neutrino/data/locale/english.locale
@@ -424,6 +424,7 @@ eventfinder.start_search Start Search
eventlistbar.channelswitch schedule
eventlistbar.eventsort sorting
eventlistbar.recordevent record
+eventlistbar.reload reload
experimentalsettings Experimental Settings
experimentalsettings.head Experimental Settings
favorites.addchannel The current channel will be added \nto the bouquet "My Favorites".\nThis will take a few seconds...
@@ -936,6 +937,8 @@ movieplayer.goto.h2 +,- -> relative jump
movieplayer.head Movie Player
movieplayer.nostreamingserver The streaming server could not be reached.
movieplayer.pleasewait Please wait.\nConnecting to the streaming server...
+movieplayer.plugin Plugin
+movieplayer.resync Resync
movieplayer.toomanybookmarks There are too many bookmarks.\nYou need to delete one of them first.
movieplayer.tshelp1 Stop
movieplayer.tshelp10 approx. 10 minutes back
diff --git a/tuxbox/neutrino/src/gui/audioplayer.cpp b/tuxbox/neutrino/src/gui/audioplayer.cpp
index c349124..29f3d8e 100644
--- a/tuxbox/neutrino/src/gui/audioplayer.cpp
+++ b/tuxbox/neutrino/src/gui/audioplayer.cpp
@@ -1680,7 +1680,8 @@ void CAudioPlayerGui::paintFoot()
start_x = m_x + 10;
start_top = top + 2;
- int ButtonWidth = (m_width - 20) / 4;
+ int ButtonsMaxWidth = m_width - 20;
+ int ButtonWidth = ButtonsMaxWidth / 4;
int ButtonWidth2 = (m_width - 50) / 2;
m_frameBuffer->paintBoxRel(m_x, top, m_width, 2 * m_buttonHeight, COL_INFOBAR_SHADOW_PLUS_1, c_rad_mid, CORNER_BOTTOM);
m_frameBuffer->paintHLine(m_x, m_x + m_width, top, COL_INFOBAR_SHADOW_PLUS_1);
@@ -1694,29 +1695,29 @@ void CAudioPlayerGui::paintFoot()
if (m_playlist.empty()) {
if (m_inetmode)
::paintButtons(m_frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale,
- start_x, start_top, ButtonWidth, 2, AudioPlayerButtons[7]);
+ start_x, start_top, ButtonWidth, 2, AudioPlayerButtons[7], ButtonsMaxWidth);
else
::paintButtons(m_frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale,
- start_x, start_top, ButtonWidth, 1, &(AudioPlayerButtons[7][0]));
+ start_x, start_top, ButtonWidth, 1, &(AudioPlayerButtons[7][0]), ButtonsMaxWidth);
} else
if (m_inetmode)
::paintButtons(m_frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale,
- start_x, start_top, ButtonWidth, 4, AudioPlayerButtons[8]);
+ start_x, start_top, ButtonWidth, 4, AudioPlayerButtons[8], ButtonsMaxWidth);
else
::paintButtons(m_frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale,
- start_x, start_top, ButtonWidth, 4, AudioPlayerButtons[1]);
+ start_x, start_top, ButtonWidth, 4, AudioPlayerButtons[1], ButtonsMaxWidth);
}
else if (m_key_level == 1)
{
if (m_curr_audiofile.FileType != CFile::STREAM_AUDIO)
{
::paintButtons(m_frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale,
- start_x, start_top, ButtonWidth, 4, AudioPlayerButtons[0]);
+ start_x, start_top, ButtonWidth, 4, AudioPlayerButtons[0], ButtonsMaxWidth);
}
else
{
::paintButtons(m_frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale,
- start_x, start_top, ButtonWidth*2, 2, AudioPlayerButtons[6]);
+ start_x, start_top, ButtonWidth*2, 2, AudioPlayerButtons[6], ButtonsMaxWidth);
}
}
else
@@ -1726,12 +1727,12 @@ void CAudioPlayerGui::paintFoot()
if (m_select_title_by_name)
{
::paintButtons(m_frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale,
- start_x, start_top, ButtonWidth, 2, AudioPlayerButtons[5]);
+ start_x, start_top, ButtonWidth, 2, AudioPlayerButtons[5], ButtonsMaxWidth);
}
else
{
::paintButtons(m_frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale,
- start_x, start_top, ButtonWidth, 2, AudioPlayerButtons[4]);
+ start_x, start_top, ButtonWidth, 2, AudioPlayerButtons[4], ButtonsMaxWidth);
}
}
else
@@ -1739,12 +1740,12 @@ void CAudioPlayerGui::paintFoot()
if (m_select_title_by_name)
{
::paintButtons(m_frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale,
- start_x, start_top, ButtonWidth*2, 2, AudioPlayerButtons[3]);
+ start_x, start_top, ButtonWidth*2, 2, AudioPlayerButtons[3], ButtonsMaxWidth);
}
else
{
::paintButtons(m_frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale,
- start_x, start_top, ButtonWidth*2, 2, AudioPlayerButtons[2]);
+ start_x, start_top, ButtonWidth*2, 2, AudioPlayerButtons[2], ButtonsMaxWidth);
}
}
}
diff --git a/tuxbox/neutrino/src/gui/bedit/bouqueteditor_bouquets.cpp b/tuxbox/neutrino/src/gui/bedit/bouqueteditor_bouquets.cpp
index 1ec7a6e..92a05fc 100644
--- a/tuxbox/neutrino/src/gui/bedit/bouqueteditor_bouquets.cpp
+++ b/tuxbox/neutrino/src/gui/bedit/bouqueteditor_bouquets.cpp
@@ -159,7 +159,7 @@ void CBEBouquetWidget::paintFoot()
CBEBouquetWidgetButtons1[4].locale = LOCALE_BOUQUETEDITOR_LOCK;
break;
}
- ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 5, y + height+2, (width-20)/5, 5, CBEBouquetWidgetButtons1, width-20);
+ ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 5, y + height + 2, (width - 10) / 5, 5, CBEBouquetWidgetButtons1);
}
void CBEBouquetWidget::hide()
diff --git a/tuxbox/neutrino/src/gui/bedit/bouqueteditor_channels.cpp b/tuxbox/neutrino/src/gui/bedit/bouqueteditor_channels.cpp
index 3954a0b..654cbaf 100644
--- a/tuxbox/neutrino/src/gui/bedit/bouqueteditor_channels.cpp
+++ b/tuxbox/neutrino/src/gui/bedit/bouqueteditor_channels.cpp
@@ -142,7 +142,7 @@ const struct button_label CBEChannelWidgetButtons[4] =
void CBEChannelWidget::paintFoot()
{
frameBuffer->paintBoxRel(x,y+height, width,ButtonHeight, COL_INFOBAR_SHADOW_PLUS_1, RADIUS_MID, CORNER_BOTTOM);
- ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 10, y + height, width/5, 4, CBEChannelWidgetButtons);
+ ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 10, y + height, (width - 20) / 4, 4, CBEChannelWidgetButtons);
}
void CBEChannelWidget::hide()
diff --git a/tuxbox/neutrino/src/gui/bedit/bouqueteditor_chanselect.cpp b/tuxbox/neutrino/src/gui/bedit/bouqueteditor_chanselect.cpp
index d138b27..ac13741 100644
--- a/tuxbox/neutrino/src/gui/bedit/bouqueteditor_chanselect.cpp
+++ b/tuxbox/neutrino/src/gui/bedit/bouqueteditor_chanselect.cpp
@@ -171,5 +171,5 @@ void CBEChannelSelectWidget::paintFoot()
int y_foot = y + height;
frameBuffer->paintBoxRel(x, y_foot, width, ButtonHeight, COL_INFOBAR_SHADOW_PLUS_1, RADIUS_MID, CORNER_BOTTOM);
- ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 5, y_foot, width/2, 2, CBEBouquetSelectWidgetButtons);
+ ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 5, y_foot, (width - 10) / 2, 2, CBEBouquetSelectWidgetButtons);
}
diff --git a/tuxbox/neutrino/src/gui/bouquetlist.cpp b/tuxbox/neutrino/src/gui/bouquetlist.cpp
index 3f36106..07c01d5 100644
--- a/tuxbox/neutrino/src/gui/bouquetlist.cpp
+++ b/tuxbox/neutrino/src/gui/bouquetlist.cpp
@@ -426,8 +426,8 @@ void CBouquetList::paint()
//footbar
int fy = y + theight + listmaxshow * fheight ;
- int ButtonWith = width/3;
+ int ButtonWith = (width - 8) / 3;
int icony = fy + theight / 2 - 12;
frameBuffer->paintBoxRel(x, fy, width, theight, COL_INFOBAR_SHADOW_PLUS_1, RADIUS_MID, CORNER_BOTTOM);
- ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 4, icony, ButtonWith, sizeof(CBouquetListButtons)/sizeof(CBouquetListButtons[0]), CBouquetListButtons, width);
+ ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 4, icony, ButtonWith, 6, CBouquetListButtons);
}
diff --git a/tuxbox/neutrino/src/gui/channellist.cpp b/tuxbox/neutrino/src/gui/channellist.cpp
index 09abc7d..0900ca0 100644
--- a/tuxbox/neutrino/src/gui/channellist.cpp
+++ b/tuxbox/neutrino/src/gui/channellist.cpp
@@ -1343,7 +1343,7 @@ struct button_label CChannelListButtons[] =
void CChannelList::paintFoot()
{
- int ButtonWidth = width/4;
+ int ButtonWidth = (width - 20) / 4;
int buttonHeight = 7 + std::min(16, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight());
frameBuffer->paintHLineRel(x, width, y + (height - buttonHeight), COL_INFOBAR_SHADOW_PLUS_0);
@@ -1359,7 +1359,7 @@ void CChannelList::paintFoot()
}
frameBuffer->paintBoxRel(x, y + (height - buttonHeight), width, buttonHeight, COL_INFOBAR_SHADOW_PLUS_1, RADIUS_MID, CORNER_BOTTOM);
- ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 10, y + (height - buttonHeight), ButtonWidth, sizeof(CChannelListButtons)/sizeof(CChannelListButtons[0]), CChannelListButtons, width);
+ ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 10, y + (height - buttonHeight), ButtonWidth, 4, CChannelListButtons);
}
void CChannelList::paint()
diff --git a/tuxbox/neutrino/src/gui/epgplus.cpp b/tuxbox/neutrino/src/gui/epgplus.cpp
index f0f59f2..b7f258c 100644
--- a/tuxbox/neutrino/src/gui/epgplus.cpp
+++ b/tuxbox/neutrino/src/gui/epgplus.cpp
@@ -595,7 +595,7 @@ struct button_label buttonLabels[6] =
void EpgPlus::Footer::paintButtons(button_label* _buttonLabels, int numberOfButtons)
{
int yPos = y + getUsedHeight() - fontButtons->getHeight();
- int buttonWidth = (width - 10) / 6; //40
+ int buttonWidth = (width - 10) / numberOfButtons; //40
frameBuffer->paintBoxRel(x, yPos, width, fontButtons->getHeight(), COL_INFOBAR_SHADOW_PLUS_1, RADIUS_MID, CORNER_BOTTOM);
::paintButtons(frameBuffer, fontButtons, g_Locale, x + 5, yPos , buttonWidth, numberOfButtons, _buttonLabels);
diff --git a/tuxbox/neutrino/src/gui/epgview.cpp b/tuxbox/neutrino/src/gui/epgview.cpp
index 9c1e4a0..3a6d67a 100644
--- a/tuxbox/neutrino/src/gui/epgview.cpp
+++ b/tuxbox/neutrino/src/gui/epgview.cpp
@@ -955,7 +955,7 @@ const struct button_label epgviewButtons[3] =
void CEpgData::showTimerEventBar(bool _show)
{
- int ButtonWidth = ox / 4; // 4 cells
+ int ButtonWidth = (ox - 16) / 4; // 4 cells
int fheight = std::max(16, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()) + BUTTONBAR_FONT_OFFSET;
int by = sy + oy + (fheight >> 3) - 1;
@@ -973,11 +973,11 @@ void CEpgData::showTimerEventBar(bool _show)
::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, sx + 8, by, ButtonWidth, 1, &epgviewButtons[0]);
// Button: Timer Channelswitch
- ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, sx + ButtonWidth, by, ButtonWidth, 1, &epgviewButtons[1]);
+ ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, sx + 8 + ButtonWidth, by, ButtonWidth, 1, &epgviewButtons[1]);
// Button: more screenings
if (!followlist.empty())
- ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, sx + 2 * ButtonWidth, by, ButtonWidth, 1, &epgviewButtons[2]);
+ ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, sx + 8 + 2 * ButtonWidth, by, ButtonWidth, 1, &epgviewButtons[2]);
}
diff --git a/tuxbox/neutrino/src/gui/eventlist.cpp b/tuxbox/neutrino/src/gui/eventlist.cpp
index aaa656d..bfb72ad 100644
--- a/tuxbox/neutrino/src/gui/eventlist.cpp
+++ b/tuxbox/neutrino/src/gui/eventlist.cpp
@@ -805,7 +805,7 @@ struct button_label EventListButtons[5] =
{ "", LOCALE_EVENTFINDER_SEARCH }, // search button
{ "", LOCALE_GENERIC_EMPTY }, // timerlist delete / channelswitch
{ "", LOCALE_EVENTLISTBAR_EVENTSORT }, // sort button
- { "", LOCALE_KEYBINDINGMENU_RELOAD } // reload button
+ { "", LOCALE_EVENTLISTBAR_RELOAD } // reload button
};
void EventList::showFunctionBar (bool show)
@@ -823,7 +823,7 @@ void EventList::showFunctionBar (bool show)
bx = x + 5;
by = y + height - iheight;
- int ButtonWidth = width / 5;
+ int ButtonWidth = (width - 10) / 5;
// -- hide only?
if (!show)
@@ -855,7 +855,7 @@ void EventList::showFunctionBar (bool show)
}
frameBuffer->getIconSize(icon, &iconw, &iconh);
- cellwidth = iconw + 4 + space + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(btncaption);
+ cellwidth = std::min(ButtonWidth, iconw + 4 + space + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(btncaption));
// paint 1st button
::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, bx, by, ButtonWidth, 1, &EventListButtons[0]);
@@ -871,7 +871,7 @@ void EventList::showFunctionBar (bool show)
btncaption = g_Locale->getText(LOCALE_EVENTFINDER_SEARCH);
frameBuffer->getIconSize(icon, &iconw, &iconh);
- cellwidth = iconw + 4 + space + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(btncaption);
+ cellwidth = std::min(ButtonWidth, iconw + 4 + space + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(btncaption));
// paint second button
::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, bx, by, ButtonWidth, 1, &EventListButtons[1]);
@@ -896,7 +896,7 @@ void EventList::showFunctionBar (bool show)
}
frameBuffer->getIconSize(icon, &iconw, &iconh);
- cellwidth = iconw + 4 + space + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(btncaption);
+ cellwidth = std::min(ButtonWidth, iconw + 4 + space + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(btncaption));
// paint 3rd button
::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, bx, by, ButtonWidth, 1, &EventListButtons[2]);
@@ -912,7 +912,7 @@ void EventList::showFunctionBar (bool show)
btncaption = g_Locale->getText(LOCALE_EVENTLISTBAR_EVENTSORT);
frameBuffer->getIconSize(icon, &iconw, &iconh);
- cellwidth = iconw + 4 + space + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(btncaption);
+ cellwidth = std::min(ButtonWidth, iconw + 4 + space + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(btncaption));
// paint 4th button
::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, bx, by, ButtonWidth, 1, &EventListButtons[3]);
@@ -926,7 +926,6 @@ void EventList::showFunctionBar (bool show)
EventListButtons[4].button = icon;
// paint 5th button
- btncaption = g_Locale->getText(LOCALE_KEYBINDINGMENU_RELOAD);
::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, bx, by, ButtonWidth, 1, &EventListButtons[4]);
}
diff --git a/tuxbox/neutrino/src/gui/filebrowser.cpp b/tuxbox/neutrino/src/gui/filebrowser.cpp
index e844ec2..819cabc 100644
--- a/tuxbox/neutrino/src/gui/filebrowser.cpp
+++ b/tuxbox/neutrino/src/gui/filebrowser.cpp
@@ -1410,7 +1410,7 @@ void CFileBrowser::paintFoot()
{
int by = y + height - 2 * (foheight - 2);
- ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 10, by, ButtonWidth, Multi_Select ? 3 : 2, FileBrowserButtons);
+ ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 10, by, ButtonWidth, Multi_Select ? 3 : 2, FileBrowserButtons, 3 * ButtonWidth);
//Blue-Button
if (Filter != NULL)
@@ -1424,11 +1424,11 @@ void CFileBrowser::paintFoot()
//?-Button
FileBrowserHelpButton[0].locale = sortByNames[g_settings.filebrowser_sortmethod];
- ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + (1 * ButtonWidth), by2, ButtonWidth, 1, FileBrowserHelpButton);
+ ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 10 + (1 * ButtonWidth), by2, ButtonWidth, 1, FileBrowserHelpButton);
//Mute-Button
if (strncmp(Path.c_str(), VLC_URI, strlen(VLC_URI)) != 0) { //Not in vlc mode
- ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + (2 * ButtonWidth), by2, ButtonWidth, 1, FileBrowserDeleteButton);
+ ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 10 + (2 * ButtonWidth), by2, ButtonWidth, 1, FileBrowserDeleteButton);
}
if (m_SMSKeyInput.getOldKey() != 0)
diff --git a/tuxbox/neutrino/src/gui/imageinfo.cpp b/tuxbox/neutrino/src/gui/imageinfo.cpp
index 80340ee..be603d2 100644
--- a/tuxbox/neutrino/src/gui/imageinfo.cpp
+++ b/tuxbox/neutrino/src/gui/imageinfo.cpp
@@ -530,9 +530,8 @@ const struct button_label CImageInfoButtons[5] =
void CImageInfo::paintFoot(int xf, int yf)
{
- int ButtonHeight = ssheight;
- frameBuffer->paintBoxRel(xf, yf, width, ButtonHeight, COL_INFOBAR_SHADOW_PLUS_1, RADIUS_MID, CORNER_BOTTOM);
- ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, xf + 5, yf, width/6, 5, CImageInfoButtons, width);
+ frameBuffer->paintBoxRel(xf, yf, width, ssheight, COL_INFOBAR_SHADOW_PLUS_1, RADIUS_MID, CORNER_BOTTOM);
+ ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, xf + 5, yf, (width - 10) / 5, 5, CImageInfoButtons);
}
void CImageInfo::paint()
diff --git a/tuxbox/neutrino/src/gui/infoviewer.cpp b/tuxbox/neutrino/src/gui/infoviewer.cpp
index 320dec5..121f2a6 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.cpp
+++ b/tuxbox/neutrino/src/gui/infoviewer.cpp
@@ -1040,7 +1040,7 @@ void CInfoViewer::showButton(const int button, const bool calledFromMPlayer, con
if (mode == VLC_MODE)
InfobarButtons[SNeutrinoSettings::BUTTON_RED].locale = LOCALE_AUDIOPLAYER_STOP;
else
- InfobarButtons[SNeutrinoSettings::BUTTON_RED].locale = LOCALE_MOVIEPLAYER_TSHELP17;
+ InfobarButtons[SNeutrinoSettings::BUTTON_RED].locale = LOCALE_MOVIEPLAYER_PLUGIN;
}
else
{
@@ -1060,7 +1060,7 @@ void CInfoViewer::showButton(const int button, const bool calledFromMPlayer, con
if(calledFromMPlayer)
{
if (mode == VLC_MODE)
- InfobarButtons[SNeutrinoSettings::BUTTON_GREEN].locale = LOCALE_MOVIEPLAYER_VLCHELP2;
+ InfobarButtons[SNeutrinoSettings::BUTTON_GREEN].locale = LOCALE_MOVIEPLAYER_RESYNC;
else
{
InfobarButtons[SNeutrinoSettings::BUTTON_GREEN].locale = LOCALE_INFOVIEWER_LANGUAGES;
@@ -1139,7 +1139,7 @@ void CInfoViewer::showButton(const int button, const bool calledFromMPlayer, con
}
if (paint)
::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale,
- startX, by, ButtonWidth, 1, &InfobarButtons[button], 720, false, COL_INFOBAR_SHADOW_PLUS_1, txt);
+ startX, by, ButtonWidth, 1, &InfobarButtons[button], 0, false, COL_INFOBAR_SHADOW_PLUS_1, txt);
}
#ifdef ENABLE_RADIOTEXT
diff --git a/tuxbox/neutrino/src/gui/motorcontrol.cpp b/tuxbox/neutrino/src/gui/motorcontrol.cpp
index 20196cd..8fc3b5c 100644
--- a/tuxbox/neutrino/src/gui/motorcontrol.cpp
+++ b/tuxbox/neutrino/src/gui/motorcontrol.cpp
@@ -494,7 +494,8 @@ const struct button_label CMotorControlMenueButtons5[3] =
void CMotorControl::paintMenu()
{
ypos_menue = y + head_height + status_height;
- int buttonwidth = width/2;
+ int buttonsMaxWidth = width - 20;
+ int buttonWidth = buttonsMaxWidth / 2;
int xposButton = x + 10;
int font = SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL;
@@ -511,15 +512,15 @@ void CMotorControl::paintMenu()
ypos_menue += 10;
// buttons 0 / Ok / home
- ::paintButtons(frameBuffer, g_Font[font], g_Locale, xposButton, ypos_menue, buttonwidth-28, 3, CMotorControlMenueButtons1);
+ ::paintButtons(frameBuffer, g_Font[font], g_Locale, xposButton, ypos_menue, buttonWidth - 28, 3, CMotorControlMenueButtons1, buttonsMaxWidth);
// buttons left / right
ypos_menue += mheight;
- ::paintButtons(frameBuffer, g_Font[font], g_Locale, xposButton, ypos_menue, buttonwidth,2, CMotorControlMenueButtons2);
+ ::paintButtons(frameBuffer, g_Font[font], g_Locale, xposButton, ypos_menue, buttonWidth, 2, CMotorControlMenueButtons2, buttonsMaxWidth);
// button red
ypos_menue += mheight;
- ::paintButtons(frameBuffer, g_Font[font], g_Locale, xposButton, ypos_menue, buttonwidth,1, CMotorControlMenueButtons3);
+ ::paintButtons(frameBuffer, g_Font[font], g_Locale, xposButton, ypos_menue, buttonWidth, 1, CMotorControlMenueButtons3, buttonsMaxWidth);
// variant buttons
if (installerMenue)
@@ -541,10 +542,10 @@ void CMotorControl::paintMenu()
CMotorControlMenueButtons4[5].locale = LOCALE_MOTORCONTROL_DECREASE_STEP_SIZE;
}
ypos_menue += mheight;
- ::paintButtons(frameBuffer, g_Font[font], g_Locale, xposButton, ypos_menue, buttonwidth, 6, CMotorControlMenueButtons4, width, true); //vertical
+ ::paintButtons(frameBuffer, g_Font[font], g_Locale, xposButton, ypos_menue, buttonWidth, 6, CMotorControlMenueButtons4, 0, true); //vertical
//ypos_menue += mheight;
- ::paintButtons(frameBuffer, g_Font[font], g_Locale, xposButton+buttonwidth, ypos_menue, buttonwidth, 3, CMotorControlMenueButtons5, width, true); //vertical
+ ::paintButtons(frameBuffer, g_Font[font], g_Locale, xposButton + buttonWidth, ypos_menue, buttonWidth, 3, CMotorControlMenueButtons5, 0, true); //vertical
}
void CMotorControl::startSatFind(void)
diff --git a/tuxbox/neutrino/src/gui/streaminfo2.cpp b/tuxbox/neutrino/src/gui/streaminfo2.cpp
index b8324d7..ab1dffe 100644
--- a/tuxbox/neutrino/src/gui/streaminfo2.cpp
+++ b/tuxbox/neutrino/src/gui/streaminfo2.cpp
@@ -501,8 +501,8 @@ void CStreamInfo2::paint(int/*mode*/)
StreamInfoButtons[0].locale = LOCALE_STREAMINFO_RESIZE;
- ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, xpos, button_y-20, ButtonWidth, 1, &StreamInfoButtons[0], NULL, NULL, COL_MENUCONTENT_PLUS_0);
- ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, width - 110, button_y-20, ButtonWidth, 1, &StreamInfoButtons[1], NULL, NULL, COL_MENUCONTENT_PLUS_0);
+ ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, xpos, button_y - 20, ButtonWidth, 1, &StreamInfoButtons[0], 0, false, COL_MENUCONTENT_PLUS_0);
+ ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, width - 110, button_y - 20, ButtonWidth, 1, &StreamInfoButtons[1], 0, false, COL_MENUCONTENT_PLUS_0);
}
}
diff --git a/tuxbox/neutrino/src/gui/timerlist.cpp b/tuxbox/neutrino/src/gui/timerlist.cpp
index 3d24384..4cd4aeb 100644
--- a/tuxbox/neutrino/src/gui/timerlist.cpp
+++ b/tuxbox/neutrino/src/gui/timerlist.cpp
@@ -779,21 +779,18 @@ void CTimerList::paintHead()
frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_HELP, x + width - iconw - 8, ypos);
}
-const struct button_label TimerListButtons[4] =
+const struct button_label TimerListButtons[5] =
{
- { NEUTRINO_ICON_BUTTON_HOME , LOCALE_MENU_CANCEL },
{ NEUTRINO_ICON_BUTTON_RED , LOCALE_TIMERLIST_DELETE },
{ NEUTRINO_ICON_BUTTON_GREEN , LOCALE_TIMERLIST_NEW },
- { NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_TIMERLIST_RELOAD }
-};
-const struct button_label TimerListButtonOK[1] =
-{
+ { NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_TIMERLIST_RELOAD },
+ { NEUTRINO_ICON_BUTTON_HOME , LOCALE_MENU_CANCEL },
{ NEUTRINO_ICON_BUTTON_OKAY , LOCALE_TIMERLIST_MODIFY }
};
void CTimerList::paintFoot()
{
- int ButtonWidth = (width - 20) / 4;
+ int ButtonWidth = (width - 20) / 5;
int iconw = 0, iconh = 0;
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_OKAY, &iconw, &iconh);
int footHeight = std::max(iconh, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight());
@@ -801,12 +798,9 @@ void CTimerList::paintFoot()
frameBuffer->paintBoxRel(x, y + height, width, footHeight, COL_INFOBAR_SHADOW_PLUS_1, RADIUS_MID, CORNER_BOTTOM);
if (timerlist.empty())
- ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + ButtonWidth + 10, y + height, ButtonWidth, 3, /*&(*/TimerListButtons/*[1])*/);
+ ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 10 + ButtonWidth, y + height, ButtonWidth, 3, &(TimerListButtons[1]));
else
- {
- ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 10, y + height, ButtonWidth, 4, TimerListButtons);
- ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 10 + width - 1 * ButtonWidth, y + height, ButtonWidth, 1, TimerListButtonOK);
- }
+ ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 10, y + height, ButtonWidth, 5, TimerListButtons);
}
void CTimerList::paint()
diff --git a/tuxbox/neutrino/src/gui/widget/buttons.cpp b/tuxbox/neutrino/src/gui/widget/buttons.cpp
index 2a652fe..6c43b20 100644
--- a/tuxbox/neutrino/src/gui/widget/buttons.cpp
+++ b/tuxbox/neutrino/src/gui/widget/buttons.cpp
@@ -34,7 +34,7 @@
* buttonwidth set width of button include width of icon, space and caption
* count set count of buttons
* content set iconfile and locale constant, for an empty text let locale constant empty , so you can paint icons without captions,
- * maxwidth optional, default value is 720 (full screenwidth) sets maximal width there can paint buttons, should be the same like width eg. from a menue
+ * maxwidth optional, default value is 0, sets maximal width there can paint buttons, should be the same like width eg. from a menu
* vertical_paint optional, default value is false (horizontal) sets direction of painting
* backgroundcolor optional, default value is COL_INFOBAR_SHADOW_PLUS_1, use it to render font with other backgroundcolor (example: streaminfo2.cpp)
*/
@@ -56,8 +56,10 @@ void paintButtons(CFrameBuffer * const frameBuffer, Font * const font,
int iconh, iconw, max_iconw = 0;
int xstart = x, ystart = y;
int space = 4;
+ unsigned int maxTextwidth = 0;
unsigned int bestButtonwidth = maxwidth/count;
unsigned int maxButtonwidth = bestButtonwidth > buttonwidth ? bestButtonwidth : buttonwidth;
+ unsigned int x_max = x + count * maxButtonwidth;
for (unsigned int i = 0; i < count; i++)
{
@@ -78,10 +80,12 @@ void paintButtons(CFrameBuffer * const frameBuffer, Font * const font,
max_iconw = max_iconw>iconw ? max_iconw : iconw;
// get width of buttontext
- fwidth = ((max_iconw+2*space+real_textwidth) > (maxButtonwidth)) ? maxButtonwidth : real_textwidth;
+ maxTextwidth += maxButtonwidth - max_iconw - space;
+ fwidth = (real_textwidth > maxTextwidth) ? maxTextwidth : real_textwidth;
+ maxTextwidth -= fwidth;
// calculate finally buttonwidth
- bwidth = max_iconw + 2*space + fwidth;
+ bwidth = max_iconw + space + fwidth;
// calculate baseline startposition of icon and text in y
ybase = ystart + fheight - fheight / 2;
@@ -91,7 +95,9 @@ void paintButtons(CFrameBuffer * const frameBuffer, Font * const font,
// paint icon and text
frameBuffer->paintIcon(icon, xstart , yicon_start);
int xbuttontext = xstart + max_iconw + space;
- font->RenderString(xbuttontext, ytext_start, bwidth, buttontext, bcolor /*COL_INFOBAR_SHADOW + 1*/, 0, true); // UTF-8
+ if (xbuttontext + fwidth > x_max)
+ fwidth = x_max - xbuttontext; // don't overflow max width
+ font->RenderString(xbuttontext, ytext_start, fwidth, buttontext, bcolor, 0, true); // UTF-8
/* set next startposition x, if text is length=0 then offset is =renderwidth of icon,
* for generating buttons without captions,
diff --git a/tuxbox/neutrino/src/gui/widget/buttons.h b/tuxbox/neutrino/src/gui/widget/buttons.h
index 048c9ea..d106f5e 100644
--- a/tuxbox/neutrino/src/gui/widget/buttons.h
+++ b/tuxbox/neutrino/src/gui/widget/buttons.h
@@ -41,7 +41,7 @@ void paintButtons(CFrameBuffer * const frameBuffer,
const unsigned int buttonwidth,
const unsigned int count,
const struct button_label * const content,
- const unsigned int maxwidth = 720,
+ const unsigned int maxwidth = 0,
bool vertical_paint = false,
const unsigned char bcolor = COL_INFOBAR_SHADOW_PLUS_1,
const char * alt_buttontext = NULL);
diff --git a/tuxbox/neutrino/src/gui/widget/stringinput.cpp b/tuxbox/neutrino/src/gui/widget/stringinput.cpp
index 8316637..90a7402 100644
--- a/tuxbox/neutrino/src/gui/widget/stringinput.cpp
+++ b/tuxbox/neutrino/src/gui/widget/stringinput.cpp
@@ -682,7 +682,7 @@ void CStringInputSMS::paint()
int c_rad_mid = RADIUS_MID;
frameBuffer->paintBoxRel(x, y + height - 25, width, 25, COL_INFOBAR_SHADOW_PLUS_1, c_rad_mid, CORNER_BOTTOM);
- ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 8, y+height-25, 230, 2, CStringInputSMSButtons);
+ ::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, x + 8, y + height - 25, (width - 16) / 2, 2, CStringInputSMSButtons);
}
void CPINInput::paintChar(int pos)
diff --git a/tuxbox/neutrino/src/system/locals.h b/tuxbox/neutrino/src/system/locals.h
index 41c2ece..f4eeae7 100644
--- a/tuxbox/neutrino/src/system/locals.h
+++ b/tuxbox/neutrino/src/system/locals.h
@@ -451,6 +451,7 @@ typedef enum
LOCALE_EVENTLISTBAR_CHANNELSWITCH,
LOCALE_EVENTLISTBAR_EVENTSORT,
LOCALE_EVENTLISTBAR_RECORDEVENT,
+ LOCALE_EVENTLISTBAR_RELOAD,
LOCALE_EXPERIMENTALSETTINGS,
LOCALE_EXPERIMENTALSETTINGS_HEAD,
LOCALE_FAVORITES_ADDCHANNEL,
@@ -963,6 +964,8 @@ typedef enum
LOCALE_MOVIEPLAYER_HEAD,
LOCALE_MOVIEPLAYER_NOSTREAMINGSERVER,
LOCALE_MOVIEPLAYER_PLEASEWAIT,
+ LOCALE_MOVIEPLAYER_PLUGIN,
+ LOCALE_MOVIEPLAYER_RESYNC,
LOCALE_MOVIEPLAYER_TOOMANYBOOKMARKS,
LOCALE_MOVIEPLAYER_TSHELP1,
LOCALE_MOVIEPLAYER_TSHELP10,
diff --git a/tuxbox/neutrino/src/system/locals_intern.h b/tuxbox/neutrino/src/system/locals_intern.h
index 52bbdb4..e1e519a 100644
--- a/tuxbox/neutrino/src/system/locals_intern.h
+++ b/tuxbox/neutrino/src/system/locals_intern.h
@@ -451,6 +451,7 @@ const char * locale_real_names[] =
"eventlistbar.channelswitch",
"eventlistbar.eventsort",
"eventlistbar.recordevent",
+ "eventlistbar.reload",
"experimentalsettings",
"experimentalsettings.head",
"favorites.addchannel",
@@ -963,6 +964,8 @@ const char * locale_real_names[] =
"movieplayer.head",
"movieplayer.nostreamingserver",
"movieplayer.pleasewait",
+ "movieplayer.plugin",
+ "movieplayer.resync",
"movieplayer.toomanybookmarks",
"movieplayer.tshelp1",
"movieplayer.tshelp10",
commit ed450e164dec029152a19cf00ddddbce10faf54c
Author: Christian Schuett <Gau...@ho...>
Date: Tue Mar 19 20:25:17 2013 +0100
Neutrino: fix overflowing text in infobar
prevent satfind values from overflowing the infobar
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/infoviewer.cpp b/tuxbox/neutrino/src/gui/infoviewer.cpp
index 41cbb06..320dec5 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.cpp
+++ b/tuxbox/neutrino/src/gui/infoviewer.cpp
@@ -188,22 +188,22 @@ void CInfoViewer::showSatfind()
frameBuffer->paintBoxRel(ChanInfoX, BoxEndY, BoxEndX-ChanInfoX, 30, COL_INFOBAR_PLUS_0);
sprintf (percent, "sig %d%%", sig);
- g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX+ 10, BoxEndY+ 25, BoxEndX, percent, COL_INFOBAR_PLUS_0, 0, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX+ 10, BoxEndY+ 25, BoxEndX- ChanInfoX- 10, percent, COL_INFOBAR_PLUS_0, 0, true); // UTF-8
pbsig.paintProgressBar(ChanInfoX+ 72, BoxEndY+ 7, 60, 15, sig, 100, 0, 0, COL_INFOBAR_PLUS_0, 0, "", COL_INFOBAR);
sprintf (percent, "snr %d%%", snr);
- g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX+ 140, BoxEndY+ 25, BoxEndX, percent, COL_INFOBAR_PLUS_0, 0, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX+ 140, BoxEndY+ 25, BoxEndX- ChanInfoX- 140, percent, COL_INFOBAR_PLUS_0, 0, true); // UTF-8
pbsnr.paintProgressBar(ChanInfoX+202 , BoxEndY+ 7, 60, 15, snr, 100, 0, 0, COL_INFOBAR_PLUS_0, 0, "", COL_INFOBAR);
sprintf (percent, "ber %d%%", ber);
- g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX+ 270, BoxEndY+ 25, BoxEndX, percent, COL_INFOBAR_PLUS_0, 0, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX+ 270, BoxEndY+ 25, BoxEndX- ChanInfoX- 270, percent, COL_INFOBAR_PLUS_0, 0, true); // UTF-8
- g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX+ 350, BoxEndY+ 25, BoxEndX, freq, COL_INFOBAR_PLUS_0, 0, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX+ 350, BoxEndY+ 25, BoxEndX- ChanInfoX- 350, freq, COL_INFOBAR_PLUS_0, 0, true); // UTF-8
if (satpos != 0 && (g_info.delivery_system == DVB_S))
{
sprintf (pos, "%d.%d%c", satpos < 0 ? -satpos / 10 : satpos / 10, satpos < 0 ? -satpos % 10 : satpos % 10, satpos < 0 ? 'W' : 'E');
- g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(BoxEndX- 60, BoxEndY+ 25, BoxEndX, pos, COL_INFOBAR_PLUS_0, 0, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(BoxEndX- 60, BoxEndY+ 25, 60, pos, COL_INFOBAR_PLUS_0, 0, true); // UTF-8
}
}
}
commit 76dbda03bf959bb9a83b624eb96de70a78a82478
Author: Christian Schuett <Gau...@ho...>
Date: Sun Mar 17 19:48:49 2013 +0100
stringinput.cpp: fix paint in input classes
move the calling of init() into exec() to avoid wrong size calculation
of CStringInputSMS window and to avoid a segfault while accessing
uninitialized variables in CPLPINInput::exec()
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/widget/stringinput.cpp b/tuxbox/neutrino/src/gui/widget/stringinput.cpp
index f79628a..8316637 100644
--- a/tuxbox/neutrino/src/gui/widget/stringinput.cpp
+++ b/tuxbox/neutrino/src/gui/widget/stringinput.cpp
@@ -297,6 +297,7 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & )
strncpy(oldval, value, size);
dispval[0] = 0;
+ init();
paint();
unsigned long long timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
@@ -454,7 +455,6 @@ const char * CStringInput::getHint1(void)
void CStringInput::paint()
{
- init();
int iconoffset, c_rad_mid = RADIUS_MID;
frameBuffer->paintBoxRel(x, y, width, hheight, COL_MENUHEAD_PLUS_0, c_rad_mid, CORNER_TOP);
@@ -558,9 +558,6 @@ void CStringInputSMS::initSMS(const char * const Valid_Chars)
Chars[i][j++] = ' '; // prevent empty char lists
arraySizes[i] = j;
}
-
- height+=260;
- y = ((500-height)>>1);
}
void CStringInputSMS::NormalKeyPressed(const neutrino_msg_t key)
@@ -673,6 +670,9 @@ const struct button_label CStringInputSMSButtons[2] =
void CStringInputSMS::paint()
{
+ height+=260;
+ y = ((500-height)>>1);
+
CStringInput::paint();
int iconw, iconh;
@@ -703,6 +703,7 @@ int CPINInput::exec( CMenuTarget* parent, const std::string & )
for(int count=strlen(value)-1;count<size-1;count++)
strcat(value, " ");
+ CStringInput::init();
paint();
bool loop = true;
@@ -813,6 +814,8 @@ const char * CPLPINInput::getHint1(void)
int CPLPINInput::exec( CMenuTarget* parent, const std::string & )
{
+ CStringInput::init();
+
fb_pixel_t * pixbuf = new fb_pixel_t[(width+ 2* borderwidth) * (height+ 2* borderwidth)];
if (pixbuf != NULL)
commit bb0961cbcceb6411f9d10fed92fccfa753e0159a
Author: svenhoefer <sve...@sv...>
Date: Sat Mar 16 17:59:21 2013 +0100
Neutrino locale: two little requested fixes (typo and intelligibility)
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/data/locale/deutsch.locale b/tuxbox/neutrino/data/locale/deutsch.locale
index 74c06dc..e18d2f7 100644
--- a/tuxbox/neutrino/data/locale/deutsch.locale
+++ b/tuxbox/neutrino/data/locale/deutsch.locale
@@ -1248,7 +1248,7 @@ satsetup.long Längengrad Ort
satsetup.minidiseqc Mini-DiSEqC
satsetup.motorcontrol Manueller Motor-Setup
satsetup.motorspeed Motorgeschwindigkeit
-satsetup.nodiseqc Kein DiSEqC
+satsetup.nodiseqc kein DiSEqC
satsetup.north Nord
satsetup.satellite Satellit
satsetup.savesettingsnow Einstellungen jetzt speichern
diff --git a/tuxbox/neutrino/data/locale/english.locale b/tuxbox/neutrino/data/locale/english.locale
index 3e09a55..f14024e 100644
--- a/tuxbox/neutrino/data/locale/english.locale
+++ b/tuxbox/neutrino/data/locale/english.locale
@@ -1402,7 +1402,7 @@ streamingserver.noconnect No connection to streamingserver.\nRecording canceled.
stringinput.caps caps / no caps
stringinput.clear clear all
subtitles.head Subtitles
-timer.eventrecord.msg ... TO be DONE, or not to be done
+timer.eventrecord.msg The event is scheduled for recording.\nTo edit the schedule open the timer list.
timer.eventrecord.title Schedule Record
timer.eventtimed.msg The event is scheduled.\nThe dbox2 will power on and \nswitch to this channel at the given time.
timer.eventtimed.title Schedule Event
commit 8844a62fab2a41f16cde5f92f722b0a8dca42515
Author: Christian Schuett <Gau...@ho...>
Date: Sun Mar 3 19:12:05 2013 +0100
Neutrino: reinit EPG viewer and event list after changing OSD region
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/screensetup.cpp b/tuxbox/neutrino/src/gui/screensetup.cpp
index 0935a78..8a6f4c7 100644
--- a/tuxbox/neutrino/src/gui/screensetup.cpp
+++ b/tuxbox/neutrino/src/gui/screensetup.cpp
@@ -100,6 +100,9 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &)
g_settings.screen_StartY = y_coord[0];
g_settings.screen_EndY = y_coord[1];
frameBuffer->setScreenSize(g_settings.screen_StartX, g_settings.screen_StartY, g_settings.screen_EndX, g_settings.screen_EndY);
+ // reinit
+ g_EpgData->start();
+ g_EventList->init();
loop = false;
break;
commit dd4e304799b7b818ebd1b583e0448f6d057b4e4f
Author: Christian Schuett <Gau...@ho...>
Date: Sat Mar 2 17:02:59 2013 +0100
Neutrino: reinit infobar, EPG viewer and event list after changing font size
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/eventlist.cpp b/tuxbox/neutrino/src/gui/eventlist.cpp
index f4ea133..aaa656d 100644
--- a/tuxbox/neutrino/src/gui/eventlist.cpp
+++ b/tuxbox/neutrino/src/gui/eventlist.cpp
@@ -99,8 +99,18 @@ EventList::EventList()
m_search_channel_id = 1;
m_search_bouquet_id= 1;
- //width = 580;
- //height = 480;
+ liststart = 0;
+ sort_mode = 0;
+
+ init();
+}
+
+EventList::~EventList()
+{
+}
+
+void EventList::init()
+{
width = w_max (590, 20);
height = h_max (480, 20);
@@ -116,18 +126,10 @@ EventList::EventList()
fwidth1 = g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->getRenderWidth("DDD, 00:00, ");
fwidth2 = g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMSMALL]->getRenderWidth("[999 min] ");
-
listmaxshow = (height-theight-iheight-0)/fheight;
height = theight+iheight+0+listmaxshow*fheight; // recalc height
x = getScreenStartX (width);
y = getScreenStartY (height);
- liststart = 0;
- sort_mode = 0;
-}
-
-
-EventList::~EventList()
-{
}
void EventList::UpdateTimerList(void)
diff --git a/tuxbox/neutrino/src/gui/eventlist.h b/tuxbox/neutrino/src/gui/eventlist.h
index 6b5b03b..56fcbd5 100644
--- a/tuxbox/neutrino/src/gui/eventlist.h
+++ b/tuxbox/neutrino/src/gui/eventlist.h
@@ -140,6 +140,7 @@ class EventList
public:
EventList();
~EventList();
+ void init();
int exec(const t_channel_id channel_id, const std::string& channelname, const CChannelEventList &followlist = CChannelEventList()); // UTF-8
};
diff --git a/tuxbox/neutrino/src/gui/infoviewer.cpp b/tuxbox/neutrino/src/gui/infoviewer.cpp
index e1cc0d7..41cbb06 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.cpp
+++ b/tuxbox/neutrino/src/gui/infoviewer.cpp
@@ -120,6 +120,7 @@ CInfoViewer::CInfoViewer()
gotTime = g_Sectionsd->getIsTimeSet();
CA_Status = false;
virtual_zap_mode = false;
+ lcdUpdateTimer = 0;
}
void CInfoViewer::start()
@@ -138,7 +139,8 @@ void CInfoViewer::start()
time_dot_width = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getRenderWidth(":");
time_width = time_left_width* 2+ time_dot_width;
- lcdUpdateTimer = g_RCInput->addTimer( LCD_UPDATE_TIME_TV_MODE, false, true );
+ if (lcdUpdateTimer == 0)
+ lcdUpdateTimer = g_RCInput->addTimer( LCD_UPDATE_TIME_TV_MODE, false, true );
}
void CInfoViewer::showSatfind()
diff --git a/tuxbox/neutrino/src/gui/osd_setup.cpp b/tuxbox/neutrino/src/gui/osd_setup.cpp
index 2d0d2a4..d0f9d38 100644
--- a/tuxbox/neutrino/src/gui/osd_setup.cpp
+++ b/tuxbox/neutrino/src/gui/osd_setup.cpp
@@ -700,6 +700,9 @@ bool CFontSizeNotifier::changeNotify(const neutrino_locale_t OptionName, void *
hintBox.paint();
CNeutrinoApp::getInstance()->SetupFonts();
+ g_InfoViewer->start();
+ g_EpgData->start();
+ g_EventList->init();
hintBox.hide();
commit d111c4e6c462f3032d8137fa42bdb37c44572fe6
Author: Christian Schuett <Gau...@ho...>
Date: Fri Mar 1 22:22:50 2013 +0100
CMenuOption*Chooser: get current font height in paint()
font heights could change at runtime, so don't store them
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/widget/menue.cpp b/tuxbox/neutrino/src/gui/widget/menue.cpp
index 90ebb92..1860107 100644
--- a/tuxbox/neutrino/src/gui/widget/menue.cpp
+++ b/tuxbox/neutrino/src/gui/widget/menue.cpp
@@ -702,7 +702,6 @@ void CMenuWidget::addIntroItems(neutrino_locale_t subhead_text, neutrino_locale_
//-------------------------------------------------------------------------------------------------------------------------------
CMenuOptionNumberChooser::CMenuOptionNumberChooser(const neutrino_locale_t name, int * const OptionValue, const bool Active, const int min_value, const int max_value, const int print_offset, const int special_value, const neutrino_locale_t special_value_name, const char * non_localized_name, const neutrino_msg_t DirectKey, const std::string & IconName)
{
- height = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
optionName = name;
active = Active;
optionValue = OptionValue;
@@ -721,6 +720,11 @@ CMenuOptionNumberChooser::CMenuOptionNumberChooser(const neutrino_locale_t name,
iconName = IconName;
}
+int CMenuOptionNumberChooser::getHeight(void) const
+{
+ return g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
+}
+
int CMenuOptionNumberChooser::exec(CMenuTarget*)
{
if (((*optionValue) >= upper_bound) || ((*optionValue) < lower_bound))
@@ -736,6 +740,7 @@ int CMenuOptionNumberChooser::exec(CMenuTarget*)
int CMenuOptionNumberChooser::paint(bool selected)
{
CFrameBuffer * frameBuffer = CFrameBuffer::getInstance();
+ int height = getHeight();
unsigned char color = COL_MENUCONTENT;
fb_pixel_t bgcolor = COL_MENUCONTENT_PLUS_0;
@@ -789,7 +794,6 @@ int CMenuOptionNumberChooser::paint(bool selected)
CMenuOptionChooser::CMenuOptionChooser(const neutrino_locale_t OptionName, int * const OptionValue, const struct keyval * const Options, const unsigned Number_Of_Options, const bool Active, CChangeObserver * const Observ, const neutrino_msg_t DirectKey, const std::string & IconName)
{
- height = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
optionNameString = g_Locale->getText(OptionName);
optionName = OptionName;
options = Options;
@@ -803,7 +807,6 @@ CMenuOptionChooser::CMenuOptionChooser(const neutrino_locale_t OptionName, int *
CMenuOptionChooser::CMenuOptionChooser(const char* OptionName, int * const OptionValue, const struct keyval * const Options, const unsigned Number_Of_Options, const bool Active, CChangeObserver * const Observ, const neutrino_msg_t DirectKey, const std::string & IconName)
{
- height = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
optionNameString = OptionName;
optionName = NONEXISTANT_LOCALE;
options = Options;
@@ -815,6 +818,11 @@ CMenuOptionChooser::CMenuOptionChooser(const char* OptionName, int * const Optio
iconName = IconName;
}
+int CMenuOptionChooser::getHeight(void) const
+{
+ return g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
+}
+
void CMenuOptionChooser::setOptionValue(const int newvalue)
{
*optionValue = newvalue;
@@ -858,6 +866,7 @@ int CMenuOptionChooser::exec(CMenuTarget*)
int CMenuOptionChooser::paint( bool selected )
{
CFrameBuffer * frameBuffer = CFrameBuffer::getInstance();
+ int height = getHeight();
unsigned char color = COL_MENUCONTENT;
fb_pixel_t bgcolor = COL_MENUCONTENT_PLUS_0;
@@ -914,7 +923,6 @@ int CMenuOptionChooser::paint( bool selected )
CMenuOptionStringChooser::CMenuOptionStringChooser(const neutrino_locale_t OptionName, char* OptionValue, bool Active, CChangeObserver* Observ)
{
- height = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
optionName = OptionName;
active = Active;
optionValue = OptionValue;
@@ -924,6 +932,11 @@ CMenuOptionStringChooser::CMenuOptionStringChooser(const neutrino_locale_t Optio
iconName = "";
}
+int CMenuOptionStringChooser::getHeight(void) const
+{
+ return g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
+}
+
void CMenuOptionStringChooser::removeOptions()
{
options.clear();
@@ -965,6 +978,8 @@ int CMenuOptionStringChooser::exec(CMenuTarget*)
int CMenuOptionStringChooser::paint( bool selected )
{
+ int height = getHeight();
+
unsigned char color = COL_MENUCONTENT;
fb_pixel_t bgcolor = COL_MENUCONTENT_PLUS_0;
if (selected)
diff --git a/tuxbox/neutrino/src/gui/widget/menue.h b/tuxbox/neutrino/src/gui/widget/menue.h
index 4c78ae6..6856a33 100644
--- a/tuxbox/neutrino/src/gui/widget/menue.h
+++ b/tuxbox/neutrino/src/gui/widget/menue.h
@@ -202,14 +202,8 @@ class CAbstractMenuOptionChooser : public CMenuItem
{
protected:
neutrino_locale_t optionName;
- int height;
int * optionValue;
- int getHeight(void) const
- {
- return height;
- }
-
bool isSelectable(void) const
{
return active;
@@ -232,6 +226,7 @@ class CMenuOptionNumberChooser : public CAbstractMenuOptionChooser
CMenuOptionNumberChooser(const neutrino_locale_t name, int * const OptionValue, const bool Active, const int min_value, const int max_value, const int print_offset = 0, const int special_value = 0, const neutrino_locale_t special_value_name = NONEXISTANT_LOCALE, const char * non_localized_name = NULL, const neutrino_msg_t DirectKey = CRCInput::RC_nokey, const std::string & IconName = "");
int paint(bool selected);
+ int getHeight(void) const;
int exec(CMenuTarget* parent);
};
@@ -259,6 +254,7 @@ class CMenuOptionChooser : public CAbstractMenuOptionChooser
int getOptionValue(void) const;
int paint(bool selected);
+ int getHeight(void) const;
std::string getOptionName() {return optionNameString;};
int exec(CMenuTarget* parent);
@@ -267,7 +263,6 @@ class CMenuOptionChooser : public CAbstractMenuOptionChooser
class CMenuOptionStringChooser : public CMenuItem
{
neutrino_locale_t optionName;
- int height;
char * optionValue;
std::vector<std::string> options;
CChangeObserver * observ;
@@ -279,10 +274,7 @@ class CMenuOptionStringChooser : public CMenuItem
void addOption(const char * value);
void removeOptions(void);
int paint(bool selected);
- int getHeight(void) const
- {
- return height;
- }
+ int getHeight(void) const;
bool isSelectable(void) const
{
return active;
commit 06223d8149981c055c407bda93fd13fceb08eca6
Author: Christian Schuett <Gau...@ho...>
Date: Fri Mar 1 22:21:43 2013 +0100
CStringInput: move init of 'selected' into constructors
this avoids a reset of the cursor position when paint() is called
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/widget/stringinput.cpp b/tuxbox/neutrino/src/gui/widget/stringinput.cpp
index 6d7ace3..f79628a 100644
--- a/tuxbox/neutrino/src/gui/widget/stringinput.cpp
+++ b/tuxbox/neutrino/src/gui/widget/stringinput.cpp
@@ -58,6 +58,7 @@ CStringInput::CStringInput(const neutrino_locale_t Name, char* Value, int Size,
valueString = NULL;
valueStringIsUtf8 = false;
size = Size;
+ selected = 0;
hint_1 = Hint_1;
hint_2 = Hint_2;
@@ -80,6 +81,7 @@ CStringInput::CStringInput(const neutrino_locale_t Name, std::string* Value, int
valueString = Value;
valueStringIsUtf8 = ValueIsUtf8;
size = Size;
+ selected = 0;
hint_1 = Hint_1;
hint_2 = Hint_2;
@@ -124,11 +126,8 @@ void CStringInput::init()
x = ((720-width)>>1);
y = ((500-height)>>1);
- selected = 0;
-
}
-
void CStringInput::NormalKeyPressed(const neutrino_msg_t key)
{
if (CRCInput::isNumeric(key))
commit d6d6813aa578d4a918c633b4e46a6e9c9c303948
Author: GetAway <get...@t-...>
Date: Thu Mar 7 19:42:31 2013 +0100
increase size of returned CurrentNext text
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp b/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
index bfb7124..633994e 100644
--- a/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
+++ b/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
@@ -1,5 +1,5 @@
//
-// $Id: sectionsd.cpp,v 1.344 2012/09/23 08:25:00 rhabarber1848 Exp $
+// $Id: sectionsd.cpp,v 1.345 2013/03/07 19:30:00 GetAway Exp Exp $
//
// sectionsd.cpp (network daemon for SI-sections)
// (dbox-II-project)
@@ -2606,7 +2606,7 @@ static void commandDumpStatusInformation(int connfd, char* /*data*/, const unsig
char stati[MAX_SIZE_STATI];
snprintf(stati, MAX_SIZE_STATI,
- "$Id: sectionsd.cpp,v 1.344 2012/09/23 08:25:00 rhabarber1848 Exp $\n"
+ "$Id: sectionsd.cpp,v 1.345 2013/03/07 19:30:00 GetAway Exp $\n"
"%sCurrent time: %s"
"Hours to cache: %ld\n"
"Hours to cache extended text: %ld\n"
@@ -3810,7 +3810,7 @@ static void sendEventList(int connfd, const unsigned char serviceTyp1, const uns
count += sizeof(event_id_t) + 4 + 4 + eName.length() + 1;
if (eText.empty())
{
- count += eExtendedText.substr(0, 50).length();
+ count += eExtendedText.substr(0, 95).length();
}
else
{
@@ -3831,7 +3831,8 @@ static void sendEventList(int connfd, const unsigned char serviceTyp1, const uns
if (eText.empty())
{
- strcpy(liste, eExtendedText.substr(0, 50).c_str());
+ /* we need about 95 chars for infobox, when using smallest font zoom factor*/
+ strcpy(liste, eExtendedText.substr(0, 95).c_str());
liste += strlen(liste);
}
else
@@ -8589,7 +8590,7 @@ int main(int argc, char **argv)
struct sched_param parm;
- printf("$Id: sectionsd.cpp,v 1.344 2012/09/23 08:25:00 rhabarber1848 Exp $\n");
+ printf("$Id: sectionsd.cpp,v 1.345 2013/03/07 19:30:00 GetAway Exp $\n");
#ifdef ENABLE_FREESATEPG
printf("[sectionsd] FreeSat enabled\n");
#endif
commit 346b925b26e17f501b2552dbe3e19a13c09dc9d6
Author: GetAway <get...@t-...>
Date: Thu Feb 28 21:27:47 2013 +0100
fontrenderer.cpp: add forgotten fix from coolstream port
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/driver/fontrenderer.cpp b/tuxbox/neutrino/src/driver/fontrenderer.cpp
index 050b495..aefeb31 100644
--- a/tuxbox/neutrino/src/driver/fontrenderer.cpp
+++ b/tuxbox/neutrino/src/driver/fontrenderer.cpp
@@ -452,17 +452,25 @@ void Font::RenderString(int x, int y, const int width, const char *text, const u
for (; *text; text++)
{
FTC_SBit glyph;
- if (*text=='\n')
- {
- x = left;
- y += step_y;
- }
int unicode_value = UTF8ToUnicode(text, utf8_encoded);
if (unicode_value == -1)
break;
+ if (*text=='\n')
+ {
+ /* a '\n' in the text is basically an error, it should not have come
+ until here. To find the offenders, we replace it with a paragraph
+ marker */
+ unicode_value = 0x00b6; /* ¶ PILCROW SIGN */
+ /* this did not work anyway - pen1 overrides x value down below :-)
+ and there are no checks that we don't leave our assigned box
+ x = left;
+ y += step_y;
+ */
+ }
+
int index = FT_Get_Char_Index(face, unicode_value);
if (!index)
commit 21e23bf1da812e6f1aa08d8c222414f17d3038e7
Author: Christian Schuett <Gau...@ho...>
Date: Thu Feb 28 19:54:50 2013 +0100
follow-up to commit 07fcbdc
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/osd_setup.cpp b/tuxbox/neutrino/src/gui/osd_setup.cpp
index f915f5b..2d0d2a4 100644
--- a/tuxbox/neutrino/src/gui/osd_setup.cpp
+++ b/tuxbox/neutrino/src/gui/osd_setup.cpp
@@ -603,7 +603,7 @@ int COsdSetup::showOsdFontSizeSetup()
CMenuWidget * fontSettings = new CMenuWidget(menue_title, menue_icon, width);
fontSettings->addIntroItems(LOCALE_FONTMENU_HEAD);
- CMenuWidget * fontscale = new CMenuWidget(LOCALE_FONTMENU_HEAD, NEUTRINO_ICON_COLORS, width/*, MN_WIDGET_ID_OSDSETUP_FONTSCALE*/);
+ CMenuWidget * fontscale = new CMenuWidget(LOCALE_FONTMENU_HEAD, menue_icon, width);
fontscale->addIntroItems(LOCALE_FONTMENU_SCALING);
CStringInput xres_count(LOCALE_FONTMENU_SCALING_X, val_x,/*50,200,*/ 3, LOCALE_FONTMENU_SCALING, LOCALE_FONTMENU_SCALING_X_HINT2, "0123456789 ", fontsizenotifier);
@@ -627,7 +627,7 @@ int COsdSetup::showOsdFontSizeSetup()
for (int i = 0; i < 5; i++)
{
- CMenuWidget * fontSettingsSubMenu = new CMenuWidget(font_sizes_groups[i].groupname, NEUTRINO_ICON_COLORS, width);
+ CMenuWidget * fontSettingsSubMenu = new CMenuWidget(font_sizes_groups[i].groupname, menue_icon, width);
toDelete.push_back(fontSettingsSubMenu);
fontSettingsSubMenu->addIntroItems();
for (unsigned int j = 0; j < font_sizes_groups[i].count; j++)
@@ -680,7 +680,7 @@ bool CFontSizeNotifier::changeNotify(const neutrino_locale_t OptionName, void *
snprintf((char *)data,sizeof(data), "%03d",g_settings.screen_xres);
}
}
- if (ARE_LOCALES_EQUAL(OptionName, LOCALE_FONTMENU_SCALING_Y))
+ else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_FONTMENU_SCALING_Y))
{
yre = atoi(val);
if( yre < 50 || yre > 200 ) {
@@ -688,6 +688,7 @@ bool CFontSizeNotifier::changeNotify(const neutrino_locale_t OptionName, void *
snprintf((char *)data,sizeof(data), "%03d",g_settings.screen_yres);
}
}
+
if (xre != g_settings.screen_xres || yre != g_settings.screen_yres) {
printf("[neutrino] new font scale settings x: %d%% y: %d%%\n", xre, yre);
g_settings.screen_xres = xre;
diff --git a/tuxbox/neutrino/src/gui/widget/stringinput.cpp b/tuxbox/neutrino/src/gui/widget/stringinput.cpp
index 8eb9b36..6d7ace3 100644
--- a/tuxbox/neutrino/src/gui/widget/stringinput.cpp
+++ b/tuxbox/neutrino/src/gui/widget/stringinput.cpp
@@ -87,7 +87,6 @@ CStringInput::CStringInput(const neutrino_locale_t Name, std::string* Value, int
iconfile = Icon ? Icon : "";
observ = Observ;
- init();
}
CStringInput::~CStringInput()
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp | 11 +++---
tuxbox/neutrino/data/locale/deutsch.locale | 5 ++-
tuxbox/neutrino/data/locale/english.locale | 5 ++-
tuxbox/neutrino/src/driver/fontrenderer.cpp | 18 +++++++---
tuxbox/neutrino/src/gui/audioplayer.cpp | 23 +++++++------
.../src/gui/bedit/bouqueteditor_bouquets.cpp | 2 +-
.../src/gui/bedit/bouqueteditor_channels.cpp | 2 +-
.../src/gui/bedit/bouqueteditor_chanselect.cpp | 2 +-
tuxbox/neutrino/src/gui/bouquetlist.cpp | 4 +-
tuxbox/neutrino/src/gui/channellist.cpp | 4 +-
tuxbox/neutrino/src/gui/epgplus.cpp | 2 +-
tuxbox/neutrino/src/gui/epgview.cpp | 6 ++--
tuxbox/neutrino/src/gui/eventlist.cpp | 35 ++++++++++---------
tuxbox/neutrino/src/gui/eventlist.h | 1 +
tuxbox/neutrino/src/gui/filebrowser.cpp | 6 ++--
tuxbox/neutrino/src/gui/imageinfo.cpp | 5 +--
tuxbox/neutrino/src/gui/infoviewer.cpp | 20 ++++++-----
tuxbox/neutrino/src/gui/motorcontrol.cpp | 13 ++++---
tuxbox/neutrino/src/gui/osd_setup.cpp | 10 ++++--
tuxbox/neutrino/src/gui/screensetup.cpp | 3 ++
tuxbox/neutrino/src/gui/streaminfo2.cpp | 4 +-
tuxbox/neutrino/src/gui/timerlist.cpp | 18 +++-------
tuxbox/neutrino/src/gui/widget/buttons.cpp | 14 ++++++--
tuxbox/neutrino/src/gui/widget/buttons.h | 2 +-
tuxbox/neutrino/src/gui/widget/menue.cpp | 23 +++++++++++--
tuxbox/neutrino/src/gui/widget/menue.h | 14 ++------
tuxbox/neutrino/src/gui/widget/stringinput.cpp | 19 ++++++-----
tuxbox/neutrino/src/system/locals.h | 3 ++
tuxbox/neutrino/src/system/locals_intern.h | 3 ++
29 files changed, 159 insertions(+), 118 deletions(-)
--
Tuxbox-GIT: apps
|
