kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 12:40:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

TitleBlockPropertiesWidget: replace widget made with c++ by widget made with ui file

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3204 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2014-07-12 13:14:47 +00:00
parent e7600cb3d4
commit bb378b4efb
8 changed files with 652 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sources/diagramview.cpp
View File

@@ -653,7 +653,7 @@ void DiagramView::editDiagramProperties() {
titleblock_infos -> setTitleBlockTemplatesVisible(true);
// we have to parse again the TitleBlockProperties object, since the
// first parsing did not know of our templates
titleblock_infos -> setTitleBlockProperties(titleblock);
titleblock_infos -> setProperties(titleblock);
// relay the signal that requires a title block template edition
connect(titleblock_infos, SIGNAL(editTitleBlockTemplate(QString, bool)), this, SIGNAL(editTitleBlockTemplate(QString, bool)));
}
@@ -667,27 +667,15 @@ void DiagramView::editDiagramProperties() {
connect(&boutons, SIGNAL(accepted()), &popup, SLOT(accept()));
connect(&boutons, SIGNAL(rejected()), &popup, SLOT(reject()));
// usual layout for these three widgets
QHBoxLayout *hlayout1 = new QHBoxLayout();
QVBoxLayout *vlayout2 = new QVBoxLayout();
vlayout2 -> addWidget(border_infos);
vlayout2 -> addWidget(titleblock_infos);
vlayout2 -> setSpacing(5);
hlayout1 -> addLayout(vlayout2);
hlayout1 -> addWidget(cpw);
hlayout1 -> setAlignment(cpw, Qt::AlignTop);
// ajout dans une disposition verticale
QVBoxLayout layout_v(&popup);
layout_v.addLayout(hlayout1);
layout_v.addStretch();
layout_v.addWidget(&boutons);
QGridLayout glayout(&popup);
glayout.addWidget(border_infos,0,0);
glayout.addWidget(titleblock_infos, 1, 0);
glayout.addWidget(cpw, 0, 1, 0 ,1, Qt::AlignTop);
glayout.addWidget(&boutons, 2, 1);
// si le dialogue est accepte
// if dialog is accepted
if (popup.exec() == QDialog::Accepted && !diagram_is_read_only) {
TitleBlockProperties new_titleblock = titleblock_infos -> titleBlockProperties();
TitleBlockProperties new_titleblock = titleblock_infos -> properties();
BorderProperties new_border = border_infos -> properties();
ConductorProperties new_conductors = cpw -> conductorProperties();