From 5d4ce4b51168814472f25482156556449032f8ac Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 22 Jan 2015 12:09:12 +0100 Subject: [PATCH 1/4] version upgraded --- OpenBoard.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenBoard.pro b/OpenBoard.pro index af73c324..e5d4e171 100644 --- a/OpenBoard.pro +++ b/OpenBoard.pro @@ -11,7 +11,7 @@ CONFIG += debug_and_release \ VERSION_MAJ = 1 VERSION_MIN = 02 VERSION_TYPE = r # a = alpha, b = beta, rc = release candidate, r = release, other => error -VERSION_PATCH = 07 +VERSION_PATCH = 08 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}" VERSION = $$replace(VERSION, "\\.r", "") From 4781a9bfc21c3fdea9136659497eb39884a7ccea Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 22 Jan 2015 13:54:58 +0100 Subject: [PATCH 2/4] hack for onboard --- src/board/UBBoardController.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index 601079cc..f017ecec 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -86,6 +86,10 @@ #include "core/memcheck.h" +#ifdef Q_WS_X11 +#include +#endif + UBBoardController::UBBoardController(UBMainWindow* mainWindow) : UBDocumentContainer(mainWindow->centralWidget()) , mMainWindow(mainWindow) @@ -160,6 +164,10 @@ void UBBoardController::init() UBBoardController::~UBBoardController() { +#ifdef Q_WS_X11 + QProcess newProcess; + newProcess.startDetached("killall onboard"); +#endif delete mDisplayView; } @@ -816,7 +824,14 @@ void UBBoardController::showKeyboard(bool show) { if(show) UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector); + +#ifdef Q_WS_X11 + QProcess newProcess; + newProcess.startDetached("/usr/bin/onboard"); +#else mPaletteManager->showVirtualKeyboard(show); +#endif + } From a9db6c44b0237b88e86bc3e8528fd937ba0a6608 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Sat, 31 Jan 2015 10:35:36 +0100 Subject: [PATCH 3/4] introduced the possibility to choose the wanted on screen keyboard --- src/board/UBBoardController.cpp | 29 +++++++++++++++++++++++++---- src/core/UBSettings.cpp | 2 ++ src/core/UBSettings.h | 2 ++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index f017ecec..e4f946d9 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -88,6 +88,7 @@ #ifdef Q_WS_X11 #include +bool onboardIsAlreadyRunning = true; #endif UBBoardController::UBBoardController(UBMainWindow* mainWindow) @@ -165,8 +166,10 @@ void UBBoardController::init() UBBoardController::~UBBoardController() { #ifdef Q_WS_X11 - QProcess newProcess; - newProcess.startDetached("killall onboard"); + if(!onboardIsAlreadyRunning){ + QProcess newProcess; + newProcess.startDetached("killall onboard"); + } #endif delete mDisplayView; } @@ -826,8 +829,26 @@ void UBBoardController::showKeyboard(bool show) UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector); #ifdef Q_WS_X11 - QProcess newProcess; - newProcess.startDetached("/usr/bin/onboard"); + static bool isFirstTime = true; + if(isFirstTime){ + QProcess isAlreadyRunningProcess; + QString psAuxGrepC = "ps aux"; + isAlreadyRunningProcess.start(psAuxGrepC); + isAlreadyRunningProcess.waitForFinished(); + QString output(isAlreadyRunningProcess.readAll()); + if(output.count("onboard") != 0) + onboardIsAlreadyRunning = true; + else + onboardIsAlreadyRunning = false; + + isFirstTime = false; + } + if(UBSettings::settings()->useSystemOnScreenKeybard->get().toBool()){ + QProcess newProcess; + newProcess.startDetached("/usr/bin/onboard"); + } + else + mPaletteManager->showVirtualKeyboard(show); #else mPaletteManager->showVirtualKeyboard(show); #endif diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index 3cd7b57e..dfddb796 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -415,6 +415,8 @@ void UBSettings::init() libIconSize = new UBSetting(this, "Library", "LibIconSize", defaultLibraryIconSize); + useSystemOnScreenKeybard = new UBSetting(this, "App", "UseSystemOnScreenKeybard", false); + cleanNonPersistentSettings(); } diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h index 1c739b8a..89fa3927 100644 --- a/src/core/UBSettings.h +++ b/src/core/UBSettings.h @@ -374,6 +374,8 @@ class UBSettings : public QObject UBSetting* libIconSize; + UBSetting* useSystemOnScreenKeybard; + UBSetting* magnifierDrawingMode; UBSetting* autoSaveInterval; From 9ca81f964a8e7f7a0bc6bcda18c49cad73bd21d8 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Sat, 31 Jan 2015 10:35:48 +0100 Subject: [PATCH 4/4] increased version --- OpenBoard.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenBoard.pro b/OpenBoard.pro index e5d4e171..67350d20 100644 --- a/OpenBoard.pro +++ b/OpenBoard.pro @@ -11,7 +11,7 @@ CONFIG += debug_and_release \ VERSION_MAJ = 1 VERSION_MIN = 02 VERSION_TYPE = r # a = alpha, b = beta, rc = release candidate, r = release, other => error -VERSION_PATCH = 08 +VERSION_PATCH = 09 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}" VERSION = $$replace(VERSION, "\\.r", "")