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
631adcc3
Commit
631adcc3
authored
Aug 08, 2011
by
Anatoly Mihalchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OSK - displaying in hidden mode
parent
4a1d9efd
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
67 additions
and
23 deletions
+67
-23
UBPreferencesController.cpp
src/core/UBPreferencesController.cpp
+7
-2
UBSettings.cpp
src/core/UBSettings.cpp
+34
-1
UBSettings.h
src/core/UBSettings.h
+5
-0
UBDesktopAnnotationController.cpp
src/desktop/UBDesktopAnnotationController.cpp
+2
-1
UBPlatformUtils_win.cpp
src/frameworks/UBPlatformUtils_win.cpp
+1
-1
UBKeyboardPalette.cpp
src/gui/UBKeyboardPalette.cpp
+10
-10
UBGraphicsTriangle.cpp
src/tools/UBGraphicsTriangle.cpp
+8
-8
No files found.
src/core/UBPreferencesController.cpp
View file @
631adcc3
...
...
@@ -106,8 +106,13 @@ void UBPreferencesController::wire()
// OSK preferences
mPreferencesUI
->
keyboardPaletteKeyButtonSize
->
addItem
(
"29x29"
);
mPreferencesUI
->
keyboardPaletteKeyButtonSize
->
addItem
(
"41x41"
);
for
(
int
i
=
0
;
i
<
settings
->
supportedKeyboardSizes
->
size
();
i
++
)
mPreferencesUI
->
keyboardPaletteKeyButtonSize
->
addItem
(
settings
->
supportedKeyboardSizes
->
at
(
i
));
// mPreferencesUI->keyboardPaletteKeyButtonSize->addItem("29x29");
// mPreferencesUI->keyboardPaletteKeyButtonSize->addItem("30x30");
// mPreferencesUI->keyboardPaletteKeyButtonSize->addItem("41x41");
connect
(
mPreferencesUI
->
keyboardPaletteKeyButtonSize
,
SIGNAL
(
currentIndexChanged
(
const
QString
&
)),
settings
->
boardKeyboardPaletteKeyBtnSize
,
SLOT
(
setString
(
const
QString
&
)));
...
...
src/core/UBSettings.cpp
View file @
631adcc3
...
...
@@ -120,6 +120,8 @@ QSettings* UBSettings::getAppSettings()
UBSettings
::
UBSettings
(
QObject
*
parent
)
:
QObject
(
parent
)
{
InitKeyboardPaletteKeyBtnSizes
();
mAppSettings
=
UBSettings
::
getAppSettings
();
QString
userSettingsFile
=
UBSettings
::
uniboardDataDirectory
()
+
"/UniboardUser.config"
;
...
...
@@ -133,8 +135,38 @@ UBSettings::UBSettings(QObject *parent)
UBSettings
::~
UBSettings
()
{
delete
mAppSettings
;
if
(
supportedKeyboardSizes
)
delete
supportedKeyboardSizes
;
}
void
UBSettings
::
InitKeyboardPaletteKeyBtnSizes
()
{
supportedKeyboardSizes
=
new
QStringList
();
supportedKeyboardSizes
->
append
(
"29x29"
);
supportedKeyboardSizes
->
append
(
"41x41"
);
}
void
UBSettings
::
ValidateKeyboardPaletteKeyBtnSize
()
{
// if boardKeyboardPaletteKeyBtnSize is not initialized, or supportedKeyboardSizes not initialized or empty
if
(
!
boardKeyboardPaletteKeyBtnSize
||
!
supportedKeyboardSizes
||
supportedKeyboardSizes
->
size
()
==
0
)
return
;
// get original size value
QString
origValue
=
boardKeyboardPaletteKeyBtnSize
->
get
().
toString
();
// parse available size values, for make sure original value is valid
for
(
int
i
=
0
;
i
<
supportedKeyboardSizes
->
size
();
i
++
)
{
int
compareCode
=
QString
::
compare
(
origValue
,
supportedKeyboardSizes
->
at
(
i
));
if
(
compareCode
==
0
)
return
;
}
// if original value is invalid, than set it value to first value from avaliable list
boardKeyboardPaletteKeyBtnSize
->
set
(
supportedKeyboardSizes
->
at
(
0
));
}
void
UBSettings
::
init
()
{
...
...
@@ -192,7 +224,8 @@ void UBSettings::init()
boardUseHighResTabletEvent
=
new
UBSetting
(
this
,
"Board"
,
"UseHighResTabletEvent"
,
true
);
// boardKeyboardPaletteAutoMinimize = new UBSetting(this, "Board", "KeyboardPaletteAutoMinimize", true);
boardKeyboardPaletteKeyBtnSize
=
new
UBSetting
(
this
,
"Board"
,
"KeyboardPaletteKeyBtnSize"
,
"24x24"
);
boardKeyboardPaletteKeyBtnSize
=
new
UBSetting
(
this
,
"Board"
,
"KeyboardPaletteKeyBtnSize"
,
"16x16"
);
ValidateKeyboardPaletteKeyBtnSize
();
QStringList
penLightBackgroundColors
;
penLightBackgroundColors
<<
"#000000"
<<
"#FF0000"
<<
"#004080"
<<
"#008000"
<<
"#C87400"
<<
"#800040"
<<
"#008080"
<<
"#5F2D0A"
;
...
...
src/core/UBSettings.h
View file @
631adcc3
...
...
@@ -37,6 +37,11 @@ class UBSettings : public QObject
public
:
QStringList
*
supportedKeyboardSizes
;
void
InitKeyboardPaletteKeyBtnSizes
();
void
ValidateKeyboardPaletteKeyBtnSize
();
int
penWidthIndex
();
qreal
currentPenWidth
();
...
...
src/desktop/UBDesktopAnnotationController.cpp
View file @
631adcc3
...
...
@@ -88,7 +88,8 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
if
(
UBPlatformUtils
::
hasVirtualKeyboard
())
{
mKeyboardPalette
=
UBKeyboardPalette
::
create
(
mTransparentDrawingView
);
//mKeyboardPalette->setParent(mTransparentDrawingView);
mKeyboardPalette
->
setParent
(
mTransparentDrawingView
);
connect
(
mKeyboardPalette
,
SIGNAL
(
keyboardActivated
(
bool
)),
mTransparentDrawingView
,
SLOT
(
virtualKeyboardActivated
(
bool
)));
}
connect
(
mDesktopPalette
,
SIGNAL
(
uniboardClick
()),
this
,
SLOT
(
goToUniboard
()));
...
...
src/frameworks/UBPlatformUtils_win.cpp
View file @
631adcc3
...
...
@@ -363,7 +363,7 @@ void UBPlatformUtils::initializeKeyboardLayouts()
void
UBPlatformUtils
::
destroyKeyboardLayouts
()
{
for
(
int
i
=
0
;
i
<
4
;
i
++
)
for
(
int
i
=
0
;
i
<
nKeyboardLayouts
;
i
++
)
delete
keyboardLayouts
[
i
];
delete
[]
keyboardLayouts
;
keyboardLayouts
=
NULL
;
...
...
src/gui/UBKeyboardPalette.cpp
View file @
631adcc3
...
...
@@ -125,20 +125,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/tools/UBGraphicsTriangle.cpp
View file @
631adcc3
...
...
@@ -607,13 +607,13 @@ void UBGraphicsTriangle::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
QPointF
delta
=
event
->
pos
()
-
event
->
lastPos
();
if
(
mOrientation
==
TopLeft
||
mOrientation
==
BottomLeft
)
{
if
(
rect
().
width
()
+
delta
.
x
()
<
sMinWidth
)
delta
.
setX
(
sMinWidth
-
rect
().
width
());
if
(
rect
().
width
()
+
delta
.
x
()
<
(
qreal
)
sMinWidth
)
delta
.
setX
(
(
qreal
)
sMinWidth
-
rect
().
width
());
}
else
{
if
(
rect
().
width
()
-
delta
.
x
()
<
sMinWidth
)
delta
.
setX
(
sMinWidth
-
rect
().
width
());
if
(
rect
().
width
()
-
delta
.
x
()
<
(
qreal
)
sMinWidth
)
delta
.
setX
(
(
qreal
)
sMinWidth
-
rect
().
width
());
}
if
(
mOrientation
==
TopLeft
||
mOrientation
==
BottomLeft
)
{
...
...
@@ -639,13 +639,13 @@ void UBGraphicsTriangle::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
QPointF
delta
=
event
->
pos
()
-
event
->
lastPos
();
if
(
mOrientation
==
BottomRight
||
mOrientation
==
BottomLeft
)
{
if
(
rect
().
height
()
-
delta
.
y
()
<
sMinHeight
)
delta
.
setY
(
sMinHeight
-
rect
().
height
());
if
(
rect
().
height
()
-
delta
.
y
()
<
(
qreal
)
sMinHeight
)
delta
.
setY
(
(
qreal
)
sMinHeight
-
rect
().
height
());
}
else
{
if
(
rect
().
height
()
+
delta
.
y
()
<
sMinHeight
)
delta
.
setY
(
sMinHeight
-
rect
().
height
());
if
(
rect
().
height
()
+
delta
.
y
()
<
(
qreal
)
sMinHeight
)
delta
.
setY
(
(
qreal
)
sMinHeight
-
rect
().
height
());
}
if
(
mOrientation
==
BottomRight
||
mOrientation
==
BottomLeft
)
setRect
(
QRectF
(
...
...
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