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
3b0bb2f0
Commit
3b0bb2f0
authored
Jul 16, 2013
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
copy/paste issue fixed. Issues: 4, 41, 53
parent
4e7f1bb6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
14 deletions
+8
-14
UBBoardController.cpp
src/board/UBBoardController.cpp
+5
-8
UBBoardController.h
src/board/UBBoardController.h
+2
-2
UBMimeData.cpp
src/core/UBMimeData.cpp
+1
-4
No files found.
src/board/UBBoardController.cpp
View file @
3b0bb2f0
...
...
@@ -543,7 +543,7 @@ void UBBoardController::duplicateScene()
duplicateScene
(
mActiveSceneIndex
);
}
UBGraphicsItem
*
UBBoardController
::
duplicateItem
(
UBItem
*
item
,
bool
bAsync
)
UBGraphicsItem
*
UBBoardController
::
duplicateItem
(
UBItem
*
item
)
{
if
(
!
item
)
return
NULL
;
...
...
@@ -602,12 +602,9 @@ UBGraphicsItem *UBBoardController::duplicateItem(UBItem *item, bool bAsync)
if
(
mitem
)
{
sourceUrl
=
mitem
->
mediaFileUrl
();
if
(
bAsync
)
{
downloadURL
(
sourceUrl
,
srcFile
,
itemPos
,
QSize
(
itemSize
.
width
(),
itemSize
.
height
()),
false
,
false
);
return
NULL
;
// async operation
}
}
}
break
;
case
UBMimeType
:
:
VectorImage
:
...
...
@@ -643,8 +640,8 @@ UBGraphicsItem *UBBoardController::duplicateItem(UBItem *item, bool bAsync)
mActiveScene
->
setURStackEnable
(
false
);
foreach
(
QGraphicsItem
*
pIt
,
children
){
UBItem
*
pItem
=
dynamic_cast
<
UBItem
*>
(
pIt
);
if
(
pItem
){
// we diong sync duplication of all childs.
QGraphicsItem
*
itemToGroup
=
dynamic_cast
<
QGraphicsItem
*>
(
duplicateItem
(
pItem
,
false
));
if
(
pItem
){
QGraphicsItem
*
itemToGroup
=
dynamic_cast
<
QGraphicsItem
*>
(
duplicateItem
(
pItem
));
if
(
itemToGroup
)
duplicatedItems
.
append
(
itemToGroup
);
}
...
...
src/board/UBBoardController.h
View file @
3b0bb2f0
...
...
@@ -168,7 +168,7 @@ class UBBoardController : public UBDocumentContainer
void
moveSceneToIndex
(
int
source
,
int
target
);
void
duplicateScene
(
int
index
);
UBGraphicsItem
*
duplicateItem
(
UBItem
*
item
,
bool
bAsync
=
true
);
UBGraphicsItem
*
duplicateItem
(
UBItem
*
item
);
void
deleteScene
(
int
index
);
bool
cacheIsVisible
()
{
return
mCacheWidgetIsEnabled
;}
...
...
src/core/UBMimeData.cpp
View file @
3b0bb2f0
...
...
@@ -61,8 +61,5 @@ UBMimeDataGraphicsItem::UBMimeDataGraphicsItem(QList<UBItem*> pItems)
UBMimeDataGraphicsItem
::~
UBMimeDataGraphicsItem
()
{
foreach
(
UBItem
*
item
,
mItems
){
delete
item
;
item
=
0
;
}
// Explanation: selected items are owned by the scene and handled by this class
}
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