OSK

src/gui/UBKeyboardPalette.cpp

@@ -62,19 +62,37 @@ UBKeyboardPalette::UBKeyboardPalette(QWidget *parent)
 QList<UBKeyboardPalette*> UBKeyboardPalette::instances;
 UBKeyboardPalette* UBKeyboardPalette::create(QWidget *parent)
 {
+    //------------------------------//
+
     if (!UBPlatformUtils::hasVirtualKeyboard())
         return NULL;
 
-    UBKeyboardPalette* instance = new UBKeyboardPalette(parent);
-    instances.append(instance);
+    //------------------------------//
 
+    UBKeyboardPalette* firstKeyboard = NULL;
+    // if we already have keyboards inside, get it position and show/hide status, for new keyboard
+    if(instances.size() > 0)
+        firstKeyboard = instances.at(0);
+
+    //------------------------------//
+
+    UBKeyboardPalette* instance = new UBKeyboardPalette(parent);
     instance->setKeyButtonSize(UBSettings::settings()->boardKeyboardPaletteKeyBtnSize->get().toString());
-    instance->setVisible(false);
-    connect(UBSettings::settings()->boardKeyboardPaletteKeyBtnSize, SIGNAL(changed(QVariant)), instance, SLOT(keyboardPaletteButtonSizeChanged(QVariant)));
 
+    instance->m_isVisible = firstKeyboard ? firstKeyboard->m_isVisible : false;
+    instance->setVisible(instance->m_isVisible);
+
+    if( firstKeyboard )
+        instance->move(firstKeyboard->m_pos);
+
+    connect(UBSettings::settings()->boardKeyboardPaletteKeyBtnSize, SIGNAL(changed(QVariant)), instance, SLOT(keyboardPaletteButtonSizeChanged(QVariant)));
+    connect(UBApplication::mainWindow->actionVirtualKeyboard, SIGNAL(triggered(bool)), instance, SLOT(showKeyboard(bool)));
+//    connect(instance, SIGNAL(moved(const QPoint&)), instance, SLOT(syncPosition(const QPoint&)));
     connect(instance, SIGNAL(closed()), instance, SLOT(hideKeyboard()));
 
+    //------------------------------//
 
+    instances.append(instance);
     foreach(UBKeyboardPalette* inst, instances)
     {
         connect(inst, SIGNAL(moved(const QPoint&)), instance, SLOT(syncPosition(const QPoint&)));
@@ -82,18 +100,29 @@ 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;
 }
 
+void UBKeyboardPalette::showKeyboard(bool show)
+{
+    m_isVisible = show;
+}
+
+
 void UBKeyboardPalette::hideKeyboard()
 {
-    UBApplication::mainWindow->actionVirtualKeyboard->activate(QAction::Trigger);
+    UBApplication::mainWindow->actionVirtualKeyboard->activate(QAction.Trigger);
 }
 
 void UBKeyboardPalette::syncPosition(const QPoint & pos)
 {
+    m_pos = pos;
     move(pos);
 }
 
@@ -123,20 +152,20 @@ void UBKeyboardPalette::setInput(const UBKeyboardLocale* locale)
 
 UBKeyboardPalette::~UBKeyboardPalette()
 {
-    //for (int i=0; i<47; i++)
-    //    delete buttons[i];
+    for (int i=0; i<47; i++)
+        delete buttons[i];
     delete [] buttons;
 
-    //for (int i=0; i<8; i++)
-    //    delete ctrlButtons[i];
+    for (int i=0; i<8; i++)
+        delete ctrlButtons[i];
     delete [] ctrlButtons;
 
-    //if (locales!=NULL)
-    //{
-    //    for (int i=0; i<nLocalesCount; i++)
-    //        delete locales[i];
-    //    delete [] locales;
-    //}
+    if (locales!=NULL)
+    {
+        for (int i=0; i<nLocalesCount; i++)
+            delete locales[i];
+        delete [] locales;
+    }
 
     if(currBtnImages != NULL)
     {

src/gui/UBKeyboardPalette.h

@@ -76,7 +76,11 @@ public:
     virtual void adjustSizeAndPosition(bool pUp = true);
     QString getKeyButtonSize() const {QString res; res.sprintf("%dx%d", btnWidth, btnHeight); return res;}
     void setKeyButtonSize(const QString& strSize);
+
     static UBKeyboardPalette* create(QWidget *parent);
+    static QList<UBKeyboardPalette*> instances;
+    bool m_isVisible;
+    QPoint m_pos;
 
 signals:
     void moved(const QPoint&);
@@ -88,6 +92,7 @@ private slots:
     void syncLocale(int nLocale);
     void keyboardPaletteButtonSizeChanged(QVariant size);
     void onActivated(bool b);
+    void showKeyboard(bool show);
     void hideKeyboard();
 
 protected:
@@ -117,7 +122,6 @@ protected:
 private:
 
     UBKeyboardPalette(QWidget *parent);
-    static QList<UBKeyboardPalette*> instances;
 
     QRect originalRect;