Helas non, le changement de format des pages sommaires étant en dur dans le code et m'avait demandé pas mal de temps quelques tubes d'aspirines et beaucoup de modifications pour ajouter les nouvelles informations du projet, sachant qu'il faut aussi revoir le code pour l'export DXF en même temps :
Modified: trunk/sources/bordertitleblock.cpp
===================================================================
--- trunk/sources/bordertitleblock.cpp 2016-08-10 16:48:18 UTC (rev 4621)
+++ trunk/sources/bordertitleblock.cpp 2016-08-11 18:32:08 UTC (rev 4622)
@@ -240,6 +240,9 @@
ip.date = date();
ip.title = title();
ip.filename = fileName();
+ ip.machine = machine();
+ ip.loc = loc();
+ ip.indexrev = indexrev();
ip.version = version();
ip.folio = folio();
ip.template_name = titleBlockTemplateName();
@@ -260,6 +263,9 @@
setDate(ip.date);
setTitle(ip.title);
setFileName(ip.filename);
+ setMachine(ip.machine);
+ setLoc(ip.loc);
+ setIndicerev(ip.indexrev);
setVersion(QET::displayedVersion);
setFolio(ip.folio);
setAutoPageNum(ip.auto_page_num);
@@ -695,6 +701,9 @@
context.addValue("date", btb_date_.toString(Qt::SystemLocaleShortDate));
context.addValue("title", btb_title_);
context.addValue("filename", btb_filename_);
+ context.addValue("machine", btb_machine_);
+ context.addValue("loc", btb_loc_);
+ context.addValue("indexrev", btb_indexrev_);
context.addValue("version", btb_version_);
context.addValue("folio", btb_final_folio_);
context.addValue("folio-id", folio_index_);
Modified: trunk/sources/bordertitleblock.h
===================================================================
--- trunk/sources/bordertitleblock.h 2016-08-10 16:48:18 UTC (rev 4621)
+++ trunk/sources/bordertitleblock.h 2016-08-11 18:32:08 UTC (rev 4622)
@@ -95,6 +95,13 @@
QString title() const { return(btb_title_); }
/// @return the value of the title block "Folio" field
QString folio() const { return(btb_folio_); }
+ /// @return the value of the title block "Machine" field
+ QString machine() const { return(btb_machine_); }
+ /// @return the value of the title block "Folio" field
+ QString loc() const { return(btb_loc_); }
+ /// @return the value of the revision index block "Folio" field
+ QString indexrev() const { return(btb_indexrev_); }
+
/// @return the value of the title block "File" field
QString fileName() const { return(btb_filename_); }
/// @return the value of the title block Additional Fields
@@ -146,6 +153,9 @@
}
void setFolioData(int, int, QString = NULL, const DiagramContext & = DiagramContext());
/// @param author the new value of the "File" field
+ void setMachine(const QString &machine) { btb_machine_ = machine; }
+ void setLoc(const QString &loc) { btb_loc_ = loc; }
+ void setIndicerev(const QString &indexrev){ btb_indexrev_ = indexrev; }
void setFileName(const QString &filename) { btb_filename_ = filename; }
/// @param author the new value of the "Version" field
void setVersion(const QString &version) { btb_version_ = version; }
@@ -225,6 +235,9 @@
QDate btb_date_;
QString btb_title_;
QString btb_folio_;
+ QString btb_machine_;
+ QString btb_loc_;
+ QString btb_indexrev_;
QString btb_final_folio_;
QString btb_auto_page_num_;
int folio_index_;
Modified: trunk/sources/diagramfoliolist.cpp
===================================================================
--- trunk/sources/diagramfoliolist.cpp 2016-08-10 16:48:18 UTC (rev 4621)
+++ trunk/sources/diagramfoliolist.cpp 2016-08-11 18:32:08 UTC (rev 4622)
@@ -19,7 +19,7 @@
#include <QPainter>
#include "qetapp.h"
-qreal DiagramFolioList::colWidths[4] = {0.1, 0.55, 0.2, 0.15};
+qreal DiagramFolioList::colWidths[8] = {0.05, 0.05, 0.50, 0.10, 0.10, 0.05, 0.05, 0.05};
/**
* @brief DiagramFolioList::DiagramFolioList
@@ -74,44 +74,31 @@
qreal y0 = border_and_titleblock.columnsHeaderHeight();
QRectF row_RectBorder(x0, y0, width, height);
- buildGrid(p, row_RectBorder,30,2,colWidths);
+ buildGrid(p, row_RectBorder,30,1,colWidths);
x0 = list_rectangles_[0] -> topLeft().x();
y0 = list_rectangles_[0] -> topLeft().y();
+
qreal rowHeight = (list_rectangles_[0] -> height())/30;
QRectF row_RectF(x0, y0, list_rectangles_[0] -> width(), rowHeight);
fillHeader(p, row_RectF);
QList<Diagram *> diagram_list = project() -> diagrams();
- int startDiagram = id * 58;
-
+ int startDiagram = id * 29;
for (int i = startDiagram; i < startDiagram+29 && i < diagram_list.size(); ++i) {
y0 += rowHeight;
QRectF row_rect(x0, y0, list_rectangles_[0] -> width(), rowHeight);
fillRow(p, row_rect, diagram_list[i] -> border_and_titleblock.author(),
diagram_list[i] -> title(),
QString::number(diagram_list[i] ->folioIndex()+1),
+ diagram_list[i] -> border_and_titleblock.folio(),
+ diagram_list[i] -> border_and_titleblock.machine(),
+ diagram_list[i] -> border_and_titleblock.loc(),
+ diagram_list[i] -> border_and_titleblock.indexrev(),
diagram_list[i] -> border_and_titleblock.date().toString(Qt::SystemLocaleShortDate));
}
- x0 = list_rectangles_[1] -> topLeft().x();
- y0 = list_rectangles_[1] -> topLeft().y();
- rowHeight = (list_rectangles_[1] -> height())/30;
- QRectF row_RectF2(x0, y0, list_rectangles_[1] -> width(), rowHeight);
- fillHeader(p, row_RectF2);
-
- startDiagram += 29;
-
- for (int i = startDiagram; i < startDiagram+29 && i < diagram_list.size(); ++i) {
- y0 += rowHeight;
- QRectF row_rect(x0, y0, list_rectangles_[1] -> width(), rowHeight);
- fillRow(p, row_rect, diagram_list[i] -> border_and_titleblock.author(),
- diagram_list[i] -> title(),
- QString::number(diagram_list[i] ->folioIndex()+1),
- diagram_list[i] -> border_and_titleblock.date().toString(Qt::SystemLocaleShortDate));
- }
-
border_and_titleblock.draw(p);
p -> restore();
}
@@ -123,7 +110,7 @@
* @param row_rect rectangle where we must draw the new row
*/
void DiagramFolioList::fillRow(QPainter *qp, const QRectF &row_rect, QString author, QString title,
- QString folio, QString date)
+ QString folio, QString label, QString machine, QString loc, QString indexrev, QString date)
{
qreal x = row_rect.topLeft().x();
qreal y = row_rect.topLeft().y();
@@ -142,33 +129,73 @@
qp -> drawText(QRectF(x, y, colWidths[0]*row_rect.width(), row_rect.height()), Qt::AlignCenter, folio);
x += colWidths[0]*row_rect.width();
- if (origFontMetrics.width(title) > 0.95*colWidths[1]*row_rect.width())
- workingFont.setPointSizeF(origFontSize * 0.95*colWidths[1]*row_rect.width() / origFontMetrics.width(title));
+ if (origFontMetrics.width(label) > 0.95*colWidths[1]*row_rect.width())
+ workingFont.setPointSizeF(origFontSize * 0.95*colWidths[1]*row_rect.width() / origFontMetrics.width(label));
else
workingFont.setPointSizeF(origFontSize);
qp -> setFont(workingFont);
+ qp -> drawText(QRectF(x, y, colWidths[1]*row_rect.width(), row_rect.height()), Qt::AlignCenter, label);
+ x += colWidths[1]*row_rect.width();
+
+
+ if (origFontMetrics.width(title) > 0.95*colWidths[2]*row_rect.width())
+ workingFont.setPointSizeF(origFontSize * 0.95*colWidths[2]*row_rect.width() / origFontMetrics.width(title));
+ else
+ workingFont.setPointSizeF(origFontSize);
+ qp -> setFont(workingFont);
QString heading = tr("Titre");
if (title == heading)
- qp -> drawText(QRectF(x, y, colWidths[1]*row_rect.width(),row_rect.height()), Qt::AlignCenter, title);
+ qp -> drawText(QRectF(x, y, colWidths[2]*row_rect.width(),row_rect.height()), Qt::AlignCenter, title);
else
- qp -> drawText(QRectF(x+0.01*row_rect.width(), y, colWidths[1]*row_rect.width()*0.99,
+ qp -> drawText(QRectF(x+0.01*row_rect.width(), y, colWidths[1]*row_rect.width()*10.2,
row_rect.height()), Qt::AlignLeft | Qt::AlignVCenter, title);
- x += colWidths[1]*row_rect.width();
+ x += colWidths[2]*row_rect.width();
+
+
+ if (origFontMetrics.width(machine) > 0.95*colWidths[3]*row_rect.width())
+ workingFont.setPointSizeF(origFontSize * 0.95*colWidths[3]*row_rect.width() / origFontMetrics.width(machine));
+ else
+ workingFont.setPointSizeF(origFontSize);
+ qp -> setFont(workingFont);
+ qp -> drawText(QRectF(x, y, colWidths[3]*row_rect.width(), row_rect.height()), Qt::AlignCenter, machine);
+ x += colWidths[3]*row_rect.width();
+
+
+ if (origFontMetrics.width(loc) > 0.95*colWidths[4]*row_rect.width())
+ workingFont.setPointSizeF(origFontSize * 0.95*colWidths[4]*row_rect.width() / origFontMetrics.width(loc));
+ else
+ workingFont.setPointSizeF(origFontSize);
+ qp -> setFont(workingFont);
+ qp -> drawText(QRectF(x, y, colWidths[4]*row_rect.width(), row_rect.height()), Qt::AlignCenter, loc);
+ x += colWidths[4]*row_rect.width();
+
+
+ if (origFontMetrics.width(indexrev) > 0.95*colWidths[5]*row_rect.width())
+ workingFont.setPointSizeF(origFontSize * 0.95*colWidths[5]*row_rect.width() / origFontMetrics.width(indexrev));
+ else
+ workingFont.setPointSizeF(origFontSize);
+ qp -> setFont(workingFont);
+ qp -> drawText(QRectF(x, y, colWidths[5]*row_rect.width(), row_rect.height()), Qt::AlignCenter, indexrev);
+ x += colWidths[5]*row_rect.width();
+
+
+
- if (origFontMetrics.width(author) > 0.95*colWidths[2]*row_rect.width())
- workingFont.setPointSizeF(origFontSize * 0.95*colWidths[2]*row_rect.width() / origFontMetrics.width(author));
+ if (origFontMetrics.width(author) > 0.95*colWidths[6]*row_rect.width())
+ workingFont.setPointSizeF(origFontSize * 0.95*colWidths[6]*row_rect.width() / origFontMetrics.width(author));
else
workingFont.setPointSizeF(origFontSize);
qp -> setFont(workingFont);
- qp -> drawText(QRectF(x, y, colWidths[2]*row_rect.width(), row_rect.height()), Qt::AlignCenter, author);
- x += colWidths[2]*row_rect.width();
+ qp -> drawText(QRectF(x, y, colWidths[6]*row_rect.width(), row_rect.height()), Qt::AlignCenter, author);
+ x += colWidths[6]*row_rect.width();
+
- if (origFontMetrics.width(date) > 0.95*colWidths[3]*row_rect.width())
- workingFont.setPointSizeF(origFontSize * 0.95*colWidths[3]*row_rect.width() / origFontMetrics.width(date));
+ if (origFontMetrics.width(date) > 0.95*colWidths[7]*row_rect.width())
+ workingFont.setPointSizeF(origFontSize * 0.95*colWidths[7]*row_rect.width() / origFontMetrics.width(date));
else
workingFont.setPointSizeF(origFontSize);
qp -> setFont(workingFont);
- qp -> drawText(QRectF(x, y, colWidths[3]*row_rect.width(), row_rect.height()), Qt::AlignCenter, date);
+ qp -> drawText(QRectF(x, y, colWidths[7]*row_rect.width(), row_rect.height()), Qt::AlignCenter, date);
}
void DiagramFolioList::buildGrid(QPainter *qp, const QRectF &rect, int rows, int tables, qreal colWidths[])
@@ -178,18 +205,18 @@
qDeleteAll (list_rectangles_);
list_rectangles_.clear();
- qreal sum = 0;
- for (int i = 0; i < 4; i++ )
- sum += colWidths[i];
- if ( sum < 0.99 || sum > 1.01 ) {
- qDebug() << "Invalid input: Column widths do not sum to 1";
- return;
- }
+// qreal sum = 0;
+// for (int i = 0; i < 8; i++ )
+// sum += colWidths[i];
+// if ( sum < 0.99 || sum > 1.01 ) {
+// qDebug() << "Invalid input: Column widths do not sum to 1";
+// return;
+// }
qreal tablesSpacing = rect.height() * 0.02;
qreal tableWidth = (rect.width() - tablesSpacing*(tables+1) ) / tables;
qreal rowHeight = (rect.height() - 2*tablesSpacing) / rows;
- int cols = 4;//colWidths.size();
+ int cols = 8;//colWidths.size();
qreal x0 = tablesSpacing + rect.topLeft().x();
qreal y0 = tablesSpacing + rect.topLeft().y();
@@ -222,11 +249,15 @@
void DiagramFolioList::fillHeader(QPainter *qp, const QRectF &row_RectF) {
QString authorTranslatable(QObject::tr("Auteur"));
QString titleTranslatable(QObject::tr("Titre"));
- QString folioTranslatable(QObject::tr("Folio"));
+ QString folioTranslatable(QObject::tr("ID"));
+ QString machineTranslatable(QObject::tr("Machine"));
+ QString locTranslatable(QObject::tr("Localisation"));
+ QString indexrevTranslatable(QObject::tr("Rev"));
+ QString labelTranslatable(QObject::tr("Folio"));
QString dateTranslatable(QObject::tr("Date"));
qp->save();
qp->setFont(QETApp::diagramTextsFont(13));
- fillRow(qp, row_RectF, authorTranslatable, titleTranslatable, folioTranslatable, dateTranslatable);
+ fillRow(qp, row_RectF, authorTranslatable, titleTranslatable, folioTranslatable, labelTranslatable, machineTranslatable, locTranslatable, indexrevTranslatable, dateTranslatable);
qp->restore();
}
Modified: trunk/sources/diagramfoliolist.h
===================================================================
--- trunk/sources/diagramfoliolist.h 2016-08-10 16:48:18 UTC (rev 4621)
+++ trunk/sources/diagramfoliolist.h 2016-08-11 18:32:08 UTC (rev 4622)
@@ -31,13 +31,13 @@
void setId(int i) {id = i;}
int getId() const {return id;}
- static qreal colWidths[4];
+ static qreal colWidths[8];
protected:
void drawBackground(QPainter *, const QRectF &);
private:
- void fillRow(QPainter *, const QRectF &, QString, QString, QString, QString);
+ void fillRow(QPainter *, const QRectF &, QString, QString, QString, QString, QString, QString, QString, QString);
void buildGrid(QPainter *, const QRectF &, int, int, qreal[]);
void fillHeader(QPainter *, const QRectF &);
Modified: trunk/sources/qetproject.cpp
===================================================================
--- trunk/sources/qetproject.cpp 2016-08-10 16:48:18 UTC (rev 4621)
+++ trunk/sources/qetproject.cpp 2016-08-11 18:32:08 UTC (rev 4622)
@@ -1039,7 +1039,7 @@
setFolioSheetsQuantity(0);
int diagCount = diagrams().size();
- for (int i = 0; i <= diagCount/58; i++) {
+ for (int i = 0; i <= diagCount/29; i++) {
//create new diagram
Diagram *diagram_folio_list = new DiagramFolioList(this);
Modified: trunk/sources/titleblock/templatecellwidget.cpp
===================================================================
--- trunk/sources/titleblock/templatecellwidget.cpp 2016-08-10 16:48:18 UTC (rev 4621)
+++ trunk/sources/titleblock/templatecellwidget.cpp 2016-08-11 18:32:08 UTC (rev 4622)
@@ -437,6 +437,9 @@
"<li>%{date} : date du folio</li>"
"<li>%{title} : titre du folio</li>"
"<li>%{filename} : nom de fichier du projet</li>"
+ "<li>%{machine} : nom du groupe fonctionnel du projet</li>"
+ "<li>%{loc} : nom de la localisation dans le groupe fonctionnel du projet</li>"
+ "<li>%{indexrev} : indice de révision du folio</li>"
"<li>%{version} : version du projet</li>"
"<li>%{folio} : indications relatives au folio</li>"
"<li>%{folio-id} : position du folio dans le projet</li>"
Modified: trunk/sources/titleblockproperties.cpp
===================================================================
--- trunk/sources/titleblockproperties.cpp 2016-08-10 16:48:18 UTC (rev 4621)
+++ trunk/sources/titleblockproperties.cpp 2016-08-11 18:32:08 UTC (rev 4622)
@@ -47,6 +47,9 @@
ip.author == author &&\
ip.date == date &&\
ip.filename == filename &&\
+ ip.machine == machine &&\
+ ip.loc == loc &&\
+ ip.indexrev == indexrev &&\
ip.version == version &&\
ip.folio == folio &&\
ip.auto_page_num == auto_page_num &&\
@@ -74,6 +77,9 @@
e.setAttribute("author", author);
e.setAttribute("title", title);
e.setAttribute("filename", filename);
+ e.setAttribute("machine", machine);
+ e.setAttribute("loc", loc);
+ e.setAttribute("indexrev",indexrev);
e.setAttribute("version", version);
e.setAttribute("folio", folio);
e.setAttribute("auto_page_num", auto_page_num);
@@ -101,6 +107,9 @@
if (e.hasAttribute("author")) author = e.attribute("author");
if (e.hasAttribute("title")) title = e.attribute("title");
if (e.hasAttribute("filename")) filename = e.attribute("filename");
+ if (e.hasAttribute("machine")) machine = e.attribute("machine");
+ if (e.hasAttribute("loc")) loc = e.attribute("loc");
+ if (e.hasAttribute("indexrev")) indexrev = e.attribute("indexrev");
if (e.hasAttribute("version")) version = e.attribute("version");
if (e.hasAttribute("folio")) folio = e.attribute("folio");
if (e.hasAttribute("auto_page_num")) auto_page_num = e.attribute("auto_page_num");
@@ -131,6 +140,9 @@
settings.setValue(prefix + "title", title);
settings.setValue(prefix + "author", author);
settings.setValue(prefix + "filename", filename);
+ settings.setValue(prefix + "machine", machine);
+ settings.setValue(prefix + "loc", loc);
+ settings.setValue(prefix + "indexrev", indexrev);
settings.setValue(prefix + "version", version);
settings.setValue(prefix + "folio", folio);
settings.setValue(prefix + "auto_page_num", auto_page_num);
@@ -150,7 +162,10 @@
title = settings.value(prefix + "title").toString();
author = settings.value(prefix + "author").toString();
filename = settings.value(prefix + "filename").toString();
- version = settings.value(prefix + "version").toString();
+ machine = settings.value(prefix + "machine").toString();
+ loc = settings.value(prefix + "loc").toString();
+ indexrev = settings.value(prefix + "indexrev").toString();
+ version = settings.value(prefix + "version").toString();
folio = settings.value(prefix + "folio", "%id/%total").toString();
auto_page_num = settings.value(prefix + "auto_page_num").toString();
setDateFromString(settings.value(prefix + "date").toString());
Modified: trunk/sources/titleblockproperties.h
===================================================================
--- trunk/sources/titleblockproperties.h 2016-08-10 16:48:18 UTC (rev 4621)
+++ trunk/sources/titleblockproperties.h 2016-08-11 18:32:08 UTC (rev 4622)
@@ -54,6 +54,9 @@
QString author; ///< Author of the diagram/folio (displayed by the default template)
QDate date; ///< Date (displayed by the default template)
QString filename; ///< Filename (displayed by the default template)
+ QString machine; ///< Machine (displayed by the default template)
+ QString loc; ///< Location(displayed by the default template)
+ QString indexrev; ///< Revision Index (displayed by the default template)
QString version; ///< Version (displayed by the default template)
QString folio; ///< Folio information (displayed by the default template)
QString auto_page_num;
Modified: trunk/sources/ui/titleblockpropertieswidget.cpp
===================================================================
--- trunk/sources/ui/titleblockpropertieswidget.cpp 2016-08-10 16:48:18 UTC (rev 4621)
+++ trunk/sources/ui/titleblockpropertieswidget.cpp 2016-08-11 18:32:08 UTC (rev 4622)
@@ -95,6 +95,9 @@
ui -> m_title_le -> setText (properties.title);
ui -> m_author_le -> setText (properties.author);
ui -> m_file_le -> setText (properties.filename);
+ ui -> m_mach -> setText (properties.machine);
+ ui -> m_loc -> setText (properties.loc);
+ ui -> m_indice -> setText (properties.indexrev);
ui -> m_folio_le -> setText (properties.folio);
ui -> m_display_at_cb -> setCurrentIndex(properties.display_at == Qt::BottomEdge ? 0 : 1);
ui->auto_page_cb->setCurrentText(properties.auto_page_num);
@@ -150,6 +153,9 @@
prop.title = ui -> m_title_le -> text();
prop.author = ui -> m_author_le -> text();
prop.filename = ui -> m_file_le -> text();
+ prop.machine = ui -> m_mach -> text();
+ prop.loc = ui -> m_loc -> text();
+ prop.indexrev = ui -> m_indice -> text();
prop.folio = ui -> m_folio_le -> text();
prop.display_at = ui -> m_display_at_cb -> currentIndex() == 0 ? Qt::BottomEdge : Qt::RightEdge;
@@ -188,6 +194,9 @@
prop.title = ui -> m_title_le -> text();
prop.author = ui -> m_author_le -> text();
prop.filename = ui -> m_file_le -> text();
+ prop.machine = ui -> m_mach -> text();
+ prop.loc = ui -> m_loc -> text();
+ prop.indexrev = ui -> m_indice -> text();
prop.folio = "%autonum";
prop.display_at = ui -> m_display_at_cb -> currentIndex() == 0 ? Qt::BottomEdge : Qt::RightEdge;
Modified: trunk/sources/ui/titleblockpropertieswidget.ui
===================================================================
--- trunk/sources/ui/titleblockpropertieswidget.ui 2016-08-10 16:48:18 UTC (rev 4621)
+++ trunk/sources/ui/titleblockpropertieswidget.ui 2016-08-11 18:32:08 UTC (rev 4622)
@@ -42,8 +42,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>552</width>
- <height>570</height>
+ <width>538</width>
+ <height>608</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
@@ -123,32 +123,6 @@
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QGridLayout" name="gridLayout_4">
- <item row="4" column="1">
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>Fichier :</string>
- </property>
- </widget>
- </item>
- <item row="6" column="2">
- <widget class="QLabel" name="label_7">
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="text">
- <string>Les variables suivantes sont utilisables dans le champ Folio :
-- %id : numéro du folio courant dans le projet
-- %total : nombre total de folios dans le projet
-- %autonum : Folio Auto Numeration</string>
- </property>
- <property name="scaledContents">
- <bool>false</bool>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- </widget>
- </item>
<item row="3" column="1">
<widget class="QLabel" name="label_4">
<property name="text">
@@ -159,66 +133,106 @@
</property>
</widget>
</item>
- <item row="5" column="1">
- <widget class="QLabel" name="label_6">
+ <item row="10" column="3">
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QComboBox" name="auto_page_cb">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QPushButton" name="m_edit_autofolionum_pb">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>16</width>
+ <height>16</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../../qelectrotech.qrc">
+ <normaloff>:/ico/16x16/configure.png</normaloff>:/ico/16x16/configure.png</iconset>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="12" column="1">
+ <widget class="QLabel" name="label">
<property name="text">
- <string>Folio :</string>
+ <string>Afficher :</string>
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QLabel" name="label_2">
+ <item row="9" column="1">
+ <widget class="QLabel" name="label_12">
<property name="text">
- <string>Titre :</string>
+ <string>Indice Rev</string>
</property>
</widget>
</item>
- <item row="5" column="2">
- <widget class="QLineEdit" name="m_folio_le">
- <property name="toolTip">
- <string>Disponible en tant que %folio pour les modèles de cartouches</string>
+ <item row="2" column="1">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Auteur :</string>
</property>
</widget>
</item>
- <item row="1" column="2">
+ <item row="8" column="3">
+ <widget class="QLineEdit" name="m_loc"/>
+ </item>
+ <item row="6" column="3">
+ <widget class="QLineEdit" name="m_mach"/>
+ </item>
+ <item row="1" column="3">
<widget class="QLineEdit" name="m_title_le">
<property name="toolTip">
<string>Disponible en tant que %title pour les modèles de cartouches</string>
</property>
</widget>
</item>
- <item row="8" column="2">
- <widget class="QComboBox" name="m_display_at_cb">
+ <item row="5" column="1">
+ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>Folio :</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>Fichier :</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="3">
+ <widget class="QLineEdit" name="m_author_le">
<property name="toolTip">
- <string><html><head/><body><p>Affiche le cartouche en bas (horizontalement) ou à droite (verticalement) du folio.</p></body></html></string>
+ <string>Disponible en tant que %author pour les modèles de cartouches</string>
</property>
- <item>
- <property name="text">
- <string>en bas</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>à droite </string>
- </property>
- </item>
</widget>
</item>
- <item row="4" column="2">
+ <item row="4" column="3">
<widget class="QLineEdit" name="m_file_le">
<property name="toolTip">
<string>Disponible en tant que %filename pour les modèles de cartouches</string>
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Auteur :</string>
- </property>
- </widget>
- </item>
- <item row="3" column="2">
+ <item row="3" column="3">
<layout class="QGridLayout" name="gridLayout_2" columnstretch="0,1,0">
<item row="0" column="0">
<widget class="QRadioButton" name="m_no_date_rb">
@@ -270,58 +284,21 @@
</item>
</layout>
</item>
- <item row="2" column="2">
- <widget class="QLineEdit" name="m_author_le">
+ <item row="5" column="3">
+ <widget class="QLineEdit" name="m_folio_le">
<property name="toolTip">
- <string>Disponible en tant que %author pour les modèles de cartouches</string>
+ <string>Disponible en tant que %folio pour les modèles de cartouches</string>
</property>
</widget>
</item>
- <item row="8" column="1">
- <widget class="QLabel" name="label">
+ <item row="1" column="1">
+ <widget class="QLabel" name="label_2">
<property name="text">
- <string>Afficher :</string>
+ <string>Titre :</string>
</property>
</widget>
</item>
- <item row="7" column="2">
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QComboBox" name="auto_page_cb">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QPushButton" name="m_edit_autofolionum_pb">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>16</width>
- <height>16</height>
- </size>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="../../qelectrotech.qrc">
- <normaloff>:/ico/16x16/configure.png</normaloff>:/ico/16x16/configure.png</iconset>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="7" column="1">
+ <item row="10" column="1">
<widget class="QLabel" name="label_9">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@@ -334,6 +311,59 @@
</property>
</widget>
</item>
+ <item row="12" column="3">
+ <widget class="QComboBox" name="m_display_at_cb">
+ <property name="toolTip">
+ <string><html><head/><body><p>Affiche le cartouche en bas (horizontalement) ou à droite (verticalement) du folio.</p></body></html></string>
+ </property>
+ <item>
+ <property name="text">
+ <string>en bas</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>à droite </string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="11" column="3">
+ <widget class="QLabel" name="label_7">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="text">
+ <string>Les variables suivantes sont utilisables dans le champ Folio :
+- %id : numéro du folio courant dans le projet
+- %total : nombre total de folios dans le projet
+- %autonum : Folio Auto Numeration</string>
+ </property>
+ <property name="scaledContents">
+ <bool>false</bool>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1">
+ <widget class="QLabel" name="label_10">
+ <property name="text">
+ <string>Machine :</string>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="1">
+ <widget class="QLabel" name="label_11">
+ <property name="text">
+ <string>Localisation</string>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="3">
+ <widget class="QLineEdit" name="m_indice"/>
+ </item>
</layout>
</item>
</layout>
.
