X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fapplication.cpp;h=a34a6ca758350671e37a3d8a92ddf195e1e52ede;hb=cf0109112932ac762f0fcfb254036fcfcec2f5b2;hp=67e0444f435b53fa8c67ae3f51a6058db0ba7e37;hpb=380f4ee6f9e2995084afd395698b7eafc7012942;p=pulseview.git

diff --git a/pv/application.cpp b/pv/application.cpp
index 67e0444f..a34a6ca7 100644
--- a/pv/application.cpp
+++ b/pv/application.cpp
@@ -22,6 +22,7 @@
 
 #include <QDebug>
 #include <QDir>
+#include <QLibraryInfo>
 #include <QMessageBox>
 #include <QWidget>
 
@@ -35,6 +36,8 @@
 #include <libsigrokdecode/libsigrokdecode.h>
 #endif
 
+#include <pv/exprtk.hpp>
+
 #include "application.hpp"
 #include "config.h"
 #include "globalsettings.hpp"
@@ -64,15 +67,15 @@ Application::Application(int &argc, char* argv[]) :
 	setOrganizationDomain("sigrok.org");
 }
 
-QStringList Application::get_languages()
+const QStringList Application::get_languages() const
 {
-	QStringList files = QDir(":/l10n/").entryList(QStringList("*.qm"), QDir::Files);
+	const QStringList files = QDir(":/l10n/").entryList(QStringList("*.qm"), QDir::Files);
 
 	QStringList result;
 	result << "en";  // Add default language to the set
 
 	// Remove file extensions
-	for (QString file : files)
+	for (const QString& file : files)
 		result << file.split(".").front();
 
 	result.sort(Qt::CaseInsensitive);
@@ -80,10 +83,19 @@ QStringList Application::get_languages()
 	return result;
 }
 
+const QString Application::get_language_editors(const QString& language) const
+{
+	if (language == "de") return "Sören Apel, Uwe Hermann";
+	if (language == "es_mx") return "Carlos Diaz";
+
+	return QString();
+}
+
 void Application::switch_language(const QString& language)
 {
 	removeTranslator(&app_translator_);
 	removeTranslator(&qt_translator_);
+	removeTranslator(&qtbase_translator_);
 
 	if ((language != "C") && (language != "en")) {
 		// Application translations
@@ -94,11 +106,20 @@ void Application::switch_language(const QString& language)
 			qWarning() << "Translation resource" << resource << "not found";
 
 		// Qt translations
-		resource = ":/l10n/qtbase_" + language +".qm";
-		if (qt_translator_.load(resource))
+		QString tr_path(QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+
+		if (qt_translator_.load("qt_" + language, tr_path))
 			installTranslator(&qt_translator_);
 		else
-			qWarning() << "Translation resource" << resource << "not found";
+			qWarning() << "QT translations for" << language << "not found at" <<
+				tr_path << ", Qt translations package is probably missing";
+
+		// Qt base translations
+		if (qtbase_translator_.load("qtbase_" + language, tr_path))
+			installTranslator(&qtbase_translator_);
+		else
+			qWarning() << "QT base translations for" << language << "not found at" <<
+				tr_path << ", Qt translations package is probably missing";
 	}
 
 	if (!topLevelWidgets().empty()) {
@@ -129,6 +150,7 @@ void Application::collect_version_info(shared_ptr<sigrok::Context> context)
 	version_info_.emplace_back("Qt", qVersion());
 	version_info_.emplace_back("glibmm", PV_GLIBMM_VERSION);
 	version_info_.emplace_back("Boost", BOOST_LIB_VERSION);
+	version_info_.emplace_back("exprtk", QString::fromUtf8(exprtk::information::date));
 
 	version_info_.emplace_back("libsigrok", QString("%1/%2 (rt: %3/%4)")
 		.arg(SR_PACKAGE_VERSION_STRING, SR_LIB_VERSION_STRING,