Merge Qt5 branch sources folder to trunk

-Cette ligne, et les suivantes ci-dessous, seront ignorées-- M sources/aboutqet.cpp M sources/bordertitleblock.cpp M sources/conductorproperties.h M sources/configdialog.cpp M sources/configpages.cpp M sources/configpages.h M sources/createdxf.h M sources/diagram.cpp M sources/diagram.h M sources/diagramcommands.cpp M sources/diagramcommands.h M sources/diagramprintdialog.cpp M sources/diagramprintdialog.h M sources/diagramschooser.cpp M sources/diagramschooser.h M sources/diagramview.cpp M sources/diagramview.h M sources/dvevent/dveventaddimage.cpp M sources/dvevent/dveventaddshape.cpp M sources/editor/arceditor.cpp M sources/editor/arceditor.h M sources/editor/editorcommands.cpp M sources/editor/editorcommands.h M sources/editor/elementitemeditor.h M sources/editor/elementprimitivedecorator.cpp M sources/editor/elementscene.cpp M sources/editor/elementscene.h M sources/editor/elementview.cpp M sources/editor/ellipseeditor.cpp M sources/editor/ellipseeditor.h M sources/editor/esevent/eseventaddtext.cpp M sources/editor/esevent/eseventaddtextfield.cpp M sources/editor/esevent/eseventinterface.cpp M sources/editor/graphicspart/customelementpart.h M sources/editor/graphicspart/parttext.cpp M sources/editor/graphicspart/parttext.h M sources/editor/graphicspart/parttextfield.cpp M sources/editor/graphicspart/parttextfield.h M sources/editor/lineeditor.cpp M sources/editor/lineeditor.h M sources/editor/polygoneditor.cpp M sources/editor/qetelementeditor.cpp M sources/editor/qetelementeditor.h M sources/editor/rectangleeditor.cpp M sources/editor/rectangleeditor.h M sources/editor/styleeditor.cpp M sources/editor/styleeditor.h M sources/editor/terminaleditor.cpp M sources/editor/terminaleditor.h M sources/editor/texteditor.cpp M sources/editor/texteditor.h M sources/editor/textfieldeditor.cpp M sources/editor/textfieldeditor.h M sources/editor/ui/elementpropertieseditorwidget.cpp M sources/elementdefinition.cpp M sources/elementdeleter.cpp M sources/elementdeleter.h M sources/elementdialog.cpp M sources/elementscategorieslist.h M sources/elementscategorieswidget.cpp M sources/elementscategorieswidget.h M sources/elementscategory.cpp M sources/elementscategorydeleter.cpp M sources/elementscategorydeleter.h M sources/elementscategoryeditor.cpp M sources/elementscategoryeditor.h M sources/elementscollection.cpp M sources/elementscollectioncache.cpp M sources/elementspanel.cpp M sources/elementspanel.h M sources/elementspanelwidget.cpp M sources/elementspanelwidget.h M sources/elementtextsmover.h M sources/exportdialog.cpp M sources/exportdialog.h M sources/exportproperties.cpp M sources/exportpropertieswidget.cpp M sources/exportpropertieswidget.h M sources/genericpanel.cpp M sources/integrationmoveelementshandler.cpp M sources/integrationmoveelementshandler.h M sources/interactivemoveelementshandler.cpp M sources/nameslistwidget.cpp M sources/nameslistwidget.h M sources/newelementwizard.cpp M sources/newelementwizard.h M sources/nomenclature.cpp M sources/nomenclature.h M sources/projectconfigpages.cpp M sources/projectview.cpp M sources/projectview.h M sources/qet.cpp M sources/qetapp.cpp M sources/qetapp.h M sources/qetdiagrameditor.cpp M sources/qetdiagrameditor.h M sources/qetgraphicsitem/conductor.cpp M sources/qetgraphicsitem/conductortextitem.cpp M sources/qetgraphicsitem/customelement.cpp M sources/qetgraphicsitem/diagramimageitem.cpp M sources/qetgraphicsitem/diagramtextitem.cpp M sources/qetgraphicsitem/diagramtextitem.h M sources/qetgraphicsitem/element.cpp M sources/qetgraphicsitem/ghostelement.cpp M sources/qetgraphicsitem/qetshapeitem.cpp M sources/qetgraphicsitem/terminal.cpp M sources/qetgraphicsitem/terminal.h M sources/qeticons.cpp M sources/qeticons.h M sources/qetmainwindow.cpp M sources/qetmessagebox.cpp M sources/qetmessagebox.h M sources/qetprintpreviewdialog.cpp M sources/qetprintpreviewdialog.h M sources/qetproject.cpp M sources/qetsingleapplication.cpp M sources/qettabbar.h M sources/qfilenameedit.cpp M sources/qtextorientationspinboxwidget.cpp M sources/qtextorientationspinboxwidget.h M sources/qtextorientationwidget.cpp M sources/qtextorientationwidget.h M sources/richtext/richtexteditor.cpp M sources/richtext/richtexteditor_p.h M sources/richtext/ui_addlinkdialog.h M sources/titleblock/dimensionwidget.h M sources/titleblock/gridlayoutanimation.h M sources/titleblock/helpercell.h M sources/titleblock/integrationmovetemplateshandler.cpp M sources/titleblock/integrationmovetemplateshandler.h M sources/titleblock/qettemplateeditor.cpp M sources/titleblock/qettemplateeditor.h M sources/titleblock/templatecellsset.h M sources/titleblock/templatecellwidget.cpp M sources/titleblock/templatecellwidget.h M sources/titleblock/templatecommands.cpp M sources/titleblock/templatedeleter.cpp M sources/titleblock/templatedeleter.h M sources/titleblock/templatelocationchooser.cpp M sources/titleblock/templatelocationchooser.h M sources/titleblock/templatelocationsaver.cpp M sources/titleblock/templatelocationsaver.h M sources/titleblock/templatelogomanager.cpp M sources/titleblock/templatelogomanager.h M sources/titleblock/templateview.cpp M sources/titleblock/templatevisualcell.h M sources/titleblockcell.cpp M sources/titleblocktemplate.cpp M sources/treecoloranimation.h M sources/ui/conductorpropertieswidget.cpp M sources/ui/diagrampropertiesdialog.cpp M sources/ui/diagramselection.cpp M sources/ui/dialogautonum.cpp M sources/ui/dialogwaiting.cpp M sources/ui/elementpropertieswidget.cpp M sources/ui/elementselectorwidget.cpp M sources/ui/linksingleelementwidget.cpp M sources/ui/masterpropertieswidget.cpp M sources/ui/potentialtextsdialog.cpp M sources/ui/projectpropertiesdialog.cpp M sources/ui/selectautonumw.cpp M sources/ui/titleblockpropertieswidget.cpp M sources/ui/xrefpropertieswidget.cpp M sources/undocommand/changeelementinformationcommand.cpp git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3783 bfdf4180-ca20-0410-9c96-a3a8aa849046
2026-03-09 08:49:59 +01:00 · 2015-03-02 20:14:56 +00:00
parent 823e4f0570
commit 81c684ca49
164 changed files with 1066 additions and 994 deletions
--- a/sources/qetgraphicsitem/conductor.cpp
+++ b/sources/qetgraphicsitem/conductor.cpp
@@ -87,7 +87,7 @@ Conductor::Conductor(Terminal *p1, Terminal* p2) :
 	// calcul du rendu du conducteur
 	generateConductorPath(terminal1 -> dockConductor(), terminal1 -> orientation(), terminal2 -> dockConductor(), terminal2 -> orientation());
 	setFlags(QGraphicsItem::ItemIsSelectable);
-	setAcceptsHoverEvents(true);
+	setAcceptHoverEvents(true);
 	
 	// ajout du champ de texte editable
 	text_item = new ConductorTextItem(properties_.text, this);
@@ -477,7 +477,7 @@ void Conductor::paint(QPainter *qp, const QStyleOptionGraphicsItem *options, QWi
 	}
 	
 	// decalage ideal pour le rendu centre d'un carre / cercle de 2.0 px de cote / diametre
-	qreal pretty_offset = (options -> levelOfDetail == 1 ? 1.0 : 1.0);
+	qreal pretty_offset = 1.0;
 	
 	// dessin des points d'accroche du conducteur si celui-ci est selectionne
 	if (isSelected()) {
@@ -1396,7 +1396,7 @@ void Conductor::displayedTextChanged() {
 		{
 			qmbreturn = QMessageBox::question(diagramEditor(), tr("Textes de conducteurs"),
 											  tr("Voulez-vous appliquer le nouveau texte \n"
-												 "\340 l'ensemble des conducteurs de ce potentiel ?"),
+												 "à l'ensemble des conducteurs de ce potentiel ?"),
 											  QMessageBox::No| QMessageBox::Yes, QMessageBox::Yes);
 			if (qmbreturn == QMessageBox::Yes)
 			{
--- a/sources/qetgraphicsitem/conductortextitem.cpp
+++ b/sources/qetgraphicsitem/conductortextitem.cpp
@@ -31,7 +31,7 @@ ConductorTextItem::ConductorTextItem(Conductor *parent_conductor) :
 	moved_by_user_(false),
 	rotate_by_user_(false)
 {
-	setAcceptsHoverEvents(true);
+	setAcceptHoverEvents(true);
 }

 /**
@@ -208,13 +208,13 @@ void ConductorTextItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *e) {

 /**
 	When mouse over element
-	change bMouseOver to true   (used in paint() function )
+	change m_mouse_hover to true   (used in paint() function )
 	@param e  QGraphicsSceneHoverEvent
 */
 void ConductorTextItem::hoverEnterEvent(QGraphicsSceneHoverEvent *e) {
 	Q_UNUSED(e);

-	bMouseOver = true;
+	m_mouse_hover = true;
 	QString str_ToolTip = toPlainText();
 	setToolTip( str_ToolTip );
 	update();
@@ -222,13 +222,13 @@ void ConductorTextItem::hoverEnterEvent(QGraphicsSceneHoverEvent *e) {

 /**
 	When mouse over element leave the position
-	change bMouseOver to false(used in paint() function )
+	change m_mouse_hover to false(used in paint() function )
 	@param e  QGraphicsSceneHoverEvent
 */
 void ConductorTextItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *e) {
 	Q_UNUSED(e);
 	//qDebug() << "Leave mouse over";
-	bMouseOver = false;
+	m_mouse_hover = false;
 	update();
 }

--- a/sources/qetgraphicsitem/customelement.cpp
+++ b/sources/qetgraphicsitem/customelement.cpp
@@ -117,9 +117,9 @@ bool CustomElement::buildFromXml(const QDomElement &xml_def_elmt, int *state) {
 		qreal element_version = xml_def_elmt.attribute("version").toDouble(&conv_ok);
 		if (conv_ok && QET::version.toDouble() < element_version) {
 			std::cerr << qPrintable(
-				QObject::tr("Avertissement : l'\351l\351ment "
-				" a \351t\351 enregistr\351 avec une version"
-				" ult\351rieure de QElectroTech.")
+				QObject::tr("Avertissement : l'élément "
+				" a été enregistré avec une version"
+				" ultérieure de QElectroTech.")
 			) << std::endl;
 		}
 	}
--- a/sources/qetgraphicsitem/diagramimageitem.cpp
+++ b/sources/qetgraphicsitem/diagramimageitem.cpp
@@ -108,7 +108,7 @@ void DiagramImageItem::editProperty() {

 	//the dialog
 	QDialog property_dialog(diagram()->views().at(0));
-	property_dialog.setWindowTitle(tr("\311diter les propri\351t\351s d'une image", "window title"));
+	property_dialog.setWindowTitle(tr("Éditer les propriétés d'une image", "window title"));
 	//the main layout
 	QVBoxLayout dialog_layout(&property_dialog);

@@ -201,7 +201,7 @@ bool DiagramImageItem::fromXml(const QDomElement &e) {

 	//load xml image to QByteArray
 	QByteArray array;
-	array = QByteArray::fromBase64(e.text().toAscii());
+	array = QByteArray::fromBase64(e.text().toLatin1());

 	//Set QPixmap from the @array
 	QPixmap pixmap;
--- a/sources/qetgraphicsitem/diagramtextitem.cpp
+++ b/sources/qetgraphicsitem/diagramtextitem.cpp
@@ -28,12 +28,12 @@
 */
 DiagramTextItem::DiagramTextItem(QGraphicsItem *parent) :
 	QGraphicsTextItem(parent),
-	bMouseOver(false),
+	m_mouse_hover(false),
 	previous_text_(),
 	rotation_angle_(0.0),
 	m_first_move (true)
 {
-	setAcceptsHoverEvents(true);
+	setAcceptHoverEvents(true);
 	build();
 }

@@ -45,12 +45,12 @@ DiagramTextItem::DiagramTextItem(QGraphicsItem *parent) :
 */
 DiagramTextItem::DiagramTextItem(const QString &text, QGraphicsItem *parent) :
 	QGraphicsTextItem(text, parent),
-	bMouseOver(false),
+	m_mouse_hover(false),
 	previous_text_(text),
 	rotation_angle_(0.0)
 {
 	build();
-	setAcceptsHoverEvents(true);
+	setAcceptHoverEvents(true);
 }

 /// Destructeur
@@ -68,7 +68,7 @@ void DiagramTextItem::build() {
 	setFont(QETApp::diagramTextsFont());
 	setFlags(QGraphicsItem::ItemIsSelectable|QGraphicsItem::ItemIsMovable);
 	setNoEditable(false);
-	setToolTip(tr("Maintenir ctrl pour un d\351placement libre"));
+	setToolTip(tr("Maintenir ctrl pour un déplacement libre"));
 #if QT_VERSION >= 0x040600
 	setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
 #endif
@@ -205,31 +205,35 @@ void DiagramTextItem::setFontSize(int &s) {
 }

 /**
-	Dessine le champ de texte.
-	Cette methode delegue simplement le travail a QGraphicsTextItem::paint apres
-	avoir desactive l'antialiasing.
-	@param painter Le QPainter a utiliser pour dessiner le champ de texte
-	@param option Les options de style pour le champ de texte
-	@param widget Le QWidget sur lequel on dessine 
-*/
-void DiagramTextItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) {
+ * @brief DiagramTextItem::paint
+ * Draw this text field. This method draw the text by calling QGraphicsTextItem::paint.
+ * If text is hovered, this method draw the bounding rect in grey
+ * @param painter : painter to use
+ * @param option : style option
+ * @param widget : widget where must to draw
+ */
+void DiagramTextItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
 	painter -> setRenderHint(QPainter::Antialiasing, false);
 	QGraphicsTextItem::paint(painter, option, widget);

-	if ( bMouseOver )		{
+	if (m_mouse_hover && !isSelected())
+	{
 		painter -> save();
-		// Annulation des renderhints
+
+			//Disable renderhints
 		painter -> setRenderHint(QPainter::Antialiasing,          false);
 		painter -> setRenderHint(QPainter::TextAntialiasing,      false);
 		painter -> setRenderHint(QPainter::SmoothPixmapTransform, false);
-		// Dessin du cadre de selection en gris
+
+			//Draw the selected rect in grey
 		QPen t;
 		t.setColor(Qt::gray);
 		t.setStyle(Qt::DashDotLine);
+		t.setCosmetic(true);
 		painter -> setPen(t);
-		// Le dessin se fait a partir du rectangle delimitant
-		//painter -> drawRoundRect(boundingRect().adjusted(1, 1, -1, -1), 10, 10);
-		painter -> drawRoundRect(boundingRect().adjusted(0, 0, 0, 0), 10, 10);
+		painter -> drawRoundRect(boundingRect(), 10, 10);
+
 		painter -> restore();
 	}

@@ -392,13 +396,13 @@ void DiagramTextItem::edit() {

 /**
 	When mouse over element
-	change bMouseOver to true   (used in paint() function )
+	change m_mouse_hover to true   (used in paint() function )
 	@param e QGraphicsSceneHoverEvent
 */
 void DiagramTextItem::hoverEnterEvent(QGraphicsSceneHoverEvent *e) {
 	Q_UNUSED(e);

-	bMouseOver = true;
+	m_mouse_hover = true;
 	QString str_ToolTip = toPlainText();
 	setToolTip( str_ToolTip );
 	update();
@@ -406,13 +410,13 @@ void DiagramTextItem::hoverEnterEvent(QGraphicsSceneHoverEvent *e) {

 /**
 	When mouse over element leave the position
-	change bMouseOver to false (used in paint() function )
+	change m_mouse_hover to false (used in paint() function )
 	@param e QGraphicsSceneHoverEvent
 */
 void DiagramTextItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *e) {
 	Q_UNUSED(e);
 	//qDebug() << "Leave mouse over";
-	bMouseOver = false;
+	m_mouse_hover = false;
 	update();
 }

--- a/sources/qetgraphicsitem/diagramtextitem.h
+++ b/sources/qetgraphicsitem/diagramtextitem.h
@@ -82,7 +82,7 @@ class DiagramTextItem : public QGraphicsTextItem {

 	virtual void applyRotation(const qreal &);
 	
-	bool bMouseOver;
+	bool m_mouse_hover;
 	signals:
 	/// signal emitted when the text field loses focus
 	void lostFocus();
--- a/sources/qetgraphicsitem/element.cpp
+++ b/sources/qetgraphicsitem/element.cpp
@@ -39,7 +39,7 @@ Element::Element(QGraphicsItem *parent) :
 	uuid_ = QUuid::createUuid();
 	setZValue(10);
 	setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
-	setAcceptsHoverEvents(true);
+	setAcceptHoverEvents(true);
 }

 /**
@@ -83,7 +83,7 @@ void Element::setHighlighted(bool hl) {
 */
 void Element::paint(QPainter *painter, const QStyleOptionGraphicsItem *options, QWidget *widget) {
 	
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
 	// corrige un bug de rendu ne se produisant que lors du rendu sur QGraphicsScene sous X11 au zoom par defaut
 	static bool must_correct_rendering_bug = QETApp::settings().value("correct-rendering", false).toBool();
 	if (must_correct_rendering_bug) {
@@ -256,6 +256,7 @@ void Element::drawSelection(QPainter *painter, const QStyleOptionGraphicsItem *o
 	QPen t;
 	t.setColor(Qt::gray);
 	t.setStyle(Qt::DashDotLine);
+	t.setCosmetic(true);
 	painter -> setPen(t);
 	// Le dessin se fait a partir du rectangle delimitant
 	painter -> drawRoundRect(boundingRect().adjusted(1, 1, -1, -1), 10, 10);
--- a/sources/qetgraphicsitem/ghostelement.cpp
+++ b/sources/qetgraphicsitem/ghostelement.cpp
@@ -34,7 +34,7 @@ GhostElement::GhostElement(
 	CustomElement(location, qgi)
 {
 	QString tooltip_string = QString(
-		tr("<u>\311l\351ment manquant\240:</u> %1")
+		tr("<u>Élément manquant :</u> %1")
 	).arg(location_.toString());
 	setToolTip(tooltip_string);
 }
--- a/sources/qetgraphicsitem/qetshapeitem.cpp
+++ b/sources/qetgraphicsitem/qetshapeitem.cpp
@@ -361,7 +361,7 @@ void QetShapeItem::editProperty()

 	//the dialog
 	QDialog property_dialog(diagram()->views().at(0));
-	property_dialog.setWindowTitle(tr("\311diter les propri\351t\351s d'une shape, Zone ", "window title"));
+	property_dialog.setWindowTitle(tr("Éditer les propriétés d'une shape, Zone ", "window title"));
 	//the main layout
 	QVBoxLayout dialog_layout(&property_dialog);

@@ -373,7 +373,7 @@ void QetShapeItem::editProperty()
 	QComboBox style_combo(&property_dialog);
 	style_combo.addItem(QObject::tr("Normal"));
 	style_combo.addItem(QObject::tr("Tiret"));
-	style_combo.addItem(QObject::tr("Pointill\351"));
+	style_combo.addItem(QObject::tr("Pointillé"));
 	style_combo.addItem(QObject::tr("Traits et points"));
 	style_combo.addItem(QObject::tr("Traits points points"));

@@ -388,7 +388,7 @@ void QetShapeItem::editProperty()
 	dialog_layout.addWidget(&cb);

 	//GroupBox for Scaling
-	QGroupBox scale_groupe(QObject::tr("\311chelle", "shape scale"));
+	QGroupBox scale_groupe(QObject::tr("Échelle", "shape scale"));
 	dialog_layout.addWidget(&scale_groupe);
 	QHBoxLayout scale_layout(&scale_groupe);

@@ -449,7 +449,7 @@ QString QetShapeItem::name() const {
 			return tr("un rectangle");
 			break;
 		case Ellipse:
-			return tr("une \351llipse");
+			return tr("une éllipse");
 			break;
 		case Polyline:
 			return tr("une polyligne");
--- a/sources/qetgraphicsitem/terminal.cpp
+++ b/sources/qetgraphicsitem/terminal.cpp
@@ -64,7 +64,7 @@ void Terminal::init(QPointF pf, Qet::Orientation o, QString number, QString name
 	br_ = new QRectF();
 	previous_terminal_ = 0;
 	// divers
-	setAcceptsHoverEvents(true);
+	setAcceptHoverEvents(true);
 	setAcceptedMouseButtons(Qt::LeftButton);
 	hovered_ = false;
 	setToolTip(QObject::tr("Borne", "tooltip"));
@@ -228,7 +228,7 @@ void Terminal::paint(QPainter *p, const QStyleOptionGraphicsItem *options, QWidg
 	
 	p -> save();
 	
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
 	// corrige un bug de rendu ne se produisant que lors du rendu sur QGraphicsScene sous X11 au zoom par defaut
 	static bool must_correct_rendering_bug = QETApp::settings().value("correct-rendering", false).toBool();
 	if (must_correct_rendering_bug) {
@@ -588,7 +588,7 @@ void Terminal::mouseReleaseEvent(QGraphicsSceneMouseEvent *e)
 		d -> setConductor(false);

 			//Get item under cursor
-		QGraphicsItem *qgi = d -> itemAt(e -> scenePos());
+		QGraphicsItem *qgi = d -> itemAt(e -> scenePos(), QTransform());
 		if (!qgi) return;

 			//Element must be a terminal
--- a/sources/qetgraphicsitem/terminal.h
+++ b/sources/qetgraphicsitem/terminal.h
@@ -17,7 +17,7 @@
 */
 #ifndef TERMINAL_H
 #define TERMINAL_H
-#include <QtGui>
+#include <QtWidgets>
 #include <QtXml>
 #include "qet.h"
 class Conductor;