Rapatriement dans la branche 0.3 des revisions 870 a 903.

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@904 bfdf4180-ca20-0410-9c96-a3a8aa849046
2026-02-13 04:19:58 +01:00 · 2010-03-28 16:27:48 +00:00
parent 815a2ea3e8
commit c3563a8307
261 changed files with 23264 additions and 2797 deletions
--- a/packaging/linux/fedora/README.elements
+++ b/packaging/linux/fedora/README.elements
@@ -0,0 +1,20 @@
+[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]
+
+
+[pl]
+Kolekcja elementów QElectroTech
--- a/packaging/linux/fedora/qelectrotech.spec
+++ b/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
+
--- a/packaging/windows/Lancer
+++ b/packaging/windows/Lancer
@@ -0,0 +1,11 @@
+@echo off
+
+rem Se rend dans le dossier qui convient
+set current_dir=%~dp0
+cd /d %current_dir%
+
+rem lance QElectroTech
+rem Sans option --config-dir, la configuration de QElectroTech ainsi que la
+rem collection d'elements perso seront dans "%APPDATA%\qet"
+set command=bin\qelectrotech.exe --common-elements-dir=elements/ --lang-dir=lang/ -style plastique %*
+@start %command%
--- a/packaging/windows/QET.nsi
+++ b/packaging/windows/QET.nsi
@@ -11,10 +11,10 @@
 ;--------------------------------
 ;General
 	; General Product Description Definitions
-	!define SOFT_NAME "QElectroTech"
-	!define SOFT_VERSION "svn"
+	!define SOFT_NAME     "QElectroTech"
+	!define SOFT_VERSION  "svn"
 	!define SOFT_WEB_SITE "http://qelectrotech.org/"
-	!define SOFT_BUILD "1cf"
+	!define SOFT_BUILD    "1"
 	
 	SetCompressor /final /solid lzma
 	CRCCheck force
@@ -31,7 +31,8 @@
 	InstallDirRegKey HKCU "Software\${SOFT_NAME}" ""

 	;Request application privileges for Windows Vista
-	RequestExecutionLevel user
+	; we request for admin because we write stuff into the registry
+	RequestExecutionLevel admin

 ;--------------------------------
 ;Interface Settings
@@ -60,63 +61,17 @@

 ;--------------------------------
 ;Languages
-
+	;Since NSIS 2.26, the language selection dialog of Modern UI hides languages unsupported by the user's selected codepage by default.
+	;To revert to the old behavior and display all languages, no matter what the user will see when they're selected, use MUI_LANGDLL_ALLLANGUAGES.
+	!define MUI_LANGDLL_ALLLANGUAGES
+	
+	; For consistency, we limit the installer to languages supported by QElectroTech itself
 	!insertmacro MUI_LANGUAGE "English" ;first language is the default language
 	!insertmacro MUI_LANGUAGE "French"
-	!insertmacro MUI_LANGUAGE "German"
 	!insertmacro MUI_LANGUAGE "Spanish"
-	!insertmacro MUI_LANGUAGE "SpanishInternational"
-	!insertmacro MUI_LANGUAGE "SimpChinese"
-	!insertmacro MUI_LANGUAGE "TradChinese"
-	!insertmacro MUI_LANGUAGE "Japanese"
-	!insertmacro MUI_LANGUAGE "Korean"
-	!insertmacro MUI_LANGUAGE "Italian"
-	!insertmacro MUI_LANGUAGE "Dutch"
-	!insertmacro MUI_LANGUAGE "Danish"
-	!insertmacro MUI_LANGUAGE "Swedish"
-	!insertmacro MUI_LANGUAGE "Norwegian"
-	!insertmacro MUI_LANGUAGE "NorwegianNynorsk"
-	!insertmacro MUI_LANGUAGE "Finnish"
-	!insertmacro MUI_LANGUAGE "Greek"
 	!insertmacro MUI_LANGUAGE "Russian"
 	!insertmacro MUI_LANGUAGE "Portuguese"
-	!insertmacro MUI_LANGUAGE "PortugueseBR"
-	!insertmacro MUI_LANGUAGE "Polish"
-	!insertmacro MUI_LANGUAGE "Ukrainian"
 	!insertmacro MUI_LANGUAGE "Czech"
