Sankore-341 Sankore-363 Sankore-365

src/core/UBSettings.cpp

@@ -363,6 +363,7 @@ void UBSettings::init()
     intranetPodcastPublishingUrl = new UBSetting(this, "IntranetPodcast", "PublishingUrl", "");
     intranetPodcastAuthor = new UBSetting(this, "IntranetPodcast", "Author", "");
 
+	KeyboardLocale = new UBSetting(this, "Board", "StartupKeyboardLocale", 0);
 }
 
 

src/core/UBSettings.h

@@ -318,6 +318,8 @@ class UBSettings : public QObject
         static int libPaletteWidth;
         */
 
+        UBSetting* KeyboardLocale;
+
     public slots:
 
         void setPenWidthIndex(int index);

src/domain/UBGraphicsScene.cpp

@@ -1938,7 +1938,7 @@ void UBGraphicsScene::keyReleaseEvent(QKeyEvent * keyEvent)
 
     QList<QGraphicsItem*> si = selectedItems();
 
-    if (si.size() > 0 && !keyEvent->isAccepted())
+    if ((si.size() > 0) && (keyEvent->isAccepted()))
     {
 #ifdef Q_OS_MAC
         if (keyEvent->key() == Qt::Key_Backspace)

src/gui/UBDocumentThumbnailWidget.cpp

@@ -254,4 +254,6 @@ void UBDocumentThumbnailWidget::hightlightItem(int index)
         if (thumbnail)
             thumbnail->highlight();
     }
+
+    selectItemAt(index);
 }

src/gui/UBKeyboardPalette.cpp

@@ -54,7 +54,7 @@ UBKeyboardPalette::UBKeyboardPalette(QWidget *parent)
 
     createCtrlButtons();
 
-    nCurrentLocale = 0;
+    nCurrentLocale = UBSettings::settings()->KeyboardLocale->get().toInt();
     setInput(locales[nCurrentLocale]);
 
     setContentsMargins( 22, 22, 22, 22 );
@@ -166,6 +166,8 @@ void UBKeyboardPalette::setLocale(int nLocale)
         setInput(locales[nCurrentLocale]);
         onLocaleChanged(locales[nCurrentLocale]);
         update();
+
+		UBSettings::settings()->KeyboardLocale->set(nCurrentLocale);
     }
     emit localeChanged(nLocale);
 }