diff --git a/resources/forms/preferences.ui b/resources/forms/preferences.ui
index 1331814c..9d21a794 100644
--- a/resources/forms/preferences.ui
+++ b/resources/forms/preferences.ui
@@ -7,7 +7,7 @@
0
0
759
- 692
+ 718
@@ -24,42 +24,13 @@
-
- 6
+ 0
Display
-
-
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::Expanding
-
-
-
- 20
- 40
-
-
-
-
-
@@ -112,19 +83,6 @@
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
@@ -213,19 +171,6 @@
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
@@ -328,8 +273,8 @@
- -
-
+
-
+
0
@@ -337,11 +282,11 @@
- Virtual Keyboard
+ Mode
-
+
-
-
+
Qt::Horizontal
@@ -357,19 +302,30 @@
-
-
+
-
-
+
- Keyboard button size:
+ Mode to start in:
-
-
+
+
-
+
+ Board
+
+
+ -
+
+ Desktop
+
+
+
-
-
+
Qt::Horizontal
@@ -386,8 +342,76 @@
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Expanding
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
-
-
+
0
@@ -395,11 +419,18 @@
- Mode
+ Virtual Keyboard
-
+
+
-
+
+
+ Use system keyboard (recommended)
+
+
+
-
-
+
Qt::Horizontal
@@ -414,31 +445,13 @@
- -
-
-
-
-
-
- Mode to start in:
-
-
-
- -
-
-
-
-
- Board
-
-
- -
-
- Desktop
-
-
-
+ -
+
+
-
+
- -
-
+
-
+
Qt::Horizontal
@@ -450,24 +463,31 @@
+ -
+
+
+ Keyboard button size:
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp
index b6cd4f65..18f69bf2 100644
--- a/src/board/UBBoardController.cpp
+++ b/src/board/UBBoardController.cpp
@@ -818,7 +818,7 @@ void UBBoardController::showKeyboard(bool show)
if(show)
UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector);
- if(UBSettings::settings()->useSystemOnScreenKeybard->get().toBool())
+ if(UBSettings::settings()->useSystemOnScreenKeyboard->get().toBool())
UBPlatformUtils::showOSK(show);
else
mPaletteManager->showVirtualKeyboard(show);
diff --git a/src/core/UBPreferencesController.cpp b/src/core/UBPreferencesController.cpp
index f8d2ab90..2ca34217 100644
--- a/src/core/UBPreferencesController.cpp
+++ b/src/core/UBPreferencesController.cpp
@@ -129,6 +129,7 @@ void UBPreferencesController::wire()
mPreferencesUI->keyboardPaletteKeyButtonSize->addItem(settings->supportedKeyboardSizes->at(i));
+ connect(mPreferencesUI->useSystemOSKCheckBox, SIGNAL(clicked(bool)), settings->useSystemOnScreenKeyboard, SLOT(setBool(bool)));
connect(mPreferencesUI->keyboardPaletteKeyButtonSize, SIGNAL(currentIndexChanged(const QString &)), settings->boardKeyboardPaletteKeyBtnSize, SLOT(setString(const QString &)));
connect(mPreferencesUI->startModeComboBox, SIGNAL(currentIndexChanged(int)), settings->appStartMode, SLOT(setInt(int)));
@@ -199,6 +200,8 @@ void UBPreferencesController::init()
break;
}
+ mPreferencesUI->useSystemOSKCheckBox->setChecked(settings->useSystemOnScreenKeyboard->get().toBool());
+
mPreferencesUI->startModeComboBox->setCurrentIndex(settings->appStartMode->get().toInt());
mPreferencesUI->useExternalBrowserCheckBox->setChecked(settings->webUseExternalBrowser->get().toBool());
@@ -259,6 +262,8 @@ void UBPreferencesController::defaultSettings()
mPreferencesUI->verticalChoice->setChecked(settings->appToolBarOrientationVertical->reset().toBool());
mPreferencesUI->horizontalChoice->setChecked(!settings->appToolBarOrientationVertical->reset().toBool());
mPreferencesUI->startModeComboBox->setCurrentIndex(0);
+
+ mPreferencesUI->useSystemOSKCheckBox->setChecked(settings->useSystemOnScreenKeyboard->reset().toBool());
}
else if (mPreferencesUI->mainTabWidget->currentWidget() == mPreferencesUI->penTab)
{
diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp
index c1298933..3e439dcd 100644
--- a/src/core/UBSettings.cpp
+++ b/src/core/UBSettings.cpp
@@ -415,7 +415,7 @@ void UBSettings::init()
libIconSize = new UBSetting(this, "Library", "LibIconSize", defaultLibraryIconSize);
- useSystemOnScreenKeybard = new UBSetting(this, "App", "UseSystemOnScreenKeybard", false);
+ useSystemOnScreenKeyboard = new UBSetting(this, "App", "UseSystemOnScreenKeyboard", true);
cleanNonPersistentSettings();
}
diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h
index 89fa3927..adf3d996 100644
--- a/src/core/UBSettings.h
+++ b/src/core/UBSettings.h
@@ -374,7 +374,7 @@ class UBSettings : public QObject
UBSetting* libIconSize;
- UBSetting* useSystemOnScreenKeybard;
+ UBSetting* useSystemOnScreenKeyboard;
UBSetting* magnifierDrawingMode;
UBSetting* autoSaveInterval;