From f8d8a559d423323d196224223bf8139be20dad07 Mon Sep 17 00:00:00 2001 From: xavier Date: Thu, 21 May 2009 18:45:30 +0000 Subject: [PATCH] Ameliorations diverses dans le fichier qelectrotech.pro Corrections mineures dans les fichiers .desktop. Mise a jour du ChangeLog. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@667 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- ChangeLog | 4 + misc/qelectrotech.desktop | 2 +- misc/x-qet-element.desktop | 2 +- qelectrotech.pro | 220 ++++--------------------------------- 4 files changed, 25 insertions(+), 203 deletions(-) diff --git a/ChangeLog b/ChangeLog index 893c668c9..bde8870e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ ====== Changelog 0.11 -> 0.2 ====== +À partir de la version 0.2, QElectroTech est disponible en français, anglais, mais aussi : + * en espagnol, grâce aux traductions de Youssef ; + * en russe, grâce aux traductions de Yuriy. +L'application utilise désormais le thème d'icônes Oxygen, réalisé par Nuno Pinheiro pour le projet KDE. ===== Notion de fichier projet ===== Un fichier .qet peut désormais contenir zéro, un ou plusieurs schémas électriques. Les éléments composant ces schémas sont embarqués dans le fichier projet au moment où ils sont posés sur un schéma. Le panel d'éléments affiche donc désormais : diff --git a/misc/qelectrotech.desktop b/misc/qelectrotech.desktop index df72f8024..dca578ce2 100644 --- a/misc/qelectrotech.desktop +++ b/misc/qelectrotech.desktop @@ -22,4 +22,4 @@ GenericName[fr_FR]=Un éditeur de schémas électriques GenericName[ru]=Редактор электрических схем GenericName[ru_RU]=Редактор электрических схем GenericName[pt]=Editor de esquemas eléctricos -GenericName[pt_PT]=Editor de esquemas eléctricos \ No newline at end of file +GenericName[pt_PT]=Editor de esquemas eléctricos diff --git a/misc/x-qet-element.desktop b/misc/x-qet-element.desktop index a3dcbbe1d..29984a077 100644 --- a/misc/x-qet-element.desktop +++ b/misc/x-qet-element.desktop @@ -10,4 +10,4 @@ Comment[es]=Archivo elemento QElectroTech Comment[ru]=Файл элемента QElectroTech Comment[ru_RU]=Файл элемента QElectroTech Comment[pt]=Ficheiro de elemento QElectroTech -Comment[pt_PT]=Ficheiro de elemento QElectroTech \ No newline at end of file +Comment[pt_PT]=Ficheiro de elemento QElectroTech diff --git a/qelectrotech.pro b/qelectrotech.pro index 52f3c2638..5d3fd4270 100644 --- a/qelectrotech.pro +++ b/qelectrotech.pro @@ -53,217 +53,35 @@ DEFINES += QET_ALLOW_OVERRIDE_CD_OPTION ###################################################################### TEMPLATE = app -DEPENDPATH += . sources sources/editor lang +DEPENDPATH += . INCLUDEPATH += sources sources/editor # Fichiers sources -HEADERS += sources/aboutqet.h \ - sources/basicmoveelementshandler.h \ - sources/borderinset.h \ - sources/borderproperties.h \ - sources/borderpropertieswidget.h \ - sources/conductor.h \ - sources/conductorprofile.h \ - sources/conductorproperties.h \ - sources/conductorpropertieswidget.h \ - sources/conductorsegment.h \ - sources/conductorsegmentprofile.h \ - sources/configdialog.h \ - sources/configpages.h \ - sources/customelement.h \ - sources/diagram.h \ - sources/diagramcommands.h \ - sources/diagramcontent.h \ - sources/diagramposition.h \ - sources/diagramprintdialog.h \ - sources/diagramschooser.h \ - sources/diagramtextitem.h \ - sources/diagramview.h \ - sources/element.h \ - sources/elementdefinition.h \ - sources/elementdeleter.h \ - sources/elementdialog.h \ - sources/elementscategorieslist.h \ - sources/elementscategorieswidget.h \ - sources/elementscategory.h \ - sources/elementscategorydeleter.h \ - sources/elementscategoryeditor.h \ - sources/elementscollection.h \ - sources/elementscollectionitem.h \ - sources/elementslocation.h \ - sources/elementspanel.h \ - sources/elementspanelwidget.h \ - sources/elementtextitem.h \ - sources/exportdialog.h \ - sources/fileelementscategory.h \ - sources/fileelementscollection.h \ - sources/fileelementdefinition.h \ - sources/fixedelement.h \ - sources/ghostelement.h \ - sources/hotspoteditor.h \ - sources/insetproperties.h \ - sources/insetpropertieswidget.h \ - sources/integrationmoveelementshandler.h \ - sources/interactivemoveelementshandler.h \ - sources/moveelementsdescription.h \ - sources/moveelementshandler.h \ - sources/nameslist.h \ - sources/nameslistwidget.h \ - sources/newelementwizard.h \ - sources/orientationset.h \ - sources/orientationsetwidget.h \ - sources/projectview.h \ - sources/qet.h \ - sources/qetapp.h \ - sources/qetarguments.h \ - sources/qetdiagrameditor.h \ - sources/qeticons.h \ - sources/qetproject.h \ - sources/qetprintpreviewdialog.h \ - sources/qetregexpvalidator.h \ - sources/qettabbar.h \ - sources/qettabwidget.h \ - sources/qetsingleapplication.h \ - sources/qfilenameedit.h \ - sources/qgimanager.h \ - sources/recentfiles.h \ - sources/terminal.h \ - sources/xmlelementdefinition.h \ - sources/xmlelementscategory.h \ - sources/xmlelementscollection.h \ - sources/editor/arceditor.h \ - sources/editor/circleeditor.h \ - sources/editor/customelementgraphicpart.h \ - sources/editor/customelementpart.h \ - sources/editor/editorcommands.h \ - sources/editor/elementcontent.h \ - sources/editor/elementitemeditor.h \ - sources/editor/elementscene.h \ - sources/editor/elementview.h \ - sources/editor/ellipseeditor.h \ - sources/editor/lineeditor.h \ - sources/editor/partarc.h \ - sources/editor/partcircle.h \ - sources/editor/partellipse.h \ - sources/editor/partline.h \ - sources/editor/partpolygon.h \ - sources/editor/partrectangle.h \ - sources/editor/partterminal.h \ - sources/editor/parttext.h \ - sources/editor/parttextfield.h \ - sources/editor/polygoneditor.h \ - sources/editor/qetelementeditor.h \ - sources/editor/rectangleeditor.h \ - sources/editor/styleeditor.h \ - sources/editor/terminaleditor.h \ - sources/editor/texteditor.h \ - sources/editor/textfieldeditor.h -SOURCES += sources/aboutqet.cpp \ - sources/basicmoveelementshandler.cpp \ - sources/borderinset.cpp \ - sources/borderproperties.cpp \ - sources/borderpropertieswidget.cpp \ - sources/conductor.cpp \ - sources/conductorprofile.cpp \ - sources/conductorproperties.cpp \ - sources/conductorpropertieswidget.cpp \ - sources/conductorsegment.cpp \ - sources/customelement.cpp \ - sources/configdialog.cpp \ - sources/configpages.cpp \ - sources/diagram.cpp \ - sources/diagramcommands.cpp \ - sources/diagramcontent.cpp \ - sources/diagramposition.cpp \ - sources/diagramprintdialog.cpp \ - sources/diagramschooser.cpp \ - sources/diagramtextitem.cpp \ - sources/diagramview.cpp \ - sources/element.cpp \ - sources/elementdefinition.cpp \ - sources/elementdeleter.cpp \ - sources/elementdialog.cpp \ - sources/elementscategorieslist.cpp \ - sources/elementscategorieswidget.cpp \ - sources/elementscategory.cpp \ - sources/elementscategorydeleter.cpp \ - sources/elementscategoryeditor.cpp \ - sources/elementscollection.cpp \ - sources/elementslocation.cpp \ - sources/elementspanel.cpp \ - sources/elementspanelwidget.cpp \ - sources/elementtextitem.cpp \ - sources/exportdialog.cpp \ - sources/fixedelement.cpp \ - sources/fileelementscategory.cpp \ - sources/fileelementscollection.cpp \ - sources/fileelementdefinition.cpp \ - sources/ghostelement.cpp \ - sources/hotspoteditor.cpp \ - sources/insetproperties.cpp \ - sources/insetpropertieswidget.cpp \ - sources/integrationmoveelementshandler.cpp \ - sources/interactivemoveelementshandler.cpp \ - sources/main.cpp \ - sources/moveelementsdescription.cpp \ - sources/nameslist.cpp \ - sources/nameslistwidget.cpp \ - sources/newelementwizard.cpp \ - sources/orientationset.cpp \ - sources/orientationsetwidget.cpp \ - sources/projectview.cpp \ - sources/qet.cpp \ - sources/qetapp.cpp \ - sources/qetarguments.cpp \ - sources/qetdiagrameditor.cpp \ - sources/qeticons.cpp \ - sources/qetproject.cpp \ - sources/qetprintpreviewdialog.cpp \ - sources/qetregexpvalidator.cpp \ - sources/qettabbar.cpp \ - sources/qettabwidget.cpp \ - sources/qetsingleapplication.cpp \ - sources/qfilenameedit.cpp \ - sources/qgimanager.cpp \ - sources/recentfiles.cpp \ - sources/terminal.cpp \ - sources/xmlelementdefinition.cpp \ - sources/xmlelementscategory.cpp \ - sources/xmlelementscollection.cpp \ - sources/editor/arceditor.cpp \ - sources/editor/circleeditor.cpp \ - sources/editor/customelementgraphicpart.cpp \ - sources/editor/customelementpart.cpp \ - sources/editor/editorcommands.cpp \ - sources/editor/elementitemeditor.cpp \ - sources/editor/elementscene.cpp \ - sources/editor/elementview.cpp \ - sources/editor/ellipseeditor.cpp \ - sources/editor/lineeditor.cpp \ - sources/editor/partarc.cpp \ - sources/editor/partcircle.cpp \ - sources/editor/partellipse.cpp \ - sources/editor/partline.cpp \ - sources/editor/partpolygon.cpp \ - sources/editor/partrectangle.cpp \ - sources/editor/partterminal.cpp \ - sources/editor/parttext.cpp \ - sources/editor/parttextfield.cpp \ - sources/editor/polygoneditor.cpp \ - sources/editor/qetelementeditor.cpp \ - sources/editor/rectangleeditor.cpp \ - sources/editor/styleeditor.cpp \ - sources/editor/terminaleditor.cpp \ - sources/editor/texteditor.cpp \ - sources/editor/textfieldeditor.cpp +HEADERS += sources/*.h sources/editor/*.h +SOURCES += sources/*.cpp sources/editor/*.cpp + +# Liste des fichiers qui seront incorpores au binaire en tant que ressources Qt RESOURCES += qelectrotech.qrc + +# Liste des ressources Windows +RC_FILE = ico/windows_icon/qelectrotech.rc + +# Fichiers de traduction qui seront installes TRANSLATIONS += lang/qet_en.ts lang/qet_es.ts lang/qet_fr.ts lang/qet_ru.ts TRANSLATIONS += lang/qt_es.ts lang/qt_fr.ts lang/qt_ru.ts -RC_FILE = ico/windows_icon/qelectrotech.rc + +# Modules Qt utilises par l'application QT += xml svg network + +# Configuration de la compilation CONFIG += debug_and_release warn_on + +# Nom du binaire genere par la compilation TARGET = qelectrotech +# Ajustement des bibliotheques utilisees lors de l'edition des liens +unix:QMAKE_LIBS_THREAD -= -lpthread + # Description de l'installation target.path = $$join(INSTALL_PREFIX,,,$${QET_BINARY_PATH})