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
46e4d409
Commit
46e4d409
authored
Sep 15, 2011
by
Ivan Ilin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
virtual keyboard bug fixed. Linux tested
parent
9c1928d7
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
30 additions
and
3 deletions
+30
-3
Extrait dÔÇÖimage 2.pictClipping
.../Stopwatch.wgt/images/Extrait dÔÇÖimage 2.pictClipping
+0
-0
Extrait dÔÇÖimage.pictClipping
...ve/Stopwatch.wgt/images/Extrait dÔÇÖimage.pictClipping
+0
-0
Extrait dÔÇÖimage 2.pictClipping
...ive/Stopwatch.wgt/images/Extrait dÔÇÖimage 2.pictClipping
+0
-0
Extrait dÔÇÖimage.pictClipping
...ctive/Stopwatch.wgt/images/Extrait dÔÇÖimage.pictClipping
+0
-0
UBBoardPaletteManager.cpp
src/board/UBBoardPaletteManager.cpp
+3
-0
UBKeyboardPalette.h
src/gui/UBKeyboardPalette.h
+1
-0
UBKeyboardPalette_linux.cpp
src/gui/UBKeyboardPalette_linux.cpp
+15
-2
UBKeyboardPalette_mac.cpp
src/gui/UBKeyboardPalette_mac.cpp
+4
-1
UBKeyboardPalette_win.cpp
src/gui/UBKeyboardPalette_win.cpp
+3
-0
UBWebController.cpp
src/web/UBWebController.cpp
+4
-0
No files found.
resources/library/interactive/Stopwatch.wgt/images/Extrait dÔÇÖimage 2.pictClipping
deleted
100644 → 0
View file @
9c1928d7
resources/library/interactive/Stopwatch.wgt/images/Extrait dÔÇÖimage.pictClipping
deleted
100644 → 0
View file @
9c1928d7
resources/library/interactive/Stopwatch.wgt/images/Extrait dÔÇÖimage 2.pictClipping
deleted
100644 → 0
View file @
9c1928d7
resources/library/interactive/Stopwatch.wgt/images/Extrait dÔÇÖimage.pictClipping
deleted
100644 → 0
View file @
9c1928d7
src/board/UBBoardPaletteManager.cpp
View file @
46e4d409
...
@@ -168,6 +168,9 @@ void UBBoardPaletteManager::setupPalettes()
...
@@ -168,6 +168,9 @@ void UBBoardPaletteManager::setupPalettes()
if
(
UBPlatformUtils
::
hasVirtualKeyboard
())
if
(
UBPlatformUtils
::
hasVirtualKeyboard
())
{
{
mKeyboardPalette
=
UBKeyboardPalette
::
create
(
0
);
mKeyboardPalette
=
UBKeyboardPalette
::
create
(
0
);
#ifndef Q_WS_WIN
connect
(
mKeyboardPalette
,
SIGNAL
(
closed
()),
mKeyboardPalette
,
SLOT
(
onDeactivated
()));
#endif
#ifndef Q_WS_MAC
#ifndef Q_WS_MAC
mKeyboardPalette
->
setParent
(
mContainer
);
mKeyboardPalette
->
setParent
(
mContainer
);
#endif
#endif
...
...
src/gui/UBKeyboardPalette.h
View file @
46e4d409
...
@@ -92,6 +92,7 @@ private slots:
...
@@ -92,6 +92,7 @@ private slots:
void
syncLocale
(
int
nLocale
);
void
syncLocale
(
int
nLocale
);
void
keyboardPaletteButtonSizeChanged
(
QVariant
size
);
void
keyboardPaletteButtonSizeChanged
(
QVariant
size
);
void
onActivated
(
bool
b
);
void
onActivated
(
bool
b
);
void
onDeactivated
();
void
showKeyboard
(
bool
show
);
void
showKeyboard
(
bool
show
);
void
hideKeyboard
();
void
hideKeyboard
();
...
...
src/gui/UBKeyboardPalette_linux.cpp
View file @
46e4d409
...
@@ -154,15 +154,28 @@ void UBKeyboardPalette::onActivated(bool activated)
...
@@ -154,15 +154,28 @@ void UBKeyboardPalette::onActivated(bool activated)
XChangeKeyboardMapping
(
display
,
min_keycodes
,
byte_per_code
,
XChangeKeyboardMapping
(
display
,
min_keycodes
,
byte_per_code
,
keySyms
,
max_keycodes
-
min_keycodes
);
keySyms
,
max_keycodes
-
min_keycodes
);
XFree
(
keySyms
);
}
XFree
(
keySyms
);
}
XCloseDisplay
(
display
);
XCloseDisplay
(
display
);
}
}
}
}
void
UBKeyboardPalette
::
onDeactivated
()
{
Display
*
display
=
XOpenDisplay
(
0
);
if
(
display
==
NULL
)
return
;
KeySym
*
keySyms
=
(
KeySym
*
)
storage
;
if
(
keySyms
!=
NULL
)
{
XChangeKeyboardMapping
(
display
,
min_keycodes
,
byte_per_code
,
keySyms
,
max_keycodes
-
min_keycodes
);
}
XCloseDisplay
(
display
);
}
void
setSymbolsFromButton
(
Display
*
display
,
void
setSymbolsFromButton
(
Display
*
display
,
const
UBKeyboardLocale
&
locale
,
const
UBKeyboardLocale
&
locale
,
...
...
src/gui/UBKeyboardPalette_mac.cpp
View file @
46e4d409
...
@@ -102,7 +102,10 @@ void UBKeyboardPalette::onActivated(bool activated)
...
@@ -102,7 +102,10 @@ void UBKeyboardPalette::onActivated(bool activated)
SetMacLocaleByIdentifier
(
activeLocale
);
SetMacLocaleByIdentifier
(
activeLocale
);
}
}
}
}
void
UBKeyboardPalette
::
onDeactivated
()
{
SetMacLocaleByIdentifier
(
activeLocale
);
}
void
UBKeyboardPalette
::
onLocaleChanged
(
UBKeyboardLocale
*
locale
)
void
UBKeyboardPalette
::
onLocaleChanged
(
UBKeyboardLocale
*
locale
)
{
{
SetMacLocaleByIdentifier
(
locale
->
id
);
SetMacLocaleByIdentifier
(
locale
->
id
);
...
...
src/gui/UBKeyboardPalette_win.cpp
View file @
46e4d409
...
@@ -70,7 +70,10 @@ void UBKeyboardPalette::createCtrlButtons()
...
@@ -70,7 +70,10 @@ void UBKeyboardPalette::createCtrlButtons()
void
UBKeyboardPalette
::
onActivated
(
bool
)
void
UBKeyboardPalette
::
onActivated
(
bool
)
{
{
}
}
void
UBKeyboardPalette
::
onDeactivated
()
{
}
void
UBKeyboardPalette
::
onLocaleChanged
(
UBKeyboardLocale
*
)
void
UBKeyboardPalette
::
onLocaleChanged
(
UBKeyboardLocale
*
)
{}
{}
src/web/UBWebController.cpp
View file @
46e4d409
...
@@ -370,6 +370,10 @@ void UBWebController::setupPalettes()
...
@@ -370,6 +370,10 @@ void UBWebController::setupPalettes()
(
*
mToolsCurrentPalette
)
=
new
UBWebToolsPalette
((
*
mCurrentWebBrowser
),
false
);
(
*
mToolsCurrentPalette
)
=
new
UBWebToolsPalette
((
*
mCurrentWebBrowser
),
false
);
(
*
mKeyboardCurrentPalette
)
=
UBKeyboardPalette
::
create
(
*
mCurrentWebBrowser
);
(
*
mKeyboardCurrentPalette
)
=
UBKeyboardPalette
::
create
(
*
mCurrentWebBrowser
);
#ifndef Q_WS_WIN
if
(
*
mKeyboardCurrentPalette
)
connect
(
*
mKeyboardCurrentPalette
,
SIGNAL
(
closed
()),
*
mKeyboardCurrentPalette
,
SLOT
(
onDeactivated
()));
#endif
connect
(
mMainWindow
->
actionWebTrapFlash
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
trapFlash
()));
connect
(
mMainWindow
->
actionWebTrapFlash
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
trapFlash
()));
connect
(
mMainWindow
->
actionWebCustomCapture
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
customCapture
()));
connect
(
mMainWindow
->
actionWebCustomCapture
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
customCapture
()));
...
...
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