Replace DVEventAddImage by DiagramEventAddImage.

Use is unchanged.


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4257 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2015-11-12 17:01:08 +00:00
parent 635aec4ad2
commit ce75710f6c
6 changed files with 243 additions and 235 deletions

View File

@@ -35,11 +35,11 @@
#include "nomenclature.h"
#include "diagramfoliolist.h"
#include "qetshapeitem.h"
#include "dveventaddimage.h"
#include "dveventaddtext.h"
#include "reportproperties.h"
#include "diagrampropertieseditordockwidget.h"
#include "diagrameventaddshape.h"
#include "diagrameventaddimage.h"
#include "ui/dialogautonum.h"
@@ -1146,18 +1146,6 @@ void QETDiagramEditor::addItemGroupTriggered(QAction *action)
if (value == "text")
dvevent = new DVEventAddText(dv);
else if (value == "image")
{
DVEventAddImage *event = new DVEventAddImage(dv);
if (event -> isNull())
{
delete event;
action->setChecked(false);
return;
}
else
dvevent = event;
}
if (dvevent)
{
@@ -1179,6 +1167,18 @@ void QETDiagramEditor::addItemGroupTriggered(QAction *action)
diagram_event = new DiagramEventAddShape (d, QetShapeItem::Ellipse);
else if (value == "polyline")
diagram_event = new DiagramEventAddShape (d, QetShapeItem::Polygon);
else if (value == "image")
{
DiagramEventAddImage *deai = new DiagramEventAddImage(d);
if (deai->isNull())
{
delete deai;
action->setChecked(false);
return;
}
else
diagram_event = deai;
}
if (diagram_event)
{