diff --git a/aboutqet.cpp b/aboutqet.cpp index a48ce3ce0..d3ef33fc3 100644 --- a/aboutqet.cpp +++ b/aboutqet.cpp @@ -1,4 +1,5 @@ #include "aboutqet.h" +#include "qet.h" /** Constructeur @@ -45,7 +46,7 @@ QWidget *AboutQET::titre() const { QLabel *icone = new QLabel(); icone -> setPixmap(QIcon(":/ico/qelectrotech.png").pixmap(48, 48)); // label "QElectroTech" - QLabel *titre = new QLabel("QElectroTech"); + QLabel *titre = new QLabel("QElectroTech v" + QET::version + ""); titre -> setTextFormat(Qt::RichText); // le tout dans une grille QGridLayout *dispo_horiz = new QGridLayout(); diff --git a/diagram.cpp b/diagram.cpp index 8eccc562e..11065de18 100644 --- a/diagram.cpp +++ b/diagram.cpp @@ -219,6 +219,7 @@ QDomDocument Diagram::toXml(bool diagram) { racine.setAttribute("cols", border_and_inset.nbColumn()); racine.setAttribute("colsize", border_and_inset.columnsWidth()); racine.setAttribute("height", border_and_inset.columnsHeight()); + racine.setAttribute("version", QET::version); } document.appendChild(racine); diff --git a/editor/elementscene.cpp b/editor/elementscene.cpp index 50d7d51d9..3d7a41ecf 100644 --- a/editor/elementscene.cpp +++ b/editor/elementscene.cpp @@ -290,6 +290,7 @@ const QDomDocument ElementScene::toXml() const { root.setAttribute("hotspot_x", QString("%1").arg(_hotspot.x())); root.setAttribute("hotspot_y", QString("%1").arg(_hotspot.y())); root.setAttribute("orientation", ori.toString()); + root.setAttribute("version", QET::version); // noms de l'element root.appendChild(_names.toXml(xml_document)); diff --git a/qet.h b/qet.h index dc75fcaa0..c30680cfb 100644 --- a/qet.h +++ b/qet.h @@ -7,6 +7,7 @@ classes de l'application */ namespace QET { + const QString version = "0.1"; enum Orientation {North, East, South, West}; enum ConductorSegmentType { Horizontal = 1, Vertical = 2, Both = 3 }; QET::Orientation nextOrientation(QET::Orientation); diff --git a/qetdiagrameditor.cpp b/qetdiagrameditor.cpp index 20b1b8f0e..cee8f2e89 100644 --- a/qetdiagrameditor.cpp +++ b/qetdiagrameditor.cpp @@ -161,7 +161,7 @@ void QETDiagramEditor::actions() { select_invert = new QAction( tr("Inverser la s\351lection"), this); delete_selection = new QAction(QIcon(":/ico/delete.png"), tr("Supprimer"), this); rotate_selection = new QAction(QIcon(":/ico/pivoter.png"), tr("Pivoter"), this); - conductor_prop = new QAction(QIcon(":/ico/conductor.png"), tr("Propri\351t\351s du conducteur"), this); + conductor_prop = new QAction(QIcon(":/ico/conductor.png"), tr("Propri\351t\351s du conducteur"), this); infos_diagram = new QAction(QIcon(":/ico/info.png"), tr("Informations sur le sch\351ma"), this); add_column = new QAction(QIcon(":/ico/add_col.png"), tr("Ajouter une colonne"), this); remove_column = new QAction(QIcon(":/ico/remove_col.png"), tr("Enlever une colonne"), this); @@ -209,6 +209,7 @@ void QETDiagramEditor::actions() { select_invert -> setShortcut(QKeySequence(tr("Ctrl+I"))); delete_selection -> setShortcut(QKeySequence(tr("Suppr"))); rotate_selection -> setShortcut(QKeySequence(tr("Ctrl+R"))); + conductor_prop -> setShortcut(QKeySequence(tr("Ctrl+J"))); zoom_in -> setShortcut(QKeySequence::ZoomIn); zoom_out -> setShortcut(QKeySequence::ZoomOut);