Merge branch 'master' of github.com:Sankore/Sankore-3.1

src/domain/UBGraphicsItemDelegate.cpp

@@ -106,12 +106,12 @@ UBGraphicsItemDelegate::UBGraphicsItemDelegate(QGraphicsItem* pDelegated, QObjec
     , mFrame(0)
     , mFrameWidth(UBSettings::settings()->objectFrameWidth)
     , mAntiScaleRatio(1.0)
+    , mToolBarItem(NULL)
     , mCanRotate(canRotate)
     , mCanDuplicate(true)
     , mRespectRatio(respectRatio)
     , mMimeData(NULL)
     , mFlippable(false)
-    , mToolBarItem(NULL)
     , mToolBarUsed(useToolBar)
 {
     // NOOP
@@ -1087,11 +1087,11 @@ void MediaTimer::display(const QString &s)
 void MediaTimer::setNumDigits(int numDigits)
 {
     if (numDigits > 99) {
-        qWarning("QLCDNumber::setNumDigits: (%s) Max 99 digits allowed");
+        qWarning("QLCDNumber::setNumDigits: Max 99 digits allowed");
         numDigits = 99;
     }
     if (numDigits < 0) {
-        qWarning("QLCDNumber::setNumDigits: (%s) Min 0 digits allowed");
+        qWarning("QLCDNumber::setNumDigits: Min 0 digits allowed");
         numDigits = 0;
     }
     if (digitStr.isNull()) {                  // from constructor

src/gui/UBKeyboardPalette.cpp

@@ -243,6 +243,8 @@ void UBKeyboardPalette::adjustSizeAndPosition(bool pUp)
 
 void  UBKeyboardPalette::paintEvent( QPaintEvent* event)
 {
+    checkLayout();
+
     UBActionPalette::paintEvent(event);
 
     QRect r = this->geometry();

src/gui/UBKeyboardPalette.h

@@ -127,6 +127,7 @@ protected:
 
     void init();
 
+
 private:
 
     QRect originalRect;
@@ -134,6 +135,11 @@ private:
     UBKeyButton** buttons;
     UBKeyboardButton** ctrlButtons;
 
+    /*
+      For MacOS: synchronization with system locale.
+    */
+    void checkLayout();
+
     void createCtrlButtons();
 
     void setInput(const UBKeyboardLocale* locale);
@@ -145,10 +151,6 @@ private:
     void* storage;
     // Linux-related parameters
     int min_keycodes, max_keycodes, byte_per_code;
-
-    // Save locale before activation to restore it after (MAC)
-    QString activeLocale;
-
 };
 
 class UBKeyboardButton : public QWidget

src/gui/UBKeyboardPalette_linux.cpp

@@ -164,6 +164,9 @@ void UBKeyboardPalette::createCtrlButtons()
 }
 
 
+void UBKeyboardPalette::checkLayout()
+{}
+
 void UBKeyboardPalette::onActivated(bool activated)
 {
     if (activated)

src/gui/UBKeyboardPalette_mac.cpp

@@ -74,9 +74,8 @@ void SetMacLocaleByIdentifier(const QString& id)
 	}
 }
 
-void UBKeyboardPalette::onActivated(bool activated)
+
-{
+void UBKeyboardPalette::checkLayout()
-	if (activated)
 {
     TISInputSourceRef selectedLocale = TISCopyCurrentKeyboardInputSource();
 
@@ -85,21 +84,25 @@ void UBKeyboardPalette::onActivated(bool activated)
 
     if (sr!=NULL)
     {
-			char tmp[1024];
+        char clId[1024];
-			CFStringGetCString(sr, tmp, 1024, 0);
+        CFStringGetCString(sr, clId, 1024, 0);
-			activeLocale = tmp;	
-		}
-		else
-			activeLocale = "";
-	
 
-	    onLocaleChanged(locales[nCurrentLocale]);
+        for(int i=0; i<nLocalesCount;i++)
-	}
+        {
-	else
+            if (locales[i]->id == clId)
+            {
+                if (nCurrentLocale!=i)
                 {
-		if (activeLocale != "")
+                    setLocale(i);
-			SetMacLocaleByIdentifier(activeLocale);
                 }
+                break;
+            }
+        }
+    }
+}
+
+void UBKeyboardPalette::onActivated(bool)
+{
 }
 
 void UBKeyboardPalette::onLocaleChanged(UBKeyboardLocale* locale)

src/gui/UBKeyboardPalette_win.cpp

@@ -64,9 +64,12 @@ void UBKeyboardPalette::createCtrlButtons()
     ctrlButtons[ctrlID++] = new UBLocaleButton(this);                  // Language Switch 
 }
 
+void UBKeyboardPalette::checkLayout()
+{}
+
 void UBKeyboardPalette::onActivated(bool)
-{
+{}
-}
+
 void UBKeyboardPalette::onLocaleChanged(UBKeyboardLocale* )
 {}