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

@@ -35,9 +35,8 @@
* else edit the properties by default of QElectroTech
* @param parent, parent widget
*/
NewDiagramPage::NewDiagramPage(QETProject *project, QWidget *parent, ProjectPropertiesDialog *ppd) :
NewDiagramPage::NewDiagramPage(QETProject *project, QWidget *parent) :
ConfigPage (parent),
ppd_ (ppd),
m_project (project)
{
//By default we set the global default properties
@@ -48,7 +47,7 @@ NewDiagramPage::NewDiagramPage(QETProject *project, QWidget *parent, ProjectProp
QList <TitleBlockTemplatesCollection *> c;
c << QETApp::commonTitleBlockTemplatesCollection() << QETApp::customTitleBlockTemplatesCollection();
if (m_project) c << m_project->embeddedTitleBlockTemplatesCollection();
ipw = new TitleBlockPropertiesWidget(c, TitleBlockProperties::defaultProperties(), true, project, parent);
ipw = new TitleBlockPropertiesWidget(c, TitleBlockProperties::defaultProperties(), true);
// default conductor properties
cpw = new ConductorPropertiesWidget(ConductorProperties::defaultProperties());
// default propertie of report label
@@ -65,8 +64,6 @@ NewDiagramPage::NewDiagramPage(QETProject *project, QWidget *parent, ProjectProp
xrefpw -> setProperties (m_project -> defaultXRefProperties());
}
connect(ipw,SIGNAL(openAutoNumFolioEditor(QString)),this,SLOT(changeToAutoFolioTab()));
// main tab widget
QTabWidget *tab_widget = new QTabWidget(this);
QWidget *diagram_widget = new QWidget();
@@ -90,7 +87,6 @@ NewDiagramPage::NewDiagramPage(QETProject *project, QWidget *parent, ProjectProp
* @brief NewDiagramPage::~NewDiagramPage
*/
NewDiagramPage::~NewDiagramPage() {
disconnect(ipw,SIGNAL(openAutoNumFolioEditor(QString)),this,SLOT(changeToAutoFolioTab()));
}
/**
@@ -177,48 +173,10 @@ QIcon NewDiagramPage::icon() const {
* @return title of this page
*/
QString NewDiagramPage::title() const {
if (m_project) return(tr("Nouveau folio", "configuration page title"));
if (m_project) return(tr("Nouveau folio", "configuration page title"));
return(tr("Nouveau projet", "configuration page title"));
}
/**
* @brief NewDiagramPage::changeToAutoFolioTab
* Set the current tab to Autonum
*/
void NewDiagramPage::changeToAutoFolioTab(){
if (m_project){
ppd_->setCurrentPage(ProjectPropertiesDialog::Autonum);
ppd_->changeToFolio();
ppd_->exec();
}
}
/**
* @brief NewDiagramPage::setFolioAutonum
* Set temporary TBP to use in auto folio num
*/
void NewDiagramPage::setFolioAutonum(QString autoNum){
TitleBlockProperties tbptemp = ipw->propertiesAutoNum(autoNum);
ipw->setProperties(tbptemp);
applyConf();
}
/**
* @brief NewDiagramPage::saveCurrentTbp
* Save current TBP to retrieve after auto folio num
*/
void NewDiagramPage::saveCurrentTbp(){
savedTbp = ipw->properties();
}
/**
* @brief NewDiagramPage::loadSavedTbp
* Retrieve saved auto folio num
*/
void NewDiagramPage::loadSavedTbp(){
ipw->setProperties(savedTbp);
applyConf();
}
/**
Constructeur