From 854336e569bf102ad9e347a06467dc186583ddd6 Mon Sep 17 00:00:00 2001
From: xavierqet
 <xavierqet@r9  xavierqet  2006-10-30 20:28:16 +0100 (lun. 30 oct. 2006)>
Date: Sat, 23 Feb 2008 13:22:23 +0000
Subject: [PATCH] L'installation ajoute desormais une icone et un .desktop sous
 UNIX Mise a jour de la DTD, toujours inutilisee

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@300 bfdf4180-ca20-0410-9c96-a3a8aa849046
---
 misc/definition_element.dtd | 18 +++++++++---------
 misc/qelectrotech.desktop   | 11 +++++++++++
 qelectrotech.pro            | 12 ++++++++++++
 3 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 misc/qelectrotech.desktop

diff --git a/misc/definition_element.dtd b/misc/definition_element.dtd
index e8889afd3..5f32589e3 100644
--- a/misc/definition_element.dtd
+++ b/misc/definition_element.dtd
@@ -13,17 +13,17 @@
 <!ELEMENT name (#PCDATA)>
 <!ATTLIST name lang CDATA #REQUIRED>
 
-<!ELEMENT description (borne+|ligne*|cercle*|polygone*)+>
+<!ELEMENT description (terminal+|line*|circle*|polygon*)+>
 
-<!ELEMENT borne    EMPTY>
-<!ATTLIST borne
+<!ELEMENT terminal    EMPTY>
+<!ATTLIST terminal
 	x           CDATA     #REQUIRED
 	y           CDATA     #REQUIRED
 	orientation (n|s|e|o) "n"
 >
 
-<!ELEMENT ligne    EMPTY>
-<!ATTLIST ligne
+<!ELEMENT line    EMPTY>
+<!ATTLIST line
 	x1         CDATA       #REQUIRED
 	y1         CDATA       #REQUIRED
 	x2         CDATA       #REQUIRED
@@ -32,8 +32,8 @@
 	style      CDATA       ""
 >
 
-<!ELEMENT cercle   EMPTY>
-<!ATTLIST cercle
+<!ELEMENT circle   EMPTY>
+<!ATTLIST circle
 	x         CDATA        #REQUIRED
 	y         CDATA        #REQUIRED
 	rayon     CDATA        #REQUIRED
@@ -41,8 +41,8 @@
 	style     CDATA        ""
 >
 
-<!ELEMENT polygone EMPTY>
-<!ATTLIST polygone
+<!ELEMENT polygon EMPTY>
+<!ATTLIST polygon
 	x1          CDATA        #IMPLIED
 	y1          CDATA        #IMPLIED
 	x2          CDATA        #IMPLIED
diff --git a/misc/qelectrotech.desktop b/misc/qelectrotech.desktop
new file mode 100644
index 000000000..ff362ae00
--- /dev/null
+++ b/misc/qelectrotech.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=QElectroTech
+Exec=qelectrotech
+Icon=qet
+Terminal=false
+Type=Application
+Categories=Qt;VectorGraphics;Science;Electricity;Engineering;
+Comment=An electric diagrams editor.
+Comment[fr]=Un éditeur de schémas électriques
+GenericName=Electric diagrams editor
+GenericName[fr]=Un éditeur de schémas électriques
diff --git a/qelectrotech.pro b/qelectrotech.pro
index 4bdb5e10f..09a5a7e0b 100644
--- a/qelectrotech.pro
+++ b/qelectrotech.pro
@@ -11,6 +11,8 @@
 	QET_COMMON_COLLECTION_PATH = 'share/qelectrotech/elements/'
 	QET_LANG_PATH              = 'share/qelectrotech/lang/'
 	QET_LICENSE_PATH           = 'doc/qelectrotech/'
+	QET_DESKTOP_PATH           = 'share/applications/'
+	QET_ICONS_PATH             = 'share/icons/'
 } else {
 	# Chemins Windows
 	COMPIL_PREFIX              = './'
@@ -185,8 +187,18 @@ copyright.files = LICENSE \
                   CREDIT \
                   README
 
+desktop.path   = $$join(INSTALL_PREFIX,,,$${QET_DESKTOP_PATH})
+desktop.files  = misc/qelectrotech.desktop
+
+icons.path     = $$join(INSTALL_PREFIX,,,$${QET_ICONS_PATH})
+icons.files    = ico/qet.png
+
 # L'installation comprend la copie du binaire, des elements, des fichiers de langue et du fichier LICENSE
 INSTALLS += target elements lang copyright
+# Sous Unix, on installe egalement l'icone et un fichier .desktop
+unix {
+	INSTALLS += desktop icons
+}
 
 # Options de compilation
 # Chemin des fichiers de traduction ; par defaut : lang/ dans le repertoire d'execution