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

hintbox: allow plain neutrino locales in bodytext

Browse Source 
Origin commit data
------------------
Commit: 0f45e26728
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-22 (Mon, 22 Dec 2014)

Origin message was:
------------------
- hintbox: allow plain neutrino locales in bodytext
This commit is contained in:
vanhofen
2014-12-22 09:15:26 +01:00
parent 81203c6677
commit 11d680e053
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/widget/hintbox.cpp
View File

@@ -42,11 +42,23 @@ CHintBox::CHintBox(const neutrino_locale_t Caption, const char * const Text, con
init(caption_tmp, Text, Width, Icon); init(caption_tmp, Text, Width, Icon);
} }
CHintBox::CHintBox(const neutrino_locale_t Caption, const neutrino_locale_t Text, const int Width, const char * const Icon)
{
const char * caption_tmp = g_Locale->getText(Caption);
const char * text_tmp = g_Locale->getText(Text);
init(caption_tmp, text_tmp, Width, Icon);
}
CHintBox::CHintBox(const char * const Caption, const char * const Text, const int Width, const char * const Icon) CHintBox::CHintBox(const char * const Caption, const char * const Text, const int Width, const char * const Icon)
{ {
init(Caption, Text, Width, Icon); init(Caption, Text, Width, Icon);
} }
CHintBox::CHintBox(const char * const Caption, const neutrino_locale_t Text, const int Width, const char * const Icon)
{
const char * text_tmp = g_Locale->getText(Text);
init(Caption, text_tmp, Width, Icon);
}
void CHintBox::init(const char * const Caption, const char * const Text, const int Width, const char * const Icon) void CHintBox::init(const char * const Caption, const char * const Text, const int Width, const char * const Icon)
{ {
char * begin; char * begin;

2
src/gui/widget/hintbox.h
View File

@@ -65,7 +65,9 @@ class CHintBox
public: public:
// Text is UTF-8 encoded // Text is UTF-8 encoded
CHintBox(const neutrino_locale_t Caption, const char * const Text, const int Width = 450, const char * const Icon = NEUTRINO_ICON_INFO); CHintBox(const neutrino_locale_t Caption, const char * const Text, const int Width = 450, const char * const Icon = NEUTRINO_ICON_INFO);
CHintBox(const neutrino_locale_t Caption, const neutrino_locale_t Text, const int Width = 450, const char * const Icon = NEUTRINO_ICON_INFO);
CHintBox(const char * const Caption, const char * const Text, const int Width = 450, const char * const Icon = NEUTRINO_ICON_INFO); CHintBox(const char * const Caption, const char * const Text, const int Width = 450, const char * const Icon = NEUTRINO_ICON_INFO);
CHintBox(const char * const Caption, const neutrino_locale_t Text, const int Width = 450, const char * const Icon = NEUTRINO_ICON_INFO);
~CHintBox(void); ~CHintBox(void);
bool has_scrollbar(void); bool has_scrollbar(void);