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

Minor fix : project panel doesn't convert the variable %id of folio.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4779 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2016-11-15 09:23:36 +00:00
parent 54236ebcb5
commit 151d63c1a3
1 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sources/genericpanel.cpp
View File

@@ -285,13 +285,17 @@ QTreeWidgetItem *GenericPanel::updateDiagramItem(QTreeWidgetItem *diagram_qtwi,
QSettings settings; QSettings settings;
QString displayed_title = diagram -> title(); QString displayed_title = diagram -> title();
if (displayed_title.isEmpty()) { if (displayed_title.isEmpty())
{
displayed_title = tr("Folio sans titre", "Fallback label when a diagram has no title"); displayed_title = tr("Folio sans titre", "Fallback label when a diagram has no title");
} }
if (settings.value("genericpanel/folio", true).toBool()){
QString displayed_label = diagram ->border_and_titleblock.folio(); if (settings.value("genericpanel/folio", true).toBool())
{
QString displayed_label = diagram ->border_and_titleblock.finalfolio();
int diagram_folio_idx = diagram -> folioIndex(); int diagram_folio_idx = diagram -> folioIndex();
if (diagram_folio_idx != -1) { if (diagram_folio_idx != -1)
{
displayed_label = QString( displayed_label = QString(
tr( tr(
"%1 - %2", "%1 - %2",
@@ -301,10 +305,13 @@ QTreeWidgetItem *GenericPanel::updateDiagramItem(QTreeWidgetItem *diagram_qtwi,
diagram_qtwi -> setText(0, displayed_label); diagram_qtwi -> setText(0, displayed_label);
} }
}else{ }
else
{
QString displayed_label; QString displayed_label;
int diagram_folio_idx = diagram -> folioIndex(); int diagram_folio_idx = diagram -> folioIndex();
if (diagram_folio_idx != -1) { if (diagram_folio_idx != -1)
{
displayed_label = QString( displayed_label = QString(
tr( tr(
"%1 - %2", "%1 - %2",
@@ -316,18 +323,16 @@ QTreeWidgetItem *GenericPanel::updateDiagramItem(QTreeWidgetItem *diagram_qtwi,
diagram_qtwi -> setText(0, displayed_label); diagram_qtwi -> setText(0, displayed_label);
} }
if (freshly_created) { if (freshly_created)
{
diagram_qtwi -> setData(0, GenericPanel::Item, qVariantFromValue(diagram)); diagram_qtwi -> setData(0, GenericPanel::Item, qVariantFromValue(diagram));
diagrams_.insert(diagram, diagram_qtwi); diagrams_.insert(diagram, diagram_qtwi);
connect( connect(diagram, &Diagram::diagramTitleChanged, this, &GenericPanel::diagramTitleChanged);
diagram, SIGNAL(diagramTitleChanged(Diagram *, const QString &)),
this, SLOT (diagramTitleChanged(Diagram *, const QString &))
);
} }
return(updateItem(diagram_qtwi, options, freshly_created)); return(updateItem(diagram_qtwi, options, freshly_created));
} }