From 31a814360a74eebe2e2e0b0f792e89328a79a86d Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 22 Jun 2012 11:34:44 +0200 Subject: [PATCH] language can be choosed on windows system too --- src/board/UBBoardController.cpp | 3 ++- src/core/UBApplication.cpp | 4 +++- src/frameworks/UBPlatformUtils_win.cpp | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index b94fbc16..d70efe1f 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -1233,11 +1233,12 @@ void UBBoardController::setActiveDocumentScene(UBDocumentProxy* pDocumentProxy, if(documentChange) { emit activeDocumentChanged(); + emit setDocOnPageNavigator(pDocumentProxy); UBGraphicsTextItem::lastUsedTextColor = QColor(); } // Notify the navigator palette that the document has changed - emit setDocOnPageNavigator(pDocumentProxy); + //emit setDocOnPageNavigator(pDocumentProxy); if (sceneChange) { diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index cd477981..699f9a37 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -235,10 +235,12 @@ void UBApplication::setupTranslator(QString forcedLanguage) mQtGuiTranslator->load(UBPlatformUtils::translationPath(QString("qt_"),language)); - if(mQtGuiTranslator){ + if(!mQtGuiTranslator->isEmpty()){ // checked because this translation could be not available installTranslator(mQtGuiTranslator); } + else + qDebug() << "Qt gui translation in " << language << " are not available"; } diff --git a/src/frameworks/UBPlatformUtils_win.cpp b/src/frameworks/UBPlatformUtils_win.cpp index dff427c5..4127e7f1 100644 --- a/src/frameworks/UBPlatformUtils_win.cpp +++ b/src/frameworks/UBPlatformUtils_win.cpp @@ -20,6 +20,7 @@ #include #include +#include "frameworks/UBFileSystemUtils.h" #include "core/memcheck.h" void UBPlatformUtils::init()