diff --git a/release.linux.sh b/release.linux.sh index 9251d438..51742ee3 100644 --- a/release.linux.sh +++ b/release.linux.sh @@ -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" diff --git a/resources/library/interactive/VideoPicker.wgt/index.html b/resources/library/interactive/VideoPicker.wgt/index.html index 7e43c48f..eb4116cb 100644 --- a/resources/library/interactive/VideoPicker.wgt/index.html +++ b/resources/library/interactive/VideoPicker.wgt/index.html @@ -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(); }); diff --git a/src/domain/UBGraphicsDelegateFrame.cpp b/src/domain/UBGraphicsDelegateFrame.cpp index a63cabe5..f0952ac3 100644 --- a/src/domain/UBGraphicsDelegateFrame.cpp +++ b/src/domain/UBGraphicsDelegateFrame.cpp @@ -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()) diff --git a/src/domain/UBGraphicsDelegateFrame.h b/src/domain/UBGraphicsDelegateFrame.h index d22768e3..71508419 100644 --- a/src/domain/UBGraphicsDelegateFrame.h +++ b/src/domain/UBGraphicsDelegateFrame.h @@ -17,8 +17,6 @@ #define UBGRAPHICSDELEGATEFRAME_H_ #include - - #include "core/UB.h" class QGraphicsSceneMouseEvent; diff --git a/src/domain/UBGraphicsItemDelegate.cpp b/src/domain/UBGraphicsItemDelegate.cpp index 7031493c..612527f2 100644 --- a/src/domain/UBGraphicsItemDelegate.cpp +++ b/src/domain/UBGraphicsItemDelegate.cpp @@ -267,6 +267,7 @@ void UBGraphicsItemDelegate::positionHandles() void UBGraphicsItemDelegate::remove(bool canUndo) { QGraphicsScene* scene = mDelegated->scene(); + if (scene) { foreach(DelegateButton* button, mButtons) diff --git a/src/domain/UBGraphicsProxyWidget.h b/src/domain/UBGraphicsProxyWidget.h index 1bfd01f9..13de05fb 100644 --- a/src/domain/UBGraphicsProxyWidget.h +++ b/src/domain/UBGraphicsProxyWidget.h @@ -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_ */ diff --git a/src/domain/UBGraphicsWidgetItem.cpp b/src/domain/UBGraphicsWidgetItem.cpp index 8750dce3..b1246f2a 100644 --- a/src/domain/UBGraphicsWidgetItem.cpp +++ b/src/domain/UBGraphicsWidgetItem.cpp @@ -246,7 +246,6 @@ void UBGraphicsWidgetItem::removeScript() } } - UBGraphicsAppleWidgetItem::UBGraphicsAppleWidgetItem(const QUrl& pWidgetUrl, QGraphicsItem *parent) : UBGraphicsWidgetItem(parent) {