From 8f827f10e26bc815b8609d85d17db1c5dc940969 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Tue, 1 Nov 2011 20:46:46 +0000 Subject: Show user friendly name on target mismatch. Instead of showing the target name as stored in rockbox-info.txt retrieve the full descriptive name. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30886 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/base/utils.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rbutil/rbutilqt/base/utils.cpp b/rbutil/rbutilqt/base/utils.cpp index 27e31d65e8..f91f3c25c2 100644 --- a/rbutil/rbutilqt/base/utils.cpp +++ b/rbutil/rbutilqt/base/utils.cpp @@ -315,10 +315,10 @@ QString Utils::checkEnvironment(bool permission) if(!installed.isEmpty() && installed != SystemInfo::value(SystemInfo::CurConfigureModel).toString()) { - text += tr("
  • Target mismatch detected.\n" - "Installed target: %1, selected target: %2.
  • ") - .arg(installed, SystemInfo::value(SystemInfo::CurPlatformName).toString()); - // FIXME: replace installed by human-friendly name + text += tr("
  • Target mismatch detected.
    " + "Installed target: %1
    Selected target: %2.
  • ") + .arg(SystemInfo::platformValue(installed, SystemInfo::CurPlatformName).toString(), + SystemInfo::value(SystemInfo::CurPlatformName).toString()); } if(!text.isEmpty()) -- cgit v1.2.3