mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

*neutrino menue classes: member getName(), setString() optimized

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1436 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
thilo
2011-05-06 18:16:00 +00:00
parent 4eee095aad
commit df0d94a034
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/gui/widget/menue.cpp
View File

@@ -288,7 +288,7 @@ CMenuWidget::CMenuWidget()
CMenuWidget::CMenuWidget(const neutrino_locale_t Name, const std::string & Icon, const int mwidth, const int mheight) CMenuWidget::CMenuWidget(const neutrino_locale_t Name, const std::string & Icon, const int mwidth, const int mheight)
{ {
name = Name; name = Name;
nameString = g_Locale->getText(NONEXISTANT_LOCALE); nameString = g_Locale->getText(Name);
Init(Icon, mwidth, mheight); Init(Icon, mwidth, mheight);
} }
@@ -382,6 +382,13 @@ bool CMenuWidget::hasItem()
return !items.empty(); return !items.empty();
} }
std::string CMenuWidget::getName()
{
if (name != NONEXISTANT_LOCALE)
nameString = g_Locale->getText(name);
return nameString;
}
int CMenuWidget::exec(CMenuTarget* parent, const std::string &) int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
{ {
neutrino_msg_t msg; neutrino_msg_t msg;
@@ -703,13 +710,10 @@ void CMenuWidget::hide()
void CMenuWidget::paint() void CMenuWidget::paint()
{ {
const char * l_name; if (name != NONEXISTANT_LOCALE)
if(name == NONEXISTANT_LOCALE) nameString = g_Locale->getText(name);
l_name = nameString.c_str();
else
l_name = g_Locale->getText(name);
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8 /*, l_name*/); //FIXME menu name CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, nameString.c_str());
height = wanted_height; height = wanted_height;
width = min_width; width = min_width;
@@ -723,7 +727,7 @@ void CMenuWidget::paint()
if(height > ((int)frameBuffer->getScreenHeight() - 10)) if(height > ((int)frameBuffer->getScreenHeight() - 10))
height = frameBuffer->getScreenHeight() - 10; height = frameBuffer->getScreenHeight() - 10;
int neededWidth = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(l_name, true); // UTF-8 int neededWidth = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(nameString.c_str(), true); // UTF-8
if (neededWidth > width-48) { if (neededWidth > width-48) {
width= neededWidth+ 49; width= neededWidth+ 49;
} }
@@ -814,7 +818,7 @@ void CMenuWidget::paint()
frameBuffer->getIconSize(iconfile.c_str(), &w, &h); frameBuffer->getIconSize(iconfile.c_str(), &w, &h);
HeadiconOffset = w+6; HeadiconOffset = w+6;
} }
g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x+(fw/3)+HeadiconOffset,y+hheight+1, width-((fw/3)+HeadiconOffset), l_name, COL_MENUHEAD, 0, true); // UTF-8 g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x+(fw/3)+HeadiconOffset,y+hheight+1, width-((fw/3)+HeadiconOffset), nameString.c_str(), COL_MENUHEAD, 0, true); // UTF-8
frameBuffer->paintIcon(iconfile, x + fw/4, y, hheight); frameBuffer->paintIcon(iconfile, x + fw/4, y, hheight);
item_start_y = y+hheight; item_start_y = y+hheight;
@@ -1533,12 +1537,18 @@ CMenuSeparator::CMenuSeparator(const int Type, const neutrino_locale_t Text)
int CMenuSeparator::getHeight(void) const int CMenuSeparator::getHeight(void) const
{ {
return (text == NONEXISTANT_LOCALE) ? 10 : g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); if (separator_text.empty() && text == NONEXISTANT_LOCALE)
return 10;
else
return g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
} }
const char * CMenuSeparator::getString(void) const char * CMenuSeparator::getString(void)
{ {
return g_Locale->getText(text); if (!separator_text.empty())
return separator_text.c_str();
else
return g_Locale->getText(text);
} }
void CMenuSeparator::setString(const std::string& s_text) void CMenuSeparator::setString(const std::string& s_text)

4
src/gui/widget/menue.h
View File

@@ -163,7 +163,7 @@ class CMenuSeparator : public CMenuItem
int getWidth(void); int getWidth(void);
virtual const char * getString(void); virtual const char * getString(void);
virtual void setString(const std::string& text); void setString(const std::string& text);
}; };
class CMenuForwarder : public CMenuItem class CMenuForwarder : public CMenuItem
@@ -423,7 +423,7 @@ class CMenuWidget : public CMenuTarget
virtual void paint(); virtual void paint();
virtual void hide(); virtual void hide();
virtual int exec(CMenuTarget* parent, const std::string & actionKey); virtual int exec(CMenuTarget* parent, const std::string & actionKey);
virtual std::string getName(){ return nameString;}; virtual std::string getName();
virtual void setSelected(const int &Preselected){ preselected = Preselected; }; virtual void setSelected(const int &Preselected){ preselected = Preselected; };
virtual int getSelected(){ return selected; }; virtual int getSelected(){ return selected; };
void move(int xoff, int yoff); void move(int xoff, int yoff);