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

src/core/UBPreferencesController.cpp

@@ -106,8 +106,13 @@ void UBPreferencesController::wire()
 
 
     // OSK preferences
-    mPreferencesUI->keyboardPaletteKeyButtonSize->addItem("29x29");
+
-    mPreferencesUI->keyboardPaletteKeyButtonSize->addItem("41x41");
+    for(int i = 0; i < settings->supportedKeyboardSizes->size(); i++)
+        mPreferencesUI->keyboardPaletteKeyButtonSize->addItem(settings->supportedKeyboardSizes->at(i));
+
+//    mPreferencesUI->keyboardPaletteKeyButtonSize->addItem("29x29");
+//    mPreferencesUI->keyboardPaletteKeyButtonSize->addItem("30x30");
+//    mPreferencesUI->keyboardPaletteKeyButtonSize->addItem("41x41");
     connect(mPreferencesUI->keyboardPaletteKeyButtonSize, SIGNAL(currentIndexChanged(const QString &)), settings->boardKeyboardPaletteKeyBtnSize, SLOT(setString(const QString &)));
 
 

src/core/UBSettings.cpp

@@ -120,6 +120,8 @@ QSettings* UBSettings::getAppSettings()
 UBSettings::UBSettings(QObject *parent)
     : QObject(parent)
 {
+    InitKeyboardPaletteKeyBtnSizes();
+
     mAppSettings = UBSettings::getAppSettings();
 
     QString userSettingsFile = UBSettings::uniboardDataDirectory() + "/UniboardUser.config";
@@ -133,8 +135,38 @@ UBSettings::UBSettings(QObject *parent)
 UBSettings::~UBSettings()
 {
     delete mAppSettings;
+
+    if(supportedKeyboardSizes)
+        delete supportedKeyboardSizes;
+}
+
+void UBSettings::InitKeyboardPaletteKeyBtnSizes()
+{
+    supportedKeyboardSizes = new QStringList();
+    supportedKeyboardSizes->append("29x29");
+    supportedKeyboardSizes->append("41x41");
+}
+
+void UBSettings::ValidateKeyboardPaletteKeyBtnSize()
+{
+    // if boardKeyboardPaletteKeyBtnSize is not initialized, or supportedKeyboardSizes not initialized or empty
+    if( !boardKeyboardPaletteKeyBtnSize ||
+        !supportedKeyboardSizes || 
+        supportedKeyboardSizes->size() == 0 ) return;
+
+    // get original size value
+    QString origValue = boardKeyboardPaletteKeyBtnSize->get().toString();
+
+    // parse available size values, for make sure original value is valid
+    for(int i = 0; i < supportedKeyboardSizes->size(); i++)
+    {
+        int compareCode = QString::compare(origValue, supportedKeyboardSizes->at(i));
+        if(compareCode == 0) return;
     }
 
+    // if original value is invalid, than set it value to first value from avaliable list
+    boardKeyboardPaletteKeyBtnSize->set(supportedKeyboardSizes->at(0));
+}
 
 void UBSettings::init()
 {
@@ -192,7 +224,8 @@ void UBSettings::init()
     boardUseHighResTabletEvent = new UBSetting(this, "Board", "UseHighResTabletEvent", true);
 
 //    boardKeyboardPaletteAutoMinimize = new UBSetting(this, "Board", "KeyboardPaletteAutoMinimize", true);
-    boardKeyboardPaletteKeyBtnSize = new UBSetting(this, "Board", "KeyboardPaletteKeyBtnSize", "24x24");
+    boardKeyboardPaletteKeyBtnSize = new UBSetting(this, "Board", "KeyboardPaletteKeyBtnSize", "16x16");
+    ValidateKeyboardPaletteKeyBtnSize();
 
     QStringList penLightBackgroundColors;
     penLightBackgroundColors << "#000000" << "#FF0000" <<"#004080" << "#008000" << "#C87400" << "#800040" << "#008080"  << "#5F2D0A";

src/core/UBSettings.h

@@ -37,6 +37,11 @@ class UBSettings : public QObject
 
     public:
 
+        QStringList* supportedKeyboardSizes;
+        void InitKeyboardPaletteKeyBtnSizes();
+        void ValidateKeyboardPaletteKeyBtnSize();
+
+
         int penWidthIndex();
 
         qreal currentPenWidth();

src/desktop/UBDesktopAnnotationController.cpp

@@ -88,7 +88,8 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
     if (UBPlatformUtils::hasVirtualKeyboard())
     {
         mKeyboardPalette = UBKeyboardPalette::create(mTransparentDrawingView);
-        //mKeyboardPalette->setParent(mTransparentDrawingView);
+        mKeyboardPalette->setParent(mTransparentDrawingView);
+        connect(mKeyboardPalette, SIGNAL(keyboardActivated(bool)), mTransparentDrawingView, SLOT(virtualKeyboardActivated(bool))); 
     }
 
     connect(mDesktopPalette, SIGNAL(uniboardClick()), this, SLOT(goToUniboard()));

src/frameworks/UBPlatformUtils_win.cpp

@@ -363,7 +363,7 @@ void UBPlatformUtils::initializeKeyboardLayouts()
 
 void UBPlatformUtils::destroyKeyboardLayouts()
 {
-	for(int i=0; i<4; i++)
+	for(int i=0; i<nKeyboardLayouts; i++)
 		delete keyboardLayouts[i];
 	delete [] keyboardLayouts;
 	keyboardLayouts = NULL;

src/gui/UBKeyboardPalette.cpp

@@ -82,8 +82,6 @@ UBKeyboardPalette* UBKeyboardPalette::create(QWidget *parent)
 
         connect(inst, SIGNAL(localeChanged(int)), instance, SLOT(syncLocale(int)));
         connect(instance, SIGNAL(localeChanged(int)), inst, SLOT(syncLocale(int)));
-
-//        connect(instance, SIGNAL(closed()), inst, )
     }
 
     return instance;
@@ -91,7 +89,7 @@ UBKeyboardPalette* UBKeyboardPalette::create(QWidget *parent)
 
 void UBKeyboardPalette::hideKeyboard()
 {
-    UBApplication::mainWindow->actionVirtualKeyboard->activate(QAction.Trigger);
+    UBApplication::mainWindow->actionVirtualKeyboard->activate(QAction::Trigger);
 }
 
 void UBKeyboardPalette::syncPosition(const QPoint & pos)
@@ -125,20 +123,20 @@ void UBKeyboardPalette::setInput(const UBKeyboardLocale* locale)
 
 UBKeyboardPalette::~UBKeyboardPalette()
 {
-    for (int i=0; i<47; i++)
+    //for (int i=0; i<47; i++)
-        delete buttons[i];
+    //    delete buttons[i];
     delete [] buttons;
 
-    for (int i=0; i<8; i++)
+    //for (int i=0; i<8; i++)
-        delete ctrlButtons[i];
+    //    delete ctrlButtons[i];
     delete [] ctrlButtons;
 
-    if (locales!=NULL)
+    //if (locales!=NULL)
-    {
+    //{
-        for (int i=0; i<nLocalesCount; i++)
+    //    for (int i=0; i<nLocalesCount; i++)
-            delete locales[i];
+    //        delete locales[i];
-        delete [] locales;
+    //    delete [] locales;
-    }
+    //}
 
     if(currBtnImages != NULL)
     {

src/gui/UBKeyboardPalette_linux.cpp

@@ -114,8 +114,8 @@ void UBKeyboardPalette::createCtrlButtons()
         ctrlButtons[0] = new UBCntrlButton(this, "<-", XK_BackSpace);
         ctrlButtons[1] = new UBCntrlButton(this, "<->", XK_Tab);
         ctrlButtons[2] = new UBCntrlButton(this, "Enter", XK_Return);
-        ctrlButtons[3] = new UBCapsLockButton(this);
+        ctrlButtons[3] = new UBCapsLockButton(this, "capslock");
-        ctrlButtons[4] = new UBCapsLockButton(this);
+        ctrlButtons[4] = new UBCapsLockButton(this, "capslock");
         ctrlButtons[5] = new UBLocaleButton(this);
         ctrlButtons[6] = new UBCntrlButton(this, "", XK_space);
         ctrlButtons[7] = new UBLocaleButton(this);

src/gui/UBKeyboardPalette_mac.cpp

@@ -51,8 +51,8 @@ void UBKeyboardPalette::createCtrlButtons()
         ctrlButtons[0] = new UBCntrlButton(this, "<-", 51);
         ctrlButtons[1] = new UBCntrlButton(this, "<->", 48);
         ctrlButtons[2] = new UBCntrlButton(this, "Enter", 76);
-        ctrlButtons[3] = new UBCapsLockButton(this);
+        ctrlButtons[3] = new UBCapsLockButton(this, "capslock");
-        ctrlButtons[4] = new UBCapsLockButton(this);
+        ctrlButtons[4] = new UBCapsLockButton(this, "capslock");
         ctrlButtons[5] = new UBLocaleButton(this);
         ctrlButtons[6] = new UBCntrlButton(this, "", 49);
         ctrlButtons[7] = new UBLocaleButton(this);

src/tools/UBGraphicsTriangle.cpp

@@ -607,13 +607,13 @@ void UBGraphicsTriangle::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 			QPointF delta = event->pos() - event->lastPos();
             if (mOrientation == TopLeft || mOrientation == BottomLeft)
             {
-			    if (rect().width() + delta.x() < sMinWidth)
+			    if (rect().width() + delta.x() < (qreal)sMinWidth)
-				    delta.setX(sMinWidth - rect().width());
+				    delta.setX((qreal)sMinWidth - rect().width());
             }
             else
             {
-			    if (rect().width() - delta.x() < sMinWidth)
+			    if (rect().width() - delta.x() < (qreal)sMinWidth)
-				    delta.setX(sMinWidth - rect().width());
+				    delta.setX((qreal)sMinWidth - rect().width());
             }
 			if (mOrientation == TopLeft || mOrientation == BottomLeft)
 			{
@@ -639,13 +639,13 @@ void UBGraphicsTriangle::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 			QPointF delta = event->pos() - event->lastPos();
             if (mOrientation == BottomRight || mOrientation == BottomLeft)
             {
-                if (rect().height() - delta.y() < sMinHeight)
+                if (rect().height() - delta.y() < (qreal)sMinHeight)
-				    delta.setY(sMinHeight - rect().height());
+				    delta.setY((qreal)sMinHeight - rect().height());
             }
             else
             {
-			    if (rect().height() + delta.y() < sMinHeight)
+			    if (rect().height() + delta.y() < (qreal)sMinHeight)
-				    delta.setY(sMinHeight - rect().height());
+				    delta.setY((qreal)sMinHeight - rect().height());
             }
             if (mOrientation == BottomRight || mOrientation == BottomLeft)
                 setRect(QRectF(