Reverting previous commit and going back to revision 4475.

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4477 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
dfochi
2016-05-13 13:48:36 +00:00
parent fa4714b95d
commit f077361856
31 changed files with 850 additions and 2000 deletions

View File

@@ -55,14 +55,12 @@ DiagramPropertiesDialog::DiagramPropertiesDialog(Diagram *diagram, QWidget *pare
//Title block widget
TitleBlockPropertiesWidget *titleblock_infos;
if (QETProject *parent_project = diagram -> project()) {
titleblock_infos = new TitleBlockPropertiesWidget(parent_project -> embeddedTitleBlockTemplatesCollection(), titleblock, false, diagram->project(), this);
titleblock_infos = new TitleBlockPropertiesWidget(parent_project -> embeddedTitleBlockTemplatesCollection(), titleblock, false, this);
connect(titleblock_infos, SIGNAL(editTitleBlockTemplate(QString, bool)), diagram->views().first(), SIGNAL(editTitleBlockTemplate(QString, bool)));
}
else
titleblock_infos = new TitleBlockPropertiesWidget(titleblock, false, diagram->project(), this);
titleblock_infos = new TitleBlockPropertiesWidget(titleblock, false, this);
titleblock_infos -> setReadOnly(diagram_is_read_only);
connect(titleblock_infos,SIGNAL(openAutoNumFolioEditor(QString)),this,SLOT(editAutoFolioNum()));
titleblock_infos->setMinimumSize(590,480); //Minimum Size needed for correct display
//Conductor widget
ConductorPropertiesWidget *cpw = new ConductorPropertiesWidget(conductors, this);
@@ -126,7 +124,7 @@ void DiagramPropertiesDialog::diagramPropertiesDialog(Diagram *diagram, QWidget
/**
* @brief DiagramPropertiesDialog::editAutonum
* Open conductor autonum editor
* Open the autonum editor
*/
void DiagramPropertiesDialog::editAutonum() {
ProjectPropertiesDialog ppd (m_diagram->project(), this);
@@ -134,14 +132,3 @@ void DiagramPropertiesDialog::editAutonum() {
ppd.exec();
m_asw -> setItems (m_diagram -> project() -> conductorAutoNum().keys());
}
/**
* @brief DiagramPropertiesDialog::editAutonum
* Open folio autonum editor
*/
void DiagramPropertiesDialog::editAutoFolioNum () {
ProjectPropertiesDialog ppd (m_diagram->project(), this);
ppd.setCurrentPage(ProjectPropertiesDialog::Autonum);
ppd.changeToFolio();
ppd.exec();
}