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

Elements panel: replaced embedded collections original titles with simpler ones.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@1500 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2012-02-12 17:19:01 +00:00
parent b50ff0fb8a
commit 072f63dfb6
4 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/elementspanel.cpp
View File

@@ -400,12 +400,14 @@ QTreeWidgetItem *ElementsPanel::addProject(QETProject *project) {
if (TitleBlockTemplatesCollection *tbt_collection = project -> embeddedTitleBlockTemplatesCollection()) { if (TitleBlockTemplatesCollection *tbt_collection = project -> embeddedTitleBlockTemplatesCollection()) {
if (QTreeWidgetItem *tbt_collection_qtwi = itemForTemplatesCollection(tbt_collection)) { if (QTreeWidgetItem *tbt_collection_qtwi = itemForTemplatesCollection(tbt_collection)) {
tbt_collection_qtwi -> setText(0, tr("Cartouches embarqu<71>s"));
if (first_add) tbt_collection_qtwi -> setExpanded(true); if (first_add) tbt_collection_qtwi -> setExpanded(true);
} }
} }
if (ElementsCollection *elmt_collection = project -> embeddedCollection()) { if (ElementsCollection *elmt_collection = project -> embeddedCollection()) {
if (QTreeWidgetItem *elmt_collection_qtwi = itemForElementsCollection(elmt_collection)) { if (QTreeWidgetItem *elmt_collection_qtwi = itemForElementsCollection(elmt_collection)) {
elmt_collection_qtwi -> setText(0, tr("Collection embarqu<71>e"));
if (first_add) elmt_collection_qtwi -> setExpanded(true); if (first_add) elmt_collection_qtwi -> setExpanded(true);
} }
} }

1
sources/qetproject.cpp
View File

@@ -981,7 +981,6 @@ void QETProject::readElementsCollectionXml() {
// sinon lit cette collection // sinon lit cette collection
collection_ = new XmlElementsCollection(collection_root); collection_ = new XmlElementsCollection(collection_root);
} }
collection_ -> setTitle(tr("Collection embarqu\351e"));
collection_ -> setProtocol("embed"); collection_ -> setProtocol("embed");
collection_ -> setProject(this); collection_ -> setProject(this);
connect(collection_, SIGNAL(written()), this, SLOT(componentWritten())); connect(collection_, SIGNAL(written()), this, SLOT(componentWritten()));

30
sources/xmlelementscollection.cpp
View File

@@ -18,6 +18,7 @@
#include "xmlelementscollection.h" #include "xmlelementscollection.h"
#include "xmlelementscategory.h" #include "xmlelementscategory.h"
#include "qetproject.h" #include "qetproject.h"
#include "qetapp.h"
/** /**
Construit une collection vide Construit une collection vide
@@ -55,6 +56,35 @@ XmlElementsCollection::~XmlElementsCollection() {
deleteContent(); deleteContent();
} }
QString XmlElementsCollection::title() const {
if (!title_.isEmpty()) return(title_);
// if the title attribute is empty, we generate a suitable one using the
// parent project
QString final_title;
if (project_) {
QString project_title = project_ -> title();
if (project_title.isEmpty()) {
final_title = QString(
tr(
"Collection du projet sans titre (id %1)",
"Elements collection title when the parent project has an empty title -- %1 is the project internal id"
)
);
final_title = final_title.arg(QETApp::projectId(project_));
} else {
final_title = QString(
tr(
"Collection du projet \"%1\"",
"Elements collection title when the project has a suitable title -- %1 is the project title"
)
);
final_title = final_title.arg(project_title);
}
}
return(final_title);
}
ElementsCategory *XmlElementsCollection::rootCategory() { ElementsCategory *XmlElementsCollection::rootCategory() {
return(root); return(root);
} }

1
sources/xmlelementscollection.h
View File

@@ -38,6 +38,7 @@ class XmlElementsCollection : public ElementsCollection {
// methodes // methodes
public: public:
virtual QString title() const;
virtual ElementsCategory *rootCategory(); virtual ElementsCategory *rootCategory();
virtual bool hasFilePath(); virtual bool hasFilePath();
virtual QString filePath(); virtual QString filePath();