Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenBoard
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lifo
Nicolas Ollinger
OpenBoard
Commits
a9db6c44
Commit
a9db6c44
authored
Jan 31, 2015
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
introduced the possibility to choose the wanted on screen keyboard
parent
4781a9bf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
4 deletions
+29
-4
UBBoardController.cpp
src/board/UBBoardController.cpp
+25
-4
UBSettings.cpp
src/core/UBSettings.cpp
+2
-0
UBSettings.h
src/core/UBSettings.h
+2
-0
No files found.
src/board/UBBoardController.cpp
View file @
a9db6c44
...
@@ -88,6 +88,7 @@
...
@@ -88,6 +88,7 @@
#ifdef Q_WS_X11
#ifdef Q_WS_X11
#include <QProcess>
#include <QProcess>
bool
onboardIsAlreadyRunning
=
true
;
#endif
#endif
UBBoardController
::
UBBoardController
(
UBMainWindow
*
mainWindow
)
UBBoardController
::
UBBoardController
(
UBMainWindow
*
mainWindow
)
...
@@ -165,8 +166,10 @@ void UBBoardController::init()
...
@@ -165,8 +166,10 @@ void UBBoardController::init()
UBBoardController
::~
UBBoardController
()
UBBoardController
::~
UBBoardController
()
{
{
#ifdef Q_WS_X11
#ifdef Q_WS_X11
QProcess
newProcess
;
if
(
!
onboardIsAlreadyRunning
){
newProcess
.
startDetached
(
"killall onboard"
);
QProcess
newProcess
;
newProcess
.
startDetached
(
"killall onboard"
);
}
#endif
#endif
delete
mDisplayView
;
delete
mDisplayView
;
}
}
...
@@ -826,8 +829,26 @@ void UBBoardController::showKeyboard(bool show)
...
@@ -826,8 +829,26 @@ void UBBoardController::showKeyboard(bool show)
UBDrawingController
::
drawingController
()
->
setStylusTool
(
UBStylusTool
::
Selector
);
UBDrawingController
::
drawingController
()
->
setStylusTool
(
UBStylusTool
::
Selector
);
#ifdef Q_WS_X11
#ifdef Q_WS_X11
QProcess
newProcess
;
static
bool
isFirstTime
=
true
;
newProcess
.
startDetached
(
"/usr/bin/onboard"
);
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
#else
mPaletteManager
->
showVirtualKeyboard
(
show
);
mPaletteManager
->
showVirtualKeyboard
(
show
);
#endif
#endif
...
...
src/core/UBSettings.cpp
View file @
a9db6c44
...
@@ -415,6 +415,8 @@ void UBSettings::init()
...
@@ -415,6 +415,8 @@ void UBSettings::init()
libIconSize
=
new
UBSetting
(
this
,
"Library"
,
"LibIconSize"
,
defaultLibraryIconSize
);
libIconSize
=
new
UBSetting
(
this
,
"Library"
,
"LibIconSize"
,
defaultLibraryIconSize
);
useSystemOnScreenKeybard
=
new
UBSetting
(
this
,
"App"
,
"UseSystemOnScreenKeybard"
,
false
);
cleanNonPersistentSettings
();
cleanNonPersistentSettings
();
}
}
...
...
src/core/UBSettings.h
View file @
a9db6c44
...
@@ -374,6 +374,8 @@ class UBSettings : public QObject
...
@@ -374,6 +374,8 @@ class UBSettings : public QObject
UBSetting
*
libIconSize
;
UBSetting
*
libIconSize
;
UBSetting
*
useSystemOnScreenKeybard
;
UBSetting
*
magnifierDrawingMode
;
UBSetting
*
magnifierDrawingMode
;
UBSetting
*
autoSaveInterval
;
UBSetting
*
autoSaveInterval
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment