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
41b0e183
Commit
41b0e183
authored
Oct 10, 2011
by
Ivan Ilin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
video picker deletion bug fixed
parent
7f92409f
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
9 deletions
+12
-9
release.linux.sh
release.linux.sh
+1
-1
index.html
resources/library/interactive/VideoPicker.wgt/index.html
+9
-0
UBGraphicsDelegateFrame.cpp
src/domain/UBGraphicsDelegateFrame.cpp
+0
-2
UBGraphicsDelegateFrame.h
src/domain/UBGraphicsDelegateFrame.h
+0
-2
UBGraphicsItemDelegate.cpp
src/domain/UBGraphicsItemDelegate.cpp
+1
-0
UBGraphicsProxyWidget.h
src/domain/UBGraphicsProxyWidget.h
+1
-3
UBGraphicsWidgetItem.cpp
src/domain/UBGraphicsWidgetItem.cpp
+0
-1
No files found.
release.linux.sh
View file @
41b0e183
...
...
@@ -19,7 +19,7 @@ make clean
rm
-rf
build/linux/release/
rm
-rf
install
QT_PATH
=
"/usr/local/Trolltech/Qt-4.7.
0
"
QT_PATH
=
"/usr/local/Trolltech/Qt-4.7.
3
"
PLUGINS_PATH
=
"
$QT_PATH
/plugins"
QMAKE_PATH
=
"
$QT_PATH
/bin/qmake"
...
...
resources/library/interactive/VideoPicker.wgt/index.html
View file @
41b0e183
...
...
@@ -166,6 +166,15 @@
return
(
parseInt
(
cssvalue
.
replace
(
"px"
,
""
)));
};
if
(
window
.
widget
)
{
window
.
widget
.
onremove
=
function
(){
//$("#show-inputfield-button").trigger("click");
$
(
"#embeded-content"
)
.
empty
();
//.oembed($("#textbox").val());
}
}
initialize
();
});
</script>
...
...
src/domain/UBGraphicsDelegateFrame.cpp
View file @
41b0e183
...
...
@@ -106,7 +106,6 @@ void UBGraphicsDelegateFrame::setAntiScale(qreal pAntiScale)
mRightResizeGripSvgItem
->
setTransform
(
tr
);
mTopResizeGripSvgItem
->
setTransform
(
tr
);
mRotateButton
->
setTransform
(
tr
);
}
...
...
@@ -541,7 +540,6 @@ QGraphicsItem* UBGraphicsDelegateFrame::delegated()
return
mDelegate
->
delegated
();
}
UBGraphicsDelegateFrame
::
FrameTool
UBGraphicsDelegateFrame
::
toolFromPos
(
QPointF
pos
)
{
if
(
mDelegate
->
isLocked
())
...
...
src/domain/UBGraphicsDelegateFrame.h
View file @
41b0e183
...
...
@@ -17,8 +17,6 @@
#define UBGRAPHICSDELEGATEFRAME_H_
#include <QtGui>
#include "core/UB.h"
class
QGraphicsSceneMouseEvent
;
...
...
src/domain/UBGraphicsItemDelegate.cpp
View file @
41b0e183
...
...
@@ -267,6 +267,7 @@ void UBGraphicsItemDelegate::positionHandles()
void
UBGraphicsItemDelegate
::
remove
(
bool
canUndo
)
{
QGraphicsScene
*
scene
=
mDelegated
->
scene
();
if
(
scene
)
{
foreach
(
DelegateButton
*
button
,
mButtons
)
...
...
src/domain/UBGraphicsProxyWidget.h
View file @
41b0e183
...
...
@@ -41,7 +41,7 @@ class UBGraphicsProxyWidget: public QGraphicsProxyWidget, public UBItem, public
virtual
void
remove
();
UBGraphicsItemDelegate
*
delegate
()
{
return
mDelegate
;};
UBGraphicsItemDelegate
*
delegate
(){
return
mDelegate
;};
protected
:
...
...
@@ -52,8 +52,6 @@ class UBGraphicsProxyWidget: public QGraphicsProxyWidget, public UBItem, public
virtual
QVariant
itemChange
(
GraphicsItemChange
change
,
const
QVariant
&
value
);
UBGraphicsItemDelegate
*
mDelegate
;
};
#endif
/* UBGRAPHICSPROXYWIDGET_H_ */
src/domain/UBGraphicsWidgetItem.cpp
View file @
41b0e183
...
...
@@ -246,7 +246,6 @@ void UBGraphicsWidgetItem::removeScript()
}
}
UBGraphicsAppleWidgetItem
::
UBGraphicsAppleWidgetItem
(
const
QUrl
&
pWidgetUrl
,
QGraphicsItem
*
parent
)
:
UBGraphicsWidgetItem
(
parent
)
{
...
...
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