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
0ed0540d
Commit
0ed0540d
authored
Oct 02, 2012
by
Aleksei Kanash
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed creation duplicated groups - used scene mechanism.
Excluded case of trying to determine mime type for empty string.
parent
8ee8b59b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
14 deletions
+19
-14
UBBoardController.cpp
src/board/UBBoardController.cpp
+18
-13
UBFileSystemUtils.cpp
src/frameworks/UBFileSystemUtils.cpp
+1
-1
No files found.
src/board/UBBoardController.cpp
View file @
0ed0540d
...
...
@@ -568,7 +568,10 @@ UBGraphicsItem *UBBoardController::duplicateItem(UBItem *item, bool bAsync)
if
(
srcFile
.
isEmpty
())
srcFile
=
item
->
sourceUrl
().
toString
();
QString
contentTypeHeader
=
UBFileSystemUtils
::
mimeTypeFromFileName
(
srcFile
);
QString
contentTypeHeader
;
if
(
!
srcFile
.
isEmpty
())
contentTypeHeader
=
UBFileSystemUtils
::
mimeTypeFromFileName
(
srcFile
);
if
(
NULL
!=
qgraphicsitem_cast
<
UBGraphicsGroupContainerItem
*>
(
commonItem
))
itemMimeType
=
UBMimeType
::
Group
;
else
...
...
@@ -626,20 +629,30 @@ UBGraphicsItem *UBBoardController::duplicateItem(UBItem *item, bool bAsync)
case
UBMimeType
:
:
Group
:
{
UBGraphicsGroupContainerItem
*
groupItem
=
dynamic_cast
<
UBGraphicsGroupContainerItem
*>
(
item
);
UBGraphicsGroupContainerItem
*
duplicatedGroup
=
new
UBGraphicsGroupContainerItem
()
;
UBGraphicsGroupContainerItem
*
duplicatedGroup
=
NULL
;
QList
<
QGraphicsItem
*>
duplicatedItems
;
QList
<
QGraphicsItem
*>
children
=
groupItem
->
childItems
();
foreach
(
QGraphicsItem
*
pIt
,
children
){
UBItem
*
pItem
=
dynamic_cast
<
UBItem
*>
(
pIt
);
if
(
pItem
)
// we diong sync duplication of all childs.
duplicatedGroup
->
addToGroup
(
dynamic_cast
<
QGraphicsItem
*>
(
duplicateItem
(
pItem
,
false
)));
if
(
pItem
){
// we diong sync duplication of all childs.
QGraphicsItem
*
itemToGroup
=
dynamic_cast
<
QGraphicsItem
*>
(
duplicateItem
(
pItem
,
false
));
if
(
itemToGroup
)
duplicatedItems
.
append
(
itemToGroup
);
}
}
duplicatedGroup
=
mActiveScene
->
createGroup
(
duplicatedItems
);
duplicatedGroup
->
setTransform
(
groupItem
->
transform
());
groupItem
->
setSelected
(
false
);
retItem
=
dynamic_cast
<
UBGraphicsItem
*>
(
duplicatedGroup
);
QGraphicsItem
*
itemToAdd
=
dynamic_cast
<
QGraphicsItem
*>
(
retItem
);
if
(
itemToAdd
)
{
mActiveScene
->
addItem
(
itemToAdd
);
itemToAdd
->
setSelected
(
true
);
}
}
break
;
case
UBMimeType
:
:
UNKNOWN
:
...
...
@@ -657,15 +670,7 @@ UBGraphicsItem *UBBoardController::duplicateItem(UBItem *item, bool bAsync)
}
if
(
retItem
)
{
QGraphicsItem
*
itemToAdd
=
dynamic_cast
<
QGraphicsItem
*>
(
retItem
);
if
(
itemToAdd
)
{
mActiveScene
->
addItem
(
itemToAdd
);
itemToAdd
->
setSelected
(
true
);
}
return
retItem
;
}
UBItem
*
createdItem
=
downloadFinished
(
true
,
sourceUrl
,
srcFile
,
contentTypeHeader
,
pData
,
itemPos
,
QSize
(
itemSize
.
width
(),
itemSize
.
height
()),
false
);
if
(
createdItem
)
...
...
src/frameworks/UBFileSystemUtils.cpp
View file @
0ed0540d
...
...
@@ -853,4 +853,4 @@ QString UBFileSystemUtils::readTextFile(QString path)
}
return
""
;
}
\ No newline at end of file
}
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