parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

trans: Update name PAMHYR to Pamhyr2 and minor change.

mesh
Pierre-Antoine Rouby 2023-09-19 14:06:14 +02:00
parent 694c84a526
commit 47bcf8a748
5 changed files with 58 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/pamhyr.nsi
View File

@ -3,7 +3,7 @@
!define LIC_NAME "LICENSE" !define LIC_NAME "LICENSE"
!define APP_NAME "PAMHYR" !define APP_NAME "PAMHYR"
Name "PAMHYR" Name "Pamhyr2"
OutFile "pamhyr-windows.exe" OutFile "pamhyr-windows.exe"
LicenseData "pamhyr\pamhyr\LICENSE" LicenseData "pamhyr\pamhyr\LICENSE"
LicenseText "I Agree" LicenseText "I Agree"
@ -11,9 +11,9 @@ LicenseText "I Agree"
RequestExecutionLevel admin RequestExecutionLevel admin
Unicode True Unicode True
InstallDir $PROGRAMFILES\PAMHYR InstallDir $PROGRAMFILES\Pamhyr2
InstallDirRegKey HKLM "Software\PAMHYR" "Install_Dir" InstallDirRegKey HKLM "Software\Pamhyr2" "Install_Dir"
Page license Page license
Page components Page components
@ -23,35 +23,35 @@ Page instfiles
UninstPage uninstConfirm UninstPage uninstConfirm
UninstPage instfiles UninstPage instfiles
Section "PAMHYR" Section "Pamhyr2"
SectionIn RO SectionIn RO
SetOutPath $INSTDIR SetOutPath $INSTDIR
File /r "pamhyr\*" File /r "pamhyr\*"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\PAMHYR" "DisplayName" "NSIS PAMHYR" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pamhyr2" "DisplayName" "NSIS Pamhyr2"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\PAMHYR" "UninstallString" "$INSTDIR\uninstall.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pamhyr2" "UninstallString" "$INSTDIR\uninstall.exe"
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\PAMHYR" "NoModify" 1 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pamhyr2" "NoModify" 1
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\PAMHYR" "NoRepair" 1 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pamhyr2" "NoRepair" 1
WriteUninstaller "$INSTDIR\uninstall.exe" WriteUninstaller "$INSTDIR\uninstall.exe"
SectionEnd SectionEnd
Section "Start Menu Shortcuts" Section "Start Menu Shortcuts"
CreateDirectory "$SMPROGRAMS\PAMHYR" CreateDirectory "$SMPROGRAMS\Pamhyr2"
CreateShortcut "$SMPROGRAMS\PAMHYR\Uninstall.lnk" "$INSTDIR\uninstall.exe" CreateShortcut "$SMPROGRAMS\Pamhyr2\Uninstall.lnk" "$INSTDIR\uninstall.exe"
CreateShortcut "$SMPROGRAMS\PAMHYR\PAMHYR.lnk" "$INSTDIR\pamhyr\pamhyr.exe" CreateShortcut "$SMPROGRAMS\Pamhyr2\Pamhyr2.lnk" "$INSTDIR\pamhyr\pamhyr.exe"
SectionEnd SectionEnd
Section "Uninstall" Section "Uninstall"
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\PAMHYR" DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pamhyr2"
DeleteRegKey HKLM SOFTWARE\NSIS_PAMHYR DeleteRegKey HKLM SOFTWARE\NSIS_Pamhyr2
Delete "$SMPROGRAMS\PAMHYR\*.lnk" Delete "$SMPROGRAMS\Pamhyr2\*.lnk"
RMDir "$SMPROGRAMS\PAMHYR" RMDir "$SMPROGRAMS\Pamhyr2"
RMDir /R "$INSTDIR" RMDir /R "$INSTDIR"
SectionEnd SectionEnd

4
src/View/MainWindow.py
View File

@ -134,10 +134,10 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
title = "(dbg) " if self.conf.debug else "" title = "(dbg) " if self.conf.debug else ""
if self.model is not None: if self.model is not None:
title += f"PAMHYR - {self.model.name}" title += f"Pamhyr2 - {self.model.name}"
self.setWindowTitle(title) self.setWindowTitle(title)
else: else:
title += "PAMHYR" title += "Pamhyr2"
self.setWindowTitle(title) self.setWindowTitle(title)
def enable_actions(self, action:str, enable:bool): def enable_actions(self, action:str, enable:bool):

2
src/View/ui/about.ui
View File

@ -39,7 +39,7 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>About PAMHYR</string> <string>About Pamhyr2</string>
</property> </property>
</widget> </widget>
</item> </item>

4
src/config.py
View File

@ -96,7 +96,7 @@ class Config(SQL):
INSERT INTO solver VALUES ( INSERT INTO solver VALUES (
'mage8', 'mage8',
'default-mage', 'default-mage',
'Default PAMHYR mage 8 version', 'Default Pamhyr2 mage 8 version',
'', '', '', '', '', '',
@ -265,7 +265,7 @@ class Config(SQL):
posix = os.name == 'posix' posix = os.name == 'posix'
ctor = solver_type_list["mage8"] ctor = solver_type_list["mage8"]
new = ctor("default-mage") new = ctor("default-mage")
new._description = "Default PAMHYR mage 8 version" new._description = "Default Pamhyr2 mage 8 version"
new._cmd_solver = f""""@install_dir/mage/mage{"" if posix else ".exe"}" -fp=1 @input""" new._cmd_solver = f""""@install_dir/mage/mage{"" if posix else ".exe"}" -fp=1 @input"""
self._solvers.append(new) self._solvers.append(new)

59
src/lang/fr.ts
View File

@ -486,12 +486,12 @@
<message> <message>
<location filename="../View/ui/about.ui" line="42"/> <location filename="../View/ui/about.ui" line="42"/>
<source>About PAMHYR</source> <source>About PAMHYR</source>
<translation>À propos de PAMHYR</translation> <translation type="obsolete">À propos de PAMHYR</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/about.ui" line="56"/> <location filename="../View/ui/about.ui" line="56"/>
<source>Version: @version</source> <source>Version: @version</source>
<translation type="unfinished"></translation> <translation>Version: @version</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/about.ui" line="63"/> <location filename="../View/ui/about.ui" line="63"/>
@ -518,6 +518,11 @@
<source>Sigma</source> <source>Sigma</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="../View/ui/about.ui" line="42"/>
<source>About Pamhyr2</source>
<translation>À propos de Pamhyr2</translation>
</message>
</context> </context>
<context> <context>
<name>Frictions</name> <name>Frictions</name>
@ -1408,7 +1413,7 @@
<message> <message>
<location filename="../View/ui/SolverLog.ui" line="106"/> <location filename="../View/ui/SolverLog.ui" line="106"/>
<source>results</source> <source>results</source>
<translation type="unfinished"></translation> <translation>Résultats</translation>
</message> </message>
<message> <message>
<location filename="../View/ui/EditSedimentLayers.ui" line="63"/> <location filename="../View/ui/EditSedimentLayers.ui" line="63"/>
@ -1626,67 +1631,67 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="224"/> <location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="225"/>
<source>Insérer un point</source> <source>Insérer un point</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="225"/> <location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="226"/>
<source>Supprimer le/les point(s) sélectionnés</source> <source>Supprimer le/les point(s) sélectionnés</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="229"/> <location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="230"/>
<source>Trier les points par ordre décroissant de X</source> <source>Trier les points par ordre décroissant de X</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="234"/> <location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="235"/>
<source>Trier les points par ordre décroissant de Y</source> <source>Trier les points par ordre décroissant de Y</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="236"/> <location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="237"/>
<source>Décaler le point sélectionné vers le haut</source> <source>Décaler le point sélectionné vers le haut</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="238"/> <location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="239"/>
<source>Décaler le point sélectionné vers le bas</source> <source>Décaler le point sélectionné vers le bas</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="240"/> <location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="241"/>
<source>Exporter (dans un fichier) les points du profil au format tabulé</source> <source>Exporter (dans un fichier) les points du profil au format tabulé</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="242"/> <location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="243"/>
<source>Copier la sélection au format tabulé</source> <source>Copier la sélection au format tabulé</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="244"/> <location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="245"/>
<source>Coller la sélection depuis le presse-papier au format tabulé</source> <source>Coller la sélection depuis le presse-papier au format tabulé</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="246"/> <location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="247"/>
<source>Vérifier la validité de la saisie et garder ou pas les modifications apportées</source> <source>Vérifier la validité de la saisie et garder ou pas les modifications apportées</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="249"/> <location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="250"/>
<source>Annuler toutes les modifications depuis la dernière validation</source> <source>Annuler toutes les modifications depuis la dernière validation</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="251"/> <location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="252"/>
<source>Annuler toutes les modifications et revenir à l&apos;état initial</source> <source>Annuler toutes les modifications et revenir à l&apos;état initial</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="253"/> <location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="254"/>
<source>Ligne d&apos;eau : <source>Ligne d&apos;eau :
Z : Cote (m) Z : Cote (m)
A : Aire mouillée (mu00B2) A : Aire mouillée (mu00B2)
@ -1695,7 +1700,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="257"/> <location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="258"/>
<source>&apos;Maj + Clic&apos; : Ligne d&apos;eau &amp; &apos;Ctrl + Clic&apos; : Sélectionner des points</source> <source>&apos;Maj + Clic&apos; : Ligne d&apos;eau &amp; &apos;Ctrl + Clic&apos; : Sélectionner des points</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1844,7 +1849,7 @@ sur le plan défini par les deux points nommés extrêmes </source>
<translation type="unfinished">Hauteur (m)</translation> <translation type="unfinished">Hauteur (m)</translation>
</message> </message>
<message> <message>
<location filename="../View/Plot/navigation_toolbar_2qt.py" line="146"/> <location filename="../View/Plot/PamhyrToolbar.py" line="148"/>
<source>Select destination file</source> <source>Select destination file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1945,8 +1950,8 @@ Seuls les 5 premiers seront édités.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../View/Plot/PamhyrToolbar.py" line="148"/> <location filename="../View/Geometry/mainwindow_ui_reach.py" line="342"/>
<source>Select destination file</source> <source>Vue isométrique (Alt+E)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -1958,37 +1963,37 @@ Seuls les 5 premiers seront édités.</source>
<context> <context>
<name>Network</name> <name>Network</name>
<message> <message>
<location filename="../View/Network/GraphWidget.py" line="809"/> <location filename="../View/Network/GraphWidget.py" line="812"/>
<source>Add node</source> <source>Add node</source>
<translation>Ajouter un nœud</translation> <translation>Ajouter un nœud</translation>
</message> </message>
<message> <message>
<location filename="../View/Network/GraphWidget.py" line="817"/> <location filename="../View/Network/GraphWidget.py" line="820"/>
<source>Delete the node</source> <source>Delete the node</source>
<translation>Supprimer un nœud</translation> <translation>Supprimer un nœud</translation>
</message> </message>
<message> <message>
<location filename="../View/Network/GraphWidget.py" line="818"/> <location filename="../View/Network/GraphWidget.py" line="821"/>
<source>Disable the node</source> <source>Disable the node</source>
<translation>Déactiver un nœud</translation> <translation>Déactiver un nœud</translation>
</message> </message>
<message> <message>
<location filename="../View/Network/GraphWidget.py" line="826"/> <location filename="../View/Network/GraphWidget.py" line="829"/>
<source>Delete the reach</source> <source>Delete the reach</source>
<translation>Supprimer un bief</translation> <translation>Supprimer un bief</translation>
</message> </message>
<message> <message>
<location filename="../View/Network/GraphWidget.py" line="829"/> <location filename="../View/Network/GraphWidget.py" line="832"/>
<source>Disable the reach</source> <source>Disable the reach</source>
<translation>Déactiver un bief</translation> <translation>Déactiver un bief</translation>
</message> </message>
<message> <message>
<location filename="../View/Network/GraphWidget.py" line="832"/> <location filename="../View/Network/GraphWidget.py" line="835"/>
<source>Enable the reach</source> <source>Enable the reach</source>
<translation>Activer un bief</translation> <translation>Activer un bief</translation>
</message> </message>
<message> <message>
<location filename="../View/Network/GraphWidget.py" line="835"/> <location filename="../View/Network/GraphWidget.py" line="838"/>
<source>Reverse the reach orientation</source> <source>Reverse the reach orientation</source>
<translation>Inverser l&apos;orientation du bief</translation> <translation>Inverser l&apos;orientation du bief</translation>
</message> </message>