From 0f45e267286f1158c82ec923c5fb6942afb88a27 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Mon, 22 Dec 2014 09:15:26 +0100 Subject: [PATCH] - hintbox: allow plain neutrino locales in bodytext --- src/gui/widget/hintbox.cpp | 12 ++++++++++++ src/gui/widget/hintbox.h | 2 ++ 2 files changed, 14 insertions(+) diff --git a/src/gui/widget/hintbox.cpp b/src/gui/widget/hintbox.cpp index 217722790..eb9900a58 100644 --- a/src/gui/widget/hintbox.cpp +++ b/src/gui/widget/hintbox.cpp @@ -42,11 +42,23 @@ CHintBox::CHintBox(const neutrino_locale_t Caption, const char * const Text, con 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) { 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) { char * begin; diff --git a/src/gui/widget/hintbox.h b/src/gui/widget/hintbox.h index d58761c7d..460d9f556 100644 --- a/src/gui/widget/hintbox.h +++ b/src/gui/widget/hintbox.h @@ -65,7 +65,9 @@ class CHintBox public: // 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 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 neutrino_locale_t Text, const int Width = 450, const char * const Icon = NEUTRINO_ICON_INFO); ~CHintBox(void); bool has_scrollbar(void);