mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-09-14 20:33:05 +02:00
Merge pull request #315 from plc-user/master
Fix missing company-titleblocks in properties-dialog
This commit is contained in:
commit
31c0267cd5
@ -510,7 +510,7 @@ void QETProject::setDefaultTitleBlockProperties(const TitleBlockProperties &titl
|
|||||||
collection = QETApp::commonTitleBlockTemplatesCollection();
|
collection = QETApp::commonTitleBlockTemplatesCollection();
|
||||||
break;
|
break;
|
||||||
case QET::Company :
|
case QET::Company :
|
||||||
// collection = QETApp::companyTitleBlockTemplatesCollection();
|
collection = QETApp::companyTitleBlockTemplatesCollection();
|
||||||
break;
|
break;
|
||||||
case QET::Custom :
|
case QET::Custom :
|
||||||
collection = QETApp::customTitleBlockTemplatesCollection();
|
collection = QETApp::customTitleBlockTemplatesCollection();
|
||||||
|
@ -57,6 +57,7 @@ NewDiagramPage::NewDiagramPage(QETProject *project,
|
|||||||
// default titleblock properties
|
// default titleblock properties
|
||||||
QList <TitleBlockTemplatesCollection *> c;
|
QList <TitleBlockTemplatesCollection *> c;
|
||||||
c << QETApp::commonTitleBlockTemplatesCollection()
|
c << QETApp::commonTitleBlockTemplatesCollection()
|
||||||
|
<< QETApp::companyTitleBlockTemplatesCollection()
|
||||||
<< QETApp::customTitleBlockTemplatesCollection();
|
<< QETApp::customTitleBlockTemplatesCollection();
|
||||||
if (m_project) c << m_project->embeddedTitleBlockTemplatesCollection();
|
if (m_project) c << m_project->embeddedTitleBlockTemplatesCollection();
|
||||||
ipw = new TitleBlockPropertiesWidget(
|
ipw = new TitleBlockPropertiesWidget(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user