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
1fd290d6
Commit
1fd290d6
authored
May 24, 2012
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'Sankore-1.40' of github.com:Sankore/Sankore-3.1 into Sankore-1.40
parents
8d14c8c8
b529da11
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
UBWidgetUniboardAPI.cpp
src/api/UBWidgetUniboardAPI.cpp
+4
-1
UBBoardController.cpp
src/board/UBBoardController.cpp
+7
-3
No files found.
src/api/UBWidgetUniboardAPI.cpp
View file @
1fd290d6
...
...
@@ -467,7 +467,10 @@ void UBWidgetUniboardAPI::sendFileMetadata(QString metaData)
void
UBWidgetUniboardAPI
::
enableDropOnWidget
(
bool
enable
)
{
mGraphicsWidget
->
setAcceptDrops
(
enable
);
if
(
mGraphicsWidget
)
{
mGraphicsWidget
->
setAcceptDrops
(
enable
);
}
}
void
UBWidgetUniboardAPI
::
ProcessDropEvent
(
QDropEvent
*
event
)
...
...
src/board/UBBoardController.cpp
View file @
1fd290d6
...
...
@@ -1959,8 +1959,12 @@ void UBBoardController::processMimeData(const QMimeData* pMimeData, const QPoint
if
(
""
!=
url
)
{
downloadURL
(
url
,
pPos
);
return
;
}
else
{
mActiveScene
->
addTextHtml
(
qsHtml
,
pPos
);
}
return
;
}
if
(
pMimeData
->
hasUrls
())
...
...
@@ -1996,11 +2000,11 @@ void UBBoardController::processMimeData(const QMimeData* pMimeData, const QPoint
if
(
""
!=
pMimeData
->
text
()){
// Sometimes, it is possible to have an URL as text. we check here if it is the case
QString
qsTmp
=
pMimeData
->
text
().
remove
(
QRegExp
(
"[
\\
0]"
));
if
(
qsTmp
.
startsWith
(
"http"
)){
if
(
qsTmp
.
startsWith
(
"http
://"
)
||
qsTmp
.
startsWith
(
"https://
"
)){
downloadURL
(
QUrl
(
qsTmp
),
pPos
);
}
else
{
mActiveScene
->
addTextHtml
(
pMimeData
->
html
(),
pPos
);
mActiveScene
->
addTextHtml
(
pMimeData
->
text
(),
pPos
);
}
}
else
{
...
...
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