From 7f68191e0f8bd3fd1557ad9962e05651afc622b9 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 26 Feb 2014 14:34:17 +0100 Subject: [PATCH] Fixed resource loading in Unit test and improved check in sample GUI's main --- samples/blackgui/main.cpp | 5 ++++- samples/blackmiscquantities/main.cpp | 10 ++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/samples/blackgui/main.cpp b/samples/blackgui/main.cpp index d88a86014..4a58d5171 100644 --- a/samples/blackgui/main.cpp +++ b/samples/blackgui/main.cpp @@ -24,7 +24,10 @@ int main(int argc, char *argv[]) QFile file(":blackmisc/translations/blackmisc_i18n_de.qm"); qDebug() << (file.exists() ? "Found translations in resources" : "No translations in resources"); QTranslator translator; - translator.load("blackmisc_i18n_de", ":blackmisc/translations/"); + if (translator.load("blackmisc_i18n_de", ":blackmisc/translations/")) + { + qDebug() << "Translator loaded"; + } // app QApplication a(argc, argv); diff --git a/samples/blackmiscquantities/main.cpp b/samples/blackmiscquantities/main.cpp index 147754977..5137b9b5f 100644 --- a/samples/blackmiscquantities/main.cpp +++ b/samples/blackmiscquantities/main.cpp @@ -17,16 +17,18 @@ using namespace BlackMiscTest; int main(int argc, char *argv[]) { BlackMisc::initResources(); - QFile file(":/translations/blackmisc_i18n_de.qm"); + QFile file(":blackmisc/translations/blackmisc_i18n_de.qm"); qDebug() << (file.exists() ? "Found translations in resources" : "No translations in resources"); - QTranslator translator; - translator.load("blackmisc_i18n_de", ":/translations/"); + bool t = translator.load("blackmisc_i18n_de", ":blackmisc/translations/"); + qDebug() << (t ? "Translator loaded" : "Translator not loaded"); + QCoreApplication a(argc, argv); qDebug() << "Use I18N version, y? n?"; int yn = getchar(); - bool t = (yn == 'y' || yn == 'Y') ? a.installTranslator(&translator) : false; + t = (yn == 'y' || yn == 'Y'); + t = t ? a.installTranslator(&translator) : false; qDebug() << (t ? "Installed translator" : "No translator "); CSamplesPhysicalQuantities::samples();