video picker deletion bug fixed

preferencesAboutTextFull
Ivan Ilin 13 years ago
parent 7f92409fb5
commit 41b0e183f7
  1. 2
      release.linux.sh
  2. 9
      resources/library/interactive/VideoPicker.wgt/index.html
  3. 2
      src/domain/UBGraphicsDelegateFrame.cpp
  4. 2
      src/domain/UBGraphicsDelegateFrame.h
  5. 1
      src/domain/UBGraphicsItemDelegate.cpp
  6. 4
      src/domain/UBGraphicsProxyWidget.h
  7. 1
      src/domain/UBGraphicsWidgetItem.cpp

@ -19,7 +19,7 @@ make clean
rm -rf build/linux/release/ rm -rf build/linux/release/
rm -rf install 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" PLUGINS_PATH="$QT_PATH/plugins"
QMAKE_PATH="$QT_PATH/bin/qmake" QMAKE_PATH="$QT_PATH/bin/qmake"

@ -166,6 +166,15 @@
return(parseInt(cssvalue.replace("px", ""))); return(parseInt(cssvalue.replace("px", "")));
}; };
if (window.widget) {
window.widget.onremove = function(){
//$("#show-inputfield-button").trigger("click");
$("#embeded-content")
.empty();
//.oembed($("#textbox").val());
}
}
initialize(); initialize();
}); });
</script> </script>

@ -106,7 +106,6 @@ void UBGraphicsDelegateFrame::setAntiScale(qreal pAntiScale)
mRightResizeGripSvgItem->setTransform(tr); mRightResizeGripSvgItem->setTransform(tr);
mTopResizeGripSvgItem->setTransform(tr); mTopResizeGripSvgItem->setTransform(tr);
mRotateButton->setTransform(tr); mRotateButton->setTransform(tr);
} }
@ -541,7 +540,6 @@ QGraphicsItem* UBGraphicsDelegateFrame::delegated()
return mDelegate->delegated(); return mDelegate->delegated();
} }
UBGraphicsDelegateFrame::FrameTool UBGraphicsDelegateFrame::toolFromPos(QPointF pos) UBGraphicsDelegateFrame::FrameTool UBGraphicsDelegateFrame::toolFromPos(QPointF pos)
{ {
if(mDelegate->isLocked()) if(mDelegate->isLocked())

@ -17,8 +17,6 @@
#define UBGRAPHICSDELEGATEFRAME_H_ #define UBGRAPHICSDELEGATEFRAME_H_
#include <QtGui> #include <QtGui>
#include "core/UB.h" #include "core/UB.h"
class QGraphicsSceneMouseEvent; class QGraphicsSceneMouseEvent;

@ -267,6 +267,7 @@ void UBGraphicsItemDelegate::positionHandles()
void UBGraphicsItemDelegate::remove(bool canUndo) void UBGraphicsItemDelegate::remove(bool canUndo)
{ {
QGraphicsScene* scene = mDelegated->scene(); QGraphicsScene* scene = mDelegated->scene();
if (scene) if (scene)
{ {
foreach(DelegateButton* button, mButtons) foreach(DelegateButton* button, mButtons)

@ -41,7 +41,7 @@ class UBGraphicsProxyWidget: public QGraphicsProxyWidget, public UBItem, public
virtual void remove(); virtual void remove();
UBGraphicsItemDelegate* delegate () { return mDelegate;}; UBGraphicsItemDelegate* delegate (){ return mDelegate;};
protected: protected:
@ -52,8 +52,6 @@ class UBGraphicsProxyWidget: public QGraphicsProxyWidget, public UBItem, public
virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
UBGraphicsItemDelegate* mDelegate; UBGraphicsItemDelegate* mDelegate;
}; };
#endif /* UBGRAPHICSPROXYWIDGET_H_ */ #endif /* UBGRAPHICSPROXYWIDGET_H_ */

@ -246,7 +246,6 @@ void UBGraphicsWidgetItem::removeScript()
} }
} }
UBGraphicsAppleWidgetItem::UBGraphicsAppleWidgetItem(const QUrl& pWidgetUrl, QGraphicsItem *parent) UBGraphicsAppleWidgetItem::UBGraphicsAppleWidgetItem(const QUrl& pWidgetUrl, QGraphicsItem *parent)
: UBGraphicsWidgetItem(parent) : UBGraphicsWidgetItem(parent)
{ {

Loading…
Cancel
Save