-	!insertmacro MUI_LANGUAGE "Slovak"
-	!insertmacro MUI_LANGUAGE "Croatian"
-	!insertmacro MUI_LANGUAGE "Bulgarian"
-	!insertmacro MUI_LANGUAGE "Hungarian"
-	!insertmacro MUI_LANGUAGE "Thai"
-	!insertmacro MUI_LANGUAGE "Romanian"
-	!insertmacro MUI_LANGUAGE "Latvian"
-	!insertmacro MUI_LANGUAGE "Macedonian"
-	!insertmacro MUI_LANGUAGE "Estonian"
-	!insertmacro MUI_LANGUAGE "Turkish"
-	!insertmacro MUI_LANGUAGE "Lithuanian"
-	!insertmacro MUI_LANGUAGE "Slovenian"
-	!insertmacro MUI_LANGUAGE "Serbian"
-	!insertmacro MUI_LANGUAGE "SerbianLatin"
-	!insertmacro MUI_LANGUAGE "Arabic"
-	!insertmacro MUI_LANGUAGE "Farsi"
-	!insertmacro MUI_LANGUAGE "Hebrew"
-	!insertmacro MUI_LANGUAGE "Indonesian"
-	!insertmacro MUI_LANGUAGE "Mongolian"
-	!insertmacro MUI_LANGUAGE "Luxembourgish"
-	!insertmacro MUI_LANGUAGE "Albanian"
-	!insertmacro MUI_LANGUAGE "Breton"
-	!insertmacro MUI_LANGUAGE "Belarusian"
-	!insertmacro MUI_LANGUAGE "Icelandic"
-	!insertmacro MUI_LANGUAGE "Malay"
-	!insertmacro MUI_LANGUAGE "Bosnian"
-	!insertmacro MUI_LANGUAGE "Kurdish"
-	!insertmacro MUI_LANGUAGE "Irish"
-	!insertmacro MUI_LANGUAGE "Uzbek"
-	!insertmacro MUI_LANGUAGE "Galician"
-	!insertmacro MUI_LANGUAGE "Afrikaans"
-	!insertmacro MUI_LANGUAGE "Catalan"
-	!insertmacro MUI_LANGUAGE "Esperanto"

 ;--------------------------------
 ;Reserve Files
@@ -131,22 +86,50 @@
 ;Installer Sections

 Section ""
-
 	SetOutPath "$INSTDIR"  
-	;ADD YOUR OWN FILES HERE...
-	File /nonfatal /r "files\*"
+	; copy every files in the "files" directory, except the ready-to-use .bat file
+	File /nonfatal /r /x "files\Lancer QET.bat" /x ".svn" "files\*"
+	; add the use-APPDATA .bat file
+	File "Lancer QET.bat"
 	;Store installation folder
 	WriteRegStr HKCU "Software\${SOFT_NAME}" "" $INSTDIR
 	; write uninstall strings
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" "DisplayName" "${SOFT_NAME} (remove only)"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" "DisplayName"     "${SOFT_NAME} (remove only)"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
-	; use defaults for parameters, icon, etc.
-	CreateDirectory "$SMPROGRAMS\${SOFT_NAME}"
-	CreateShortCut "$SMPROGRAMS\${SOFT_NAME}\QET.lnk" "$INSTDIR\Lancer QET.bat" 0 "$INSTDIR\ico\qelectrotech.ico"
-	CreateShortCut "$DESKTOP\QET.lnk" "$INSTDIR\Lancer QET.bat" 0 "$INSTDIR\ico\qelectrotech.ico"
 	;Create uninstaller
 	WriteUninstaller "$INSTDIR\Uninstall.exe"
-  
+	
+	; get the final path for the icons and the launch script
+	Var /GLOBAL final_qet_exe
+	Var /GLOBAL final_project_ico
+	Var /GLOBAL final_element_ico
+	StrCpy $final_qet_exe     "$INSTDIR\Lancer QET.bat"
+	StrCpy $final_project_ico "$INSTDIR\ico\application-x-qet-project.ico"
+	StrCpy $final_element_ico "$INSTDIR\ico\application-x-qet-element.ico"
+	
+	; write file associations registry keys
+	WriteRegStr   HKEY_CLASSES_ROOT "Applications\qelectrotech.exe\shell\open\command" ""             "$\"$final_qet_exe$\" $\"%1$\""
+	WriteRegStr   HKEY_CLASSES_ROOT ".qet"                                             ""             "qet_diagram_file"
+	WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file"                                 ""             "Schéma QET"
+	WriteRegDWORD HKEY_CLASSES_ROOT "qet_diagram_file"                                 "EditFlags"    0x00000000
+	WriteRegDWORD HKEY_CLASSES_ROOT "qet_diagram_file"                                 "BrowserFlags" 0x00000008
+	WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file\DefaultIcon"                     ""             "$final_project_ico"
+	WriteRegStr   HKEY_CLASSES_ROOT "qet_diagram_file\shell\open\command"              ""             "$\"$final_qet_exe$\" $\"%1$\""
+	WriteRegStr   HKEY_CLASSES_ROOT ".elmt"                                            ""             "qet_element_file"
+	WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file"                                 ""             "Élément QET"
+	WriteRegDWORD HKEY_CLASSES_ROOT "qet_element_file"                                 "EditFlags"    0x00000000
+	WriteRegDWORD HKEY_CLASSES_ROOT "qet_element_file"                                 "BrowserFlags" 0x00000008
+	WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file\DefaultIcon"                     ""             "$final_element_ico"
+	WriteRegStr   HKEY_CLASSES_ROOT "qet_element_file\shell\open\command"              ""             "$\"$final_qet_exe$\" $\"%1$\""
+	
+	; shortcuts in the start menu
+	CreateDirectory "$SMPROGRAMS\${SOFT_NAME}"
+	CreateShortCut  "$SMPROGRAMS\${SOFT_NAME}\QElectroTech.lnk"           "$INSTDIR\Lancer QET.bat" 0 "$INSTDIR\ico\qelectrotech.ico"
+	CreateShortCut  "$SMPROGRAMS\${SOFT_NAME}\Uninstall QElectroTech.lnk" "$INSTDIR\Uninstall.exe"
+	; TODO : add the QuickStart Guide (or any other documentation) when available
+	
+	; shortcut on the desktop
+	CreateShortCut "$DESKTOP\QElectroTech.lnk" "$INSTDIR\Lancer QET.bat" 0 "$INSTDIR\ico\qelectrotech.ico"
 SectionEnd

 ;--------------------------------
@@ -172,24 +155,29 @@ FunctionEnd
 ;Uninstaller Section

 Section "Uninstall"
-
-	;remove start menu shortcuts
-	Delete "$SMPROGRAMS\${SOFT_NAME}\QET.lnk"
-	Delete "$DESKTOP\QET.lnk"
-	RMDir "$SMPROGRAMS\${SOFT_NAME}"
-
-	;ADD YOUR OWN FILES HERE...
+	; remove start menu shortcuts
+	RMDir /r "$SMPROGRAMS\${SOFT_NAME}"
+	; remove shortcut on the desktop
+	Delete "$DESKTOP\QElectroTech.lnk"
+	
+	; remove the application files
 	Delete "$INSTDIR\*.*"
 	RMDir /r "$INSTDIR"
-
-	;remove installation registary keys
+	
+	;remove installation registry keys
 	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}"
 	DeleteRegKey /ifempty HKCU "Software\${SOFT_NAME}"
-
+	
+	; remove file associations registry keys
+	DeleteRegKey HKEY_CLASSES_ROOT "Applications\qelectrotech.exe"
+	DeleteRegKey HKEY_CLASSES_ROOT ".qet"
+	DeleteRegKey HKEY_CLASSES_ROOT "qet_diagram_file"
+	DeleteRegKey HKEY_CLASSES_ROOT ".elmt"
+	DeleteRegKey HKEY_CLASSES_ROOT "qet_element_file"
+	
 	IfFileExists "$INSTDIR" 0 NoErrorMsg
 	MessageBox MB_OK "Note: $INSTDIR could not be removed!" IDOK 0 ; skipped if file doesn't exist
 	NoErrorMsg:
-  
 SectionEnd

 ;--------------------------------