Reverting deletion of branch 0.2, 0.3

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/tags/0.22@5946 bfdf4180-ca20-0410-9c96-a3a8aa849046

Doxyfile

@@ -31,7 +31,7 @@ PROJECT_NAME           = QElectroTech
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.21
+PROJECT_NUMBER         = 0.22
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

misc/qelectrotech.spec

@@ -1,170 +0,0 @@
-Name:        qelectrotech
-Summary:     Design electric diagrams
-Summary(fr): Réaliser des schémas électriques
-
-# Upstream version is a float so 0.11 < 0.2 < 0.21 < 0.3
-# So use %.2f with upstream acknowledgment
-Version:     0.20
-Release:     0.3.rc1%{?dist}
-
-Group:      Applications/Productivity
-# Prog is GPLv2 - Element are Creative Commons Attribution
-License:    GPLv2+
-
-Url:        http://qelectrotech.org/
-# svn export -r 374 svn://svn.tuxfamily.org/svnroot/qet/qet/trunk qelectrotech-svn374
-# tar cvjf /home/rpmbuild/SOURCES/qelectrotech-svn374.tar.bz2 --exclude .svn qelectrotech-svn374
-#Source0:    qelectrotech-svn374.tar.bz2
-Source0:    http://download.tuxfamily.org/qet/tags/20090613/qelectrotech-0.2rc1-src.tar.gz
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:    desktop-file-utils
-Requires(post):   desktop-file-utils
-Requires(postun): desktop-file-utils
-%if 0%{?fedora} >= 9
-BuildRequires:    qt-devel >= 4.4.1
-%else
-BuildRequires:    qt4-devel >= 4.4.1
-%endif
-Requires:         qelectrotech-elements = %{version}-%{release}
-
-%description
-QElectroTech is a Qt4 application to design electric diagrams. It uses XML  
-files for elements and diagrams, and includes both a diagram editor and an 
-element editor.
-
-%description -l fr
-QElectroTech est une application Qt4 pour réaliser des schémas électriques.
-QET utilise le format XML pour ses éléments et ses schémas et inclut un
-éditeur de schémas ainsi qu'un éditeur d'élément.
-
-
-%package elements
-Summary:     Elements collection for QElectroTech
-Summary(fr): Collection d'élements pour QElectroTech
-Group:       Applications/Productivity
-License:     CC-BY
-%if 0%{?fedora} >= 11
-BuildArch:   noarch
-%endif
-
-
-%description elements
-Elements collection for QElectroTech.
-
-%description -l fr elements
-Collection d'élements pour QElectroTech.
-
-
-%prep
-#%setup -q -n %{name}-%{version}
-#%setup -q -n %{name}-svn374
-%setup -q -n %{name}-0.2rc1-src
-
-sed -e s,/usr/local/,%{_prefix}/, \
-    -e /QET_MAN_PATH/s,'man/','share/man', \
-    -e /QET_MIME/s,../,, \
-    -i %{name}.pro
-
-qmake-qt4 %{name}.pro
-
-
-%build
-make %{?_smp_mflags}
-
-
-%install
-rm -fr $RPM_BUILD_ROOT qet.lang
-INSTALL_ROOT=$RPM_BUILD_ROOT make install
-
-rm -rf $RPM_BUILD_ROOT/usr/doc/qelectrotech \
-       $RPM_BUILD_ROOT%{_mandir}/fr.ISO8859-1 \
-       $RPM_BUILD_ROOT%{_mandir}/fr
-
-mv $RPM_BUILD_ROOT%{_mandir}/fr.UTF-8 $RPM_BUILD_ROOT%{_mandir}/fr
-
-desktop-file-install --vendor="" \
-   --dir=%{buildroot}%{_datadir}/applications/ \
-         %{buildroot}%{_datadir}/applications/%{name}.desktop
-
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/lang/qt_*.qm
-%find_lang qet --with-qt
-
-
-%clean
-rm -fr $RPM_BUILD_ROOT
-
-
-%post
-update-desktop-database &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-
-%postun
-update-desktop-database &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-
-%files -f qet.lang
-%defattr(-,root,root,-)
-%doc CREDIT LICENSE README examples
-%{_bindir}/%{name}
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/mime/application/x-qet-*.xml
-%{_datadir}/mime/packages/%{name}.xml
-%{_datadir}/mimelnk/application/x-qet-*.desktop
-%{_datadir}/icons/hicolor/*/*/*.png
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/lang
-%exclude %{_datadir}/%{name}/examples
-%{_mandir}/man1/%{name}.*
-%lang(fr) %{_mandir}/fr/man1/%{name}.*
-
-
-%files elements
-%defattr(-,root,root,-)
-%doc ELEMENTS.LICENSE
-%{_datadir}/%{name}/elements
-
-
-%changelog
-* Sat Jun 13 2009 Remi Collet <RPMS@FamilleCollet.com> - 0.20-0.3.rc1
-- update to 0.2rc1
-- split elements in sub-package
-- fix license, URL, lang
-
-* Sun May 24 2009 Remi Collet <RPMS@FamilleCollet.com> - 0.20-0.2.beta
-- update to 0.2b
-
-* Sun Apr 12 2009 Remi Collet <RPMS@FamilleCollet.com> - 0.20-0.1.alpha
-- update to 0.2alpha
-
-* Sat Sep 06 2008 Remi Collet <RPMS@FamilleCollet.com> - 0.11-1
-- update to 0.11
-
-* Fri Aug 15 2008 Remi Collet <RPMS@FamilleCollet.com> - 0.1-3.svn374
-- update to 1.0 finale
-- new snapshot (pre 0.11)
-- require qt >= 4.4.1
-
-* Tue May 20 2008 Remi Collet <RPMS@FamilleCollet.com> - 0.1-2
-- Fedora 9 build
-- add gcc43.patch 
-- add bug12.patch
-
-* Sun Mar  2 2008 Remi Collet <RPMS@FamilleCollet.com> - 0.1-1
-- update to 0.1 finale
-
-* Sat Jan 19 2008 Remi Collet <RPMS@FamilleCollet.com> - 0.1-0.1.svn278
-- add icon
-
-* Mon Jan 07 2008 Remi Collet <RPMS@FamilleCollet.com> - 0.1-0.1.svn266
-- first RPM
-

packaging/linux/fedora/README.elements

@@ -0,0 +1,17 @@
+[fr]
+Collection d'éléments pour QElectroTech.
+
+[en]
+Elements collection for QElectroTech.
+
+[es]
+Collección de elementos para QElectroTech.
+
+[pt]
+Colecção de elementos para QElectroTech.
+
+[ru]
+Коллекция элементов для QElectroTech.
+
+[cs]
+

packaging/linux/fedora/qelectrotech.spec

@@ -0,0 +1,261 @@
+#global svn 854
+
+Name:        qelectrotech
+
+Summary:     An electric diagrams editor
+Summary(fr): Un éditeur de schémas électriques
+Summary(es): Un editor de esquemas eléctricos
+Summary(pt): Um editor de esquemas eléctricos
+Summary(ru): Редактор электрических схем
+Summary(cs): Editor nákresů elektrických obvodů
+
+# Upstream version is a float so 0.11 < 0.2 < 0.21 < 0.3
+# So use %.2f with upstream acknowledgment
+# Remember to check Source0 + setup on each update
+Version:     0.21
+Release:     1%{?dist}
+
+Group:       Applications/Engineering
+
+# Prog is GPLv2 - Symbols/Elements are Creative Commons Attribution
+License:    GPLv2+
+
+Url:        http://qelectrotech.org/
+%if 0%{?svn}
+# svn export svn://svn.tuxfamily.org/svnroot/qet/qet/trunk qelectrotech
+# mv qelectrotech qelectrotech-854
+# tar cjf tar cjf /home/rpmbuild/SOURCES/qelectrotech-854.tar.bz2 qelectrotech-854
+Source0:    qelectrotech-%{svn}.tar.bz2
+%else
+Source0:    http://download.tuxfamily.org/qet/tags/20100305/qelectrotech-0.21-src.tar.gz
+%endif
+
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:    desktop-file-utils
+Requires(post):   desktop-file-utils
+Requires(postun): desktop-file-utils
+BuildRequires:    qt4-devel >= 4.4.1
+Requires:         qelectrotech-symbols = %{version}-%{release}
+Requires:         electronics-menu
+
+%description
+QElectroTech is a Qt4 application to design electric diagrams. It uses XML  
+files for elements and diagrams, and includes both a diagram editor and an 
+element editor.
+
+%description -l es
+QElectroTech es una aplicación Qt4 para diseñar esquemas eléctricos.
+Utiliza archivos XML para los elementos y esquemas, e incluye un editor 
+de esquemas y un editor de elemento.
+
+%description -l fr
+QElectroTech est une application Qt4 pour réaliser des schémas électriques.
+QET utilise le format XML pour ses éléments et ses schémas et inclut un
+éditeur de schémas ainsi qu'un éditeur d'élément.
+
+%description -l ru
+QElectroTech - приложение написанное на Qt4 и предназначенное для разработки
+электрических схем. Оно использует XML-файлы для элементов и схем, и включает,
+как редактор схем, так и редактор элементов.
+
+%description -l pt
+QElectroTech é uma aplicação baseada em Qt4 para desenhar esquemas eléctricos.
+QET utiliza ficheiros XML para os elementos e para os esquemas e inclui um
+editor de esquemas e um editor de elementos.
+
+%description -l cs
+QElectroTech je aplikací Qt4 určenou pro návrh nákresů elektrických obvodů.
+Pro prvky a nákresy používá soubory XML, a zahrnuje v sobě jak editor nákresů,
+tak editor prvků.
+
+
+
+%package symbols
+Summary:     Elements collection for QElectroTech
+Summary(es): Collección de elementos para QElectroTech
+Summary(fr): Collection d'élements pour QElectroTech
+Summary(pt): Colecção de elementos para QElectroTech
+Summary(ru): Коллекция элементов для QElectroTech
+Group:       Applications/Productivity
+License:     CC-BY
+%if 0%{?fedora} >= 11
+BuildArch:   noarch
+%endif
+Requires:    qelectrotech = %{version}-%{release}
+
+
+%description symbols
+Elements collection for QElectroTech.
+
+%description -l es symbols
+Collección de elementos para QElectroTech.
+
+%description -l fr symbols
+Collection d'élements pour QElectroTech.
+
+%description -l pt symbols
+Colecção de elementos para QElectroTech.
+
+%description -l ru symbols
+Коллекция элементов для QElectroTech.
+
+
+%prep
+%if 0%{?svn}
+%setup -q -n %{name}-%{svn}
+%else
+%setup -q -n %{name}-0.21-src
+%endif
+
+sed -e s,/usr/local/,%{_prefix}/, \
+    -e /QET_MAN_PATH/s,'man/','share/man', \
+    -e /QET_MIME/s,../,, \
+    -i %{name}.pro
+
+qmake-qt4 %{name}.pro
+
+
+%build
+make %{?_smp_mflags}
+
+
+%install
+rm -fr $RPM_BUILD_ROOT qet.lang
+INSTALL_ROOT=$RPM_BUILD_ROOT make install
+
+# We only provides UTF-8 files
+rm -rf $RPM_BUILD_ROOT/usr/doc/qelectrotech \
+       $RPM_BUILD_ROOT%{_mandir}/fr.ISO8859-1 \
+       $RPM_BUILD_ROOT%{_mandir}/fr
+
+mv $RPM_BUILD_ROOT%{_mandir}/fr.UTF-8 $RPM_BUILD_ROOT%{_mandir}/fr
+
+desktop-file-install --vendor="" \
+   --remove-category=Office \
+   --add-category=Electronics \
+   --dir=%{buildroot}%{_datadir}/applications/ \
+         %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+# QT translation provided by QT.
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/lang/qt_*.qm
+
+%if 0%{?fedora} >= 9
+%find_lang qet --with-qt
+%else
+for lg in en es fr pt ru cs
+do
+  echo "%%lang($lg) %{_datadir}/%{name}/lang/qet_$lg.qm"
+done | tee qet.lang
+%endif
+
+
+%clean
+rm -fr $RPM_BUILD_ROOT
+
+
+%post
+update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
+%postun
+update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
+%files -f qet.lang
+%defattr(-,root,root,-)
+%doc CREDIT LICENSE examples
+%{_bindir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/mime/application/x-qet-*.xml
+%{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/mimelnk/application/x-qet-*.desktop
+%{_datadir}/icons/hicolor/*/*/*.png
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/lang
+%exclude %{_datadir}/%{name}/examples
+%{_mandir}/man1/%{name}.*
+%lang(es) %{_mandir}/es/man1/%{name}.*
+%lang(fr) %{_mandir}/fr/man1/%{name}.*
+%lang(pt) %{_mandir}/pt/man1/%{name}.*
+
+
+%files symbols
+%defattr(-,root,root,-)
+%doc ELEMENTS.LICENSE
+%{_datadir}/%{name}/elements
+
+
+%changelog
+* Sat Mar 06 2010 Remi Collet <Fedora@FamilleCollet.com> - 0.21-1
+- update to 0.21
+- more translations (sumnary and description)
+
+* Sun Feb 14 2010 Remi Collet <Fedora@FamilleCollet.com> - 0.21-0.1.svn854
+- update to SVN snapshot
+
+* Sat Jun 27 2009 Remi Collet <Fedora@FamilleCollet.com> - 0.20-1.fc8.remi
+- rebuild for Fedora 8
+
+* Sat Jun 27 2009 Remi Collet <Fedora@FamilleCollet.com> - 0.20-1
+- update to 0.2 finale
+
+* Sat Jun 20 2009 Remi Collet <Fedora@FamilleCollet.com> - 0.20-0.3.rc2
+- rebuild for remi repo 
+- add Obsoletes -elements
+
+* Sat Jun 20 2009 Remi Collet <Fedora@FamilleCollet.com> - 0.20-0.2.rc2
+- update to RC2
+
+* Thu Jun 18 2009 Remi Collet <Fedora@FamilleCollet.com> - 0.20-0.2.rc1
+- changes from review (#505867)
+- add multi-lang sumnary (taken from .desktop)
+- add multi-lang description (taken from README)
+- rename qlectrotech-elements to -symbols
+- use electronics-menu
+
+* Sun Jun 14 2009 Remi Collet <Fedora@FamilleCollet.com> - 0.20-0.1.rc1
+- initial RPM for fedora
+
+* Sat Jun 13 2009 Remi Collet <RPMS@FamilleCollet.com> - 0.20-0.3.rc1
+- update to 0.2rc1
+- split elements in sub-package
+- fix license, URL, lang
+
+* Sun May 24 2009 Remi Collet <RPMS@FamilleCollet.com> - 0.20-0.2.beta
+- update to 0.2b
+
+* Sun Apr 12 2009 Remi Collet <RPMS@FamilleCollet.com> - 0.20-0.1.alpha
+- update to 0.2alpha
+
+* Sat Sep 06 2008 Remi Collet <RPMS@FamilleCollet.com> - 0.11-1
+- update to 0.11
+
+* Fri Aug 15 2008 Remi Collet <RPMS@FamilleCollet.com> - 0.1-3.svn374
+- update to 1.0 finale
+- new snapshot (pre 0.11)
+- require qt >= 4.4.1
+
+* Tue May 20 2008 Remi Collet <RPMS@FamilleCollet.com> - 0.1-2
+- Fedora 9 build
+- add gcc43.patch 
+- add bug12.patch
+
+* Sun Mar  2 2008 Remi Collet <RPMS@FamilleCollet.com> - 0.1-1
+- update to 0.1 finale
+
+* Sat Jan 19 2008 Remi Collet <RPMS@FamilleCollet.com> - 0.1-0.1.svn278
+- add icon
+
+* Mon Jan 07 2008 Remi Collet <RPMS@FamilleCollet.com> - 0.1-0.1.svn266
+- first RPM
+

packaging/windows/Lancer QET.bat

@@ -4,9 +4,6 @@ rem Se rend dans le dossier qui convient
 set current_dir=%~dp0
 cd /d %current_dir%
 
-rem Met la collection QET en lecture seule
-attrib +r elements/* /S /D
-
 rem lance QElectroTech
 rem Sans option --config-dir, la configuration de QElectroTech ainsi que la
 rem collection d'elements perso seront dans "%APPDATA%\qet"

sources/conductor.cpp

@@ -42,6 +42,7 @@ Conductor::Conductor(Terminal *p1, Terminal* p2, Element *parent, QGraphicsScene
 	terminal1(p1),
 	terminal2(p2),
 	destroyed(false),
+	text_item(0),
 	segments(NULL),
 	moving_point(false),
 	moving_segment(false),
@@ -749,6 +750,9 @@ QVariant Conductor::itemChange(GraphicsItemChange change, const QVariant &value)
 			// le conducteur vient de se faire deselectionner
 			setZValue(previous_z_value);
 		}
+	} else if (change == QGraphicsItem::ItemSceneHasChanged || change == QGraphicsItem::ItemVisibleHasChanged) {
+		// permet de positionner correctement le texte du conducteur lors de son ajout a un schema
+		calculateTextItemPosition();
 	}
 	return(QGraphicsPathItem::itemChange(change, value));
 }
@@ -1070,6 +1074,7 @@ ConductorSegment *Conductor::middleSegment() {
 */
 void Conductor::calculateTextItemPosition() {
 	if (properties_.type != ConductorProperties::Multi) return;
+	if (!text_item) return;
 	text_item -> setPos(middleSegment() -> middle());
 }
 

sources/diagramview.cpp

@@ -785,7 +785,12 @@ void DiagramView::editDefaultConductorProperties() {
 bool DiagramView::event(QEvent *e) {
 	// fait en sorte que les raccourcis clavier arrivent prioritairement sur la
 	// vue plutot que de remonter vers les QMenu / QAction
-	if (e -> type() == QEvent::ShortcutOverride && scene -> focusItem()) {
+	if (
+		e -> type() == QEvent::ShortcutOverride &&
+		scene -> hasFocus() &&
+		scene -> focusItem() &&
+		scene -> focusItem() -> isSelected()
+	) {
 		e -> accept();
 		return(true);
 	}

sources/editor/editorcommands.cpp

@@ -607,7 +607,7 @@ void AllowInternalConnectionsCommand::redo() {
 	Constructeur
 	@param elmt ElementScene concernee
 	@param old_infos Informations complementaires precedentes
-	@param old_infos Nouvelles informations complementaires
+	@param new_infos Nouvelles informations complementaires
 	@param parent QUndoCommand parent
 */
 ChangeInformationsCommand::ChangeInformationsCommand(ElementScene *elmt, const QString &old_infos, const QString &new_infos, QUndoCommand *parent) :

sources/editor/elementscene.cpp

@@ -836,7 +836,7 @@ void ElementScene::slot_editSizeHotSpot() {
 	connect(dialog_buttons, SIGNAL(rejected()),    &dialog_sh, SLOT(reject()));
 	
 	// lance le dialogue
-	if (dialog_sh.exec() == QDialog::Accepted && is_read_only) {
+	if (dialog_sh.exec() == QDialog::Accepted && !is_read_only) {
 		QSize new_size(hotspot_editor -> elementSize());
 		QSize old_size(width(), height());
 		QPoint new_hotspot(hotspot_editor -> hotspot());

sources/editor/partpolygon.cpp

@@ -77,8 +77,8 @@ const QDomElement PartPolygon::toXml(QDomDocument &xml_document) const {
 	int i = 1;
 	foreach(QPointF point, polygon()) {
 		point = mapToScene(point);
-		xml_element.setAttribute(QString("x%1").arg(i), point.x());
-		xml_element.setAttribute(QString("y%1").arg(i), point.y());
+		xml_element.setAttribute(QString("x%1").arg(i), QString("%1").arg(point.x()));
+		xml_element.setAttribute(QString("y%1").arg(i), QString("%1").arg(point.y()));
 		++ i;
 	}
 	if (!closed) xml_element.setAttribute("closed", "false");

sources/editor/qetelementeditor.cpp

@@ -89,6 +89,35 @@ QETElementEditor::~QETElementEditor() {
 	editors_.clear();
 }
 
+/**
+	@param el Le nouvel emplacement de l'element edite
+*/
+void QETElementEditor::setLocation(const ElementsLocation &el) {
+	location_ = el;
+	opened_from_file = false;
+	// modifie le mode lecture seule si besoin
+	ElementsCollectionItem *item = QETApp::collectionItem(location_);
+	bool must_be_read_only = item && !item -> isWritable();
+	if (isReadOnly() != must_be_read_only) {
+		setReadOnly(must_be_read_only);
+	}
+	slot_updateTitle();
+}
+
+/**
+	@param fn Le nouveau nom de fichier de l'element edite
+*/
+void QETElementEditor::setFileName(const QString &fn) {
+	filename_ = fn;
+	opened_from_file = true;
+	// modifie le mode lecture seule si besoin
+	bool must_be_read_only = !QFileInfo(filename_).isWritable();
+	if (isReadOnly() != must_be_read_only) {
+		setReadOnly(must_be_read_only);
+	}
+	slot_updateTitle();
+}
+
 /**
 	Met en place les actions
 */
@@ -350,12 +379,12 @@ void QETElementEditor::setupActions() {
 	Met en place les menus.
 */
 void QETElementEditor::setupMenus() {
-	file_menu    = new QMenu(tr("Fichier"),        this);
-	edit_menu    = new QMenu(tr("\311dition"),     this);
-	display_menu = new QMenu(tr("Affichage"),      this);
-	tools_menu   = new QMenu(tr("Outils"),         this);
+	file_menu    = new QMenu(tr("&Fichier"),       this);
+	edit_menu    = new QMenu(tr("&\311dition"),    this);
+	display_menu = new QMenu(tr("Afficha&ge"),     this);
+	tools_menu   = new QMenu(tr("O&utils"),        this);
 	config_menu  = new QMenu(tr("&Configuration"), this);
-	help_menu    = new QMenu(tr("Aide"),           this);
+	help_menu    = new QMenu(tr("&Aide"),          this);
 	
 	file_menu    -> setTearOffEnabled(true);
 	edit_menu    -> setTearOffEnabled(true);
@@ -839,7 +868,7 @@ bool QETElementEditor::toLocation(const ElementsLocation &location) {
 }
 
 /**
-	@param location Emplacement d'un element
+	@param provided_location Emplacement d'un element
 	@return true si cet editeur est en train d'editer l'element dont
 	l'emplacement est location, false sinon
 */

sources/editor/qetelementeditor.h

@@ -219,15 +219,6 @@ inline OrientationSet QETElementEditor::orientations() const {
 	return(ce_scene -> orientations());
 }
 
-/**
-	@param el Le nouvel emplacement de l'element edite
-*/
-inline void QETElementEditor::setLocation(const ElementsLocation &el) {
-	location_ = el;
-	opened_from_file = false;
-	slot_updateTitle();
-}
-
 /**
 	@return l'emplacement de l'element edite
 */
@@ -235,15 +226,6 @@ inline ElementsLocation QETElementEditor::location() const {
 	return(location_);
 }
 
-/**
-	@param fn Le nouveau nom de fichier de l'element edite
-*/
-inline void QETElementEditor::setFileName(const QString &fn) {
-	filename_ = fn;
-	opened_from_file = true;
-	slot_updateTitle();
-}
-
 /**
 	@return le nom de fichier de l'element edite
 */

sources/fileelementdefinition.cpp

@@ -54,6 +54,7 @@ QDomElement FileElementDefinition::xml() {
 bool FileElementDefinition::setXml(const QDomElement &xml_element) {
 	xml_element_.clear();
 	xml_element_.appendChild(xml_element_.importNode(xml_element, true));
+	is_null = false;
 	return(true);
 }
 

sources/qet.h

@@ -25,9 +25,9 @@
 */
 namespace QET {
 	/// version de QElectroTech (utilisee pour estampiller les projets et elements)
-	const QString version = "0.21";
+	const QString version = "0.22";
 	/// version affichee de QElectroTech
-	const QString displayedVersion = "0.21";
+	const QString displayedVersion = "0.22";
 	QString license();
 	/// Orientation (utilise pour les bornes mais aussi pour les elements)
 	enum Orientation {North, East, South, West};

sources/terminal.cpp

@@ -484,8 +484,8 @@ bool Terminal::valideXml(QDomElement &terminal) {
 */
 bool Terminal::fromXml(QDomElement &terminal) {
 	return (
-		terminal.attribute("x").toDouble() == amarrage_elmt.x() &&\
-		terminal.attribute("y").toDouble() == amarrage_elmt.y() &&\
+		qFuzzyCompare(terminal.attribute("x").toDouble(), amarrage_elmt.x()) &&
+		qFuzzyCompare(terminal.attribute("y").toDouble(), amarrage_elmt.y()) &&
 		terminal.attribute("orientation").toInt() == sens
 	);
 }