BorderPropertiesWridget: replace widget made with C++ by widget build by ui file.

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3203 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2014-07-11 16:45:18 +00:00
parent 5a8bb42153
commit e7600cb3d4
8 changed files with 256 additions and 235 deletions

View File

@@ -31,7 +31,6 @@
#include "templatelocation.h"
#include "qetapp.h"
#include "qetproject.h"
#include "borderpropertieswidget.h"
#include "integrationmoveelementshandler.h"
#include "integrationmovetemplateshandler.h"
#include "qetdiagrameditor.h"
@@ -43,6 +42,7 @@
#include <QGraphicsPixmapItem>
#include <QGraphicsSceneMouseEvent>
#include "factory/elementfactory.h"
#include "ui/borderpropertieswidget.h"
/**
@@ -688,7 +688,7 @@ void DiagramView::editDiagramProperties() {
// si le dialogue est accepte
if (popup.exec() == QDialog::Accepted && !diagram_is_read_only) {
TitleBlockProperties new_titleblock = titleblock_infos -> titleBlockProperties();
BorderProperties new_border = border_infos -> borderProperties();
BorderProperties new_border = border_infos -> properties();
ConductorProperties new_conductors = cpw -> conductorProperties();
bool adjust_scene = false;