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
c4f883cd
Commit
c4f883cd
authored
Jul 03, 2013
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some cosmetic
parent
869e4cdd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
22 deletions
+9
-22
UBGraphicsItemDelegate.cpp
src/domain/UBGraphicsItemDelegate.cpp
+0
-6
UBGraphicsMediaItem.cpp
src/domain/UBGraphicsMediaItem.cpp
+4
-14
UBGraphicsProxyWidget.cpp
src/domain/UBGraphicsProxyWidget.cpp
+5
-2
No files found.
src/domain/UBGraphicsItemDelegate.cpp
View file @
c4f883cd
...
...
@@ -363,15 +363,9 @@ bool UBGraphicsItemDelegate::weelEvent(QGraphicsSceneWheelEvent *event)
{
Q_UNUSED
(
event
);
if
(
delegated
()
->
isSelected
()
)
{
// event->accept();
return
true
;
}
else
{
// event->ignore();
return
false
;
}
}
bool
UBGraphicsItemDelegate
::
mouseReleaseEvent
(
QGraphicsSceneMouseEvent
*
event
)
...
...
src/domain/UBGraphicsMediaItem.cpp
View file @
c4f883cd
...
...
@@ -68,8 +68,7 @@ UBGraphicsMediaItem::UBGraphicsMediaItem(const QUrl& pMediaFileUrl, QGraphicsIte
haveLinkedImage
=
true
;
}
else
if
(
mediaPath
.
toLower
().
contains
(
"audios"
))
{
else
if
(
mediaPath
.
toLower
().
contains
(
"audios"
)){
mMediaType
=
mediaType_Audio
;
mAudioOutput
=
new
Phonon
::
AudioOutput
(
Phonon
::
MusicCategory
,
this
);
...
...
@@ -188,8 +187,7 @@ void UBGraphicsMediaItem::hasMediaChanged(bool hasMedia)
{
if
(
hasMedia
&&
mMediaObject
->
isSeekable
())
{
Q_UNUSED
(
hasMedia
);
mMediaObject
->
seek
(
mInitialPos
);
mMediaObject
->
seek
(
mInitialPos
);
UBGraphicsMediaItemDelegate
*
med
=
dynamic_cast
<
UBGraphicsMediaItemDelegate
*>
(
Delegate
());
if
(
med
)
med
->
updateTicker
(
initialPos
());
...
...
@@ -206,9 +204,7 @@ UBGraphicsScene* UBGraphicsMediaItem::scene()
void
UBGraphicsMediaItem
::
activeSceneChanged
()
{
if
(
UBApplication
::
boardController
->
activeScene
()
!=
scene
())
{
mMediaObject
->
pause
();
}
}
...
...
@@ -269,9 +265,7 @@ void UBGraphicsMediaItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
{
QGraphicsItem
*
curItem
=
group
->
getCurrentItem
();
if
(
curItem
&&
this
!=
curItem
)
{
group
->
deselectCurrentItem
();
}
group
->
setCurrentItem
(
this
);
this
->
setSelected
(
true
);
Delegate
()
->
positionHandles
();
...
...
@@ -280,16 +274,12 @@ void UBGraphicsMediaItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
}
}
if
(
parentItem
()
&&
parentItem
()
->
type
()
==
UBGraphicsGroupContainerItem
::
Type
)
{
if
(
parentItem
()
&&
parentItem
()
->
type
()
==
UBGraphicsGroupContainerItem
::
Type
)
{
mShouldMove
=
false
;
if
(
!
Delegate
()
->
mousePressEvent
(
event
))
{
event
->
accept
();
}
}
else
{
else
{
mShouldMove
=
(
event
->
buttons
()
&
Qt
::
LeftButton
);
mMousePressPos
=
event
->
scenePos
();
mMouseMovePos
=
mMousePressPos
;
...
...
src/domain/UBGraphicsProxyWidget.cpp
View file @
c4f883cd
...
...
@@ -116,8 +116,11 @@ void UBGraphicsProxyWidget::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
void
UBGraphicsProxyWidget
::
mouseReleaseEvent
(
QGraphicsSceneMouseEvent
*
event
)
{
Delegate
()
->
mouseReleaseEvent
(
event
);
QGraphicsProxyWidget
::
mouseReleaseEvent
(
event
);
if
(
Delegate
()
->
mouseReleaseEvent
(
event
)){
}
else
QGraphicsProxyWidget
::
mouseReleaseEvent
(
event
);
}
void
UBGraphicsProxyWidget
::
wheelEvent
(
QGraphicsSceneWheelEvent
*
event
)
...
...
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