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

src/board/UBBoardView.cpp

@@ -940,19 +940,21 @@ void UBBoardView::virtualKeyboardActivated(bool b)
 
 // Apple remote desktop sends funny events when the transmission is bad
 
-bool
+bool UBBoardView::isAbsurdPoint(QPoint point)
-UBBoardView::isAbsurdPoint (QPoint point)
 {
-    QDesktopWidget *desktop = qApp->desktop ();
+#ifdef Q_WS_MACX
+    QDesktopWidget *desktop = qApp->desktop();
     bool isValidPoint = false;
 
-    for (int i = 0; i < desktop->numScreens (); i++)
+    for (int i = 0; i < desktop->numScreens() && !isValidPoint; i++){
-    {
+      QRect screenRect = desktop->screenGeometry(i);
-      QRect screenRect = desktop->screenGeometry (i);
+      screenRect=QRect(QPoint(0,0),screenRect.size());
-      isValidPoint = isValidPoint || screenRect.contains (point);
+      isValidPoint = isValidPoint || screenRect.contains(point);
     }
-
     return !isValidPoint;
+#else
+    return false;
+#endif
 }
 
 void

src/frameworks/UBPlatformUtils_linux.cpp

@@ -63,7 +63,7 @@ QString UBPlatformUtils::preferredTranslation(QString pFilePrefix)
 
 QString UBPlatformUtils::preferredLanguage()
 {
-    return "fr";//QLocale::system().name();
+    return QLocale::system().name();
 }
 
 void UBPlatformUtils::runInstaller(const QString &installerFilePath)