From 1f986e14af5dd6aab55c322e7edabeb98cb37f9e Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sun, 12 Sep 2010 11:43:51 +0000 Subject: i18n: Add lowres context in a few places. I also changed the english text for the GUI Renderer items in 1x mode as the text was tool long and cut. svn-id: r52683 --- gui/ThemeEngine.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gui/ThemeEngine.cpp') diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index 9cc98d83ce..eb388272c8 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -331,15 +331,12 @@ ThemeEngine::~ThemeEngine() { * Rendering mode management *********************************************************/ const ThemeEngine::Renderer ThemeEngine::_rendererModes[] = { - { _s("Disabled GFX"), "none", kGfxDisabled }, - { _s("Standard Renderer (16bpp)"), "normal_16bpp", kGfxStandard16bit }, + { _s("Disabled GFX"), _sc("Disabled GFX", "lowres"), "none", kGfxDisabled }, + { _s("Standard Renderer (16bpp)"), _s("Standard (16bpp)"), "normal_16bpp", kGfxStandard16bit }, #ifndef DISABLE_FANCY_THEMES - { _s("Antialiased Renderer (16bpp)"), "aa_16bpp", kGfxAntialias16bit } + { _s("Antialiased Renderer (16bpp)"), _s("Antialiased (16bpp)"), "aa_16bpp", kGfxAntialias16bit } #endif }; - -DECLARE_TRANSLATION_ADDITIONAL_CONTEXT("Standard Renderer (16bpp)", "lowres") -DECLARE_TRANSLATION_ADDITIONAL_CONTEXT("Antialiased Renderer (16bpp)", "lowres") const uint ThemeEngine::_rendererModesSize = ARRAYSIZE(ThemeEngine::_rendererModes); -- cgit v1.2.3 From 2a353089aa4863be3d0255fe1a8f65dbabb8c2c1 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 14 Sep 2010 00:34:12 +0000 Subject: GUI: Remove dead code. This code was added when tooltip support was added. Since we changed the way how tooltips are drawn later on, this code is not required anymore. Actually it was never used, but it could've been used to save/restore the state of the GUI for the tooltips. svn-id: r52717 --- gui/ThemeEngine.cpp | 64 ----------------------------------------------------- 1 file changed, 64 deletions(-) (limited to 'gui/ThemeEngine.cpp') diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index eb388272c8..0d0fe8aecd 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -1189,70 +1189,6 @@ void ThemeEngine::debugWidgetPosition(const char *name, const Common::Rect &r) { _screen.vLine(r.right, r.top, r.bottom, 0xFFFF); } -ThemeEngine::StoredState *ThemeEngine::storeState(const Common::Rect &r) { - StoredState *state = new StoredState; - byte *dst; - byte *src; - - state->r.top = r.top; - state->r.bottom = r.bottom; - state->r.left = r.left; - state->r.right = r.right; - - state->r.clip(_screen.w, _screen.h); - - state->screen.create(state->r.width(), state->r.height(), _screen.bytesPerPixel); - state->backBuffer.create(state->r.width(), state->r.height(), _backBuffer.bytesPerPixel); - - src = (byte *)_screen.getBasePtr(state->r.left, state->r.top); - dst = (byte *)state->screen.getBasePtr(0, 0); - - for (int i = state->r.height(); i > 0; i--) { - memcpy(dst, src, state->r.width() * _screen.bytesPerPixel); - src += _screen.pitch; - dst += state->screen.pitch; - } - - src = (byte *)_backBuffer.getBasePtr(state->r.left, state->r.top); - dst = (byte *)state->backBuffer.getBasePtr(0, 0); - - for (int i = state->r.height(); i > 0; i--) { - memcpy(dst, src, state->r.width() * _backBuffer.bytesPerPixel); - src += _backBuffer.pitch; - dst += state->backBuffer.pitch; - } - - return state; -} - -void ThemeEngine::restoreState(StoredState *state) { - byte *dst; - byte *src; - - if (!state) - return; - - src = (byte *)state->screen.getBasePtr(0, 0); - dst = (byte *)_screen.getBasePtr(state->r.left, state->r.top); - - for (int i = state->r.height(); i > 0; i--) { - memcpy(dst, src, state->r.width() * _screen.bytesPerPixel); - src += state->screen.pitch; - dst += _screen.pitch; - } - - src = (byte *)state->backBuffer.getBasePtr(0, 0); - dst = (byte *)_backBuffer.getBasePtr(state->r.left, state->r.top); - - for (int i = state->r.height(); i > 0; i--) { - memcpy(dst, src, state->r.width() * _backBuffer.bytesPerPixel); - src += state->backBuffer.pitch; - dst += _backBuffer.pitch; - } - - addDirtyRect(state->r); -} - /********************************************************** * Screen/overlay management *********************************************************/ -- cgit v1.2.3 From b1f63deba3afe176646dbf9aae5c22cfab453785 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sat, 25 Sep 2010 22:47:00 +0000 Subject: GUI: Partial fix to bug #3075649 Fonts not found with buit-in theme When the locale font are not found when loading the theme, it now fallbacks to default language (i.e. English) and default font. For this to work I had to move the TranslationManager initialization before the Theme is loaded. Therefore it is now initialized when the GuiManager is constructed. svn-id: r52896 --- gui/ThemeEngine.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gui/ThemeEngine.cpp') diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index 0d0fe8aecd..92ecf0346f 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -579,7 +579,7 @@ bool ThemeEngine::addFont(TextData textId, const Common::String &file) { if (_texts[textId]->_fontPtr) FontMan.assignFontToName(file, _texts[textId]->_fontPtr); - // Fallback to non-localized font + // Fallback to non-localized font and default translation else { // Try built-in fonts _texts[textId]->_fontPtr = FontMan.getFontByName(file); @@ -593,7 +593,8 @@ bool ThemeEngine::addFont(TextData textId, const Common::String &file) { FontMan.assignFontToName(file, _texts[textId]->_fontPtr); } - warning("Failed to load localized font '%s'. Using non-localized font instead", file.c_str()); + TransMan.setLanguage("C"); + warning("Failed to load localized font '%s'. Using non-localized font and default GUI language instead", file.c_str()); } } } -- cgit v1.2.3 From a0c0b934c75bc93f467b9b30f765e31aaf1a1536 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 28 Sep 2010 20:31:17 +0000 Subject: GUI: Replace GUI_ENABLE_BUILTIN_THEME by DISABLE_GUI_BUILTIN_THEME svn-id: r52936 --- gui/ThemeEngine.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gui/ThemeEngine.cpp') diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index 92ecf0346f..3d3aca5c5a 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -44,8 +44,6 @@ #include "gui/ThemeEval.h" #include "gui/ThemeParser.h" -#define GUI_ENABLE_BUILTIN_THEME - namespace GUI { const char * const ThemeEngine::kImageLogo = "logo.bmp"; @@ -714,7 +712,7 @@ bool ThemeEngine::loadDefaultXML() { // file inside the themes directory. // Use the Python script "makedeftheme.py" to convert a normal XML theme // into the "default.inc" file, which is ready to be included in the code. -#ifdef GUI_ENABLE_BUILTIN_THEME +#ifndef DISABLE_GUI_BUILTIN_THEME const char *defaultXML = #include "themes/default.inc" ; @@ -1595,7 +1593,7 @@ struct TDComparator { } // end of anonymous namespace void ThemeEngine::listUsableThemes(Common::List &list) { -#ifdef GUI_ENABLE_BUILTIN_THEME +#ifndef DISABLE_GUI_BUILTIN_THEME ThemeDescriptor th; th.name = "ScummVM Classic Theme (Builtin Version)"; th.id = "builtin"; -- cgit v1.2.3 From 8388e0dfea4ae0d80e51368acd12685c740c5bb5 Mon Sep 17 00:00:00 2001 From: Jordi Vilalta Prat Date: Tue, 12 Oct 2010 02:18:11 +0000 Subject: JANITORAL: Clean trailing whitespaces. svn-id: r53160 --- gui/ThemeEngine.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gui/ThemeEngine.cpp') diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index 3d3aca5c5a..d9a1e05855 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -573,7 +573,7 @@ bool ThemeEngine::addFont(TextData textId, const Common::String &file) { if (!_texts[textId]->_fontPtr) { // First try to load localized font _texts[textId]->_fontPtr = loadFont(localized); - + if (_texts[textId]->_fontPtr) FontMan.assignFontToName(file, _texts[textId]->_fontPtr); @@ -581,14 +581,14 @@ bool ThemeEngine::addFont(TextData textId, const Common::String &file) { else { // Try built-in fonts _texts[textId]->_fontPtr = FontMan.getFontByName(file); - + // Try to load it if (!_texts[textId]->_fontPtr) { _texts[textId]->_fontPtr = loadFont(file); if (!_texts[textId]->_fontPtr) error("Couldn't load font '%s'", file.c_str()); - + FontMan.assignFontToName(file, _texts[textId]->_fontPtr); } TransMan.setLanguage("C"); -- cgit v1.2.3