From 0a40c2f36c2a8e3de2c69ca5cc0398918b205079 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Wed, 27 Jun 2012 16:50:00 +0200 Subject: [PATCH] added a preference to start the application using a language different from the one of the system --- src/adaptors/UBCFFSubsetAdaptor.cpp | 1 + src/adaptors/UBThumbnailAdaptor.cpp | 3 ++- src/core/UBApplication.cpp | 10 +++++++--- src/core/UBSettings.cpp | 2 ++ src/core/UBSettings.h | 1 + 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/adaptors/UBCFFSubsetAdaptor.cpp b/src/adaptors/UBCFFSubsetAdaptor.cpp index f4993b9a..1b9e443e 100644 --- a/src/adaptors/UBCFFSubsetAdaptor.cpp +++ b/src/adaptors/UBCFFSubsetAdaptor.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include "core/UBPersistenceManager.h" diff --git a/src/adaptors/UBThumbnailAdaptor.cpp b/src/adaptors/UBThumbnailAdaptor.cpp index 2432f89c..5e774e89 100644 --- a/src/adaptors/UBThumbnailAdaptor.cpp +++ b/src/adaptors/UBThumbnailAdaptor.cpp @@ -92,7 +92,8 @@ QList UBThumbnailAdaptor::load(UBDocumentProxy* proxy) QPixmap pix; //Warning. Works only with modified Qt #ifdef Q_WS_X11 - pix.load(fileName, 0, Qt::AutoColor); + //pix.load(fileName, 0, Qt::AutoColor); + pix.load(fileName, 0); #else pix.load(fileName, 0, Qt::AutoColor, false); #endif diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index fc02804d..e57097cb 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -135,14 +135,18 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : QtSing if (!undoStack) undoStack = new QUndoStack(staticMemoryCleaner); + UBSettings *settings = UBSettings::settings(); + QString forcedLanguage(""); if(args.contains("-lang")) forcedLanguage=args.at(args.indexOf("-lang") + 1); - + else{ + QString setLanguage = settings->appPreferredLanguage->get().toString(); + if(!setLanguage.isEmpty()) + forcedLanguage = setLanguage; + } setupTranslator(forcedLanguage); - UBSettings *settings = UBSettings::settings(); - connect(settings->appToolBarPositionedAtTop, SIGNAL(changed(QVariant)), this, SLOT(toolBarPositionChanged(QVariant))); connect(settings->appToolBarDisplayText, SIGNAL(changed(QVariant)), this, SLOT(toolBarDisplayTextChanged(QVariant))); updateProtoActionsState(); diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index 0ec5676f..6ef1de72 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -206,6 +206,8 @@ void UBSettings::init() appEnableAutomaticSoftwareUpdates = new UBSetting(this, "App", "EnableAutomaticSoftwareUpdates", true); appEnableSoftwareUpdates = new UBSetting(this, "App", "EnableSoftwareUpdates", true); appToolBarOrientationVertical = new UBSetting(this, "App", "ToolBarOrientationVertical", false); + appPreferredLanguage = new UBSetting(this,"App","PreferredLanguage", ""); + navigPaletteWidth = new UBSetting(this, "Board", "NavigPaletteWidth", 270); rightLibPaletteWidth = new UBSetting(this, "Board", "RightLibPaletteWidth", 270); leftLibPaletteWidth = new UBSetting(this, "Board", "LeftLibPaletteWidth",270); diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h index 914275d4..26085e19 100644 --- a/src/core/UBSettings.h +++ b/src/core/UBSettings.h @@ -214,6 +214,7 @@ class UBSettings : public QObject UBSetting* appEnableAutomaticSoftwareUpdates; UBSetting* appEnableSoftwareUpdates; UBSetting* appToolBarOrientationVertical; + UBSetting* appPreferredLanguage; UBSetting* appIsInSoftwareUpdateProcess;