diff --git a/packages/pamhyr.nsi b/packages/pamhyr.nsi index d2cf65bfff0ac4f0ec57fc41f19b0f9ac98c9f75..aa18830e09ff28ff117a09831d152979f6af8e45 100644 --- a/packages/pamhyr.nsi +++ b/packages/pamhyr.nsi @@ -3,7 +3,7 @@ !define LIC_NAME "LICENSE" !define APP_NAME "PAMHYR" -Name "PAMHYR" +Name "Pamhyr2" OutFile "pamhyr-windows.exe" LicenseData "pamhyr\pamhyr\LICENSE" LicenseText "I Agree" @@ -11,9 +11,9 @@ LicenseText "I Agree" RequestExecutionLevel admin Unicode True -InstallDir $PROGRAMFILES\PAMHYR +InstallDir $PROGRAMFILES\Pamhyr2 -InstallDirRegKey HKLM "Software\PAMHYR" "Install_Dir" +InstallDirRegKey HKLM "Software\Pamhyr2" "Install_Dir" Page license Page components @@ -23,35 +23,35 @@ Page instfiles UninstPage uninstConfirm UninstPage instfiles -Section "PAMHYR" +Section "Pamhyr2" SectionIn RO SetOutPath $INSTDIR File /r "pamhyr\*" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\PAMHYR" "DisplayName" "NSIS PAMHYR" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\PAMHYR" "UninstallString" "$INSTDIR\uninstall.exe" - WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\PAMHYR" "NoModify" 1 - WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\PAMHYR" "NoRepair" 1 + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pamhyr2" "DisplayName" "NSIS Pamhyr2" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pamhyr2" "UninstallString" "$INSTDIR\uninstall.exe" + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pamhyr2" "NoModify" 1 + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pamhyr2" "NoRepair" 1 WriteUninstaller "$INSTDIR\uninstall.exe" SectionEnd Section "Start Menu Shortcuts" - CreateDirectory "$SMPROGRAMS\PAMHYR" - CreateShortcut "$SMPROGRAMS\PAMHYR\Uninstall.lnk" "$INSTDIR\uninstall.exe" - CreateShortcut "$SMPROGRAMS\PAMHYR\PAMHYR.lnk" "$INSTDIR\pamhyr\pamhyr.exe" + CreateDirectory "$SMPROGRAMS\Pamhyr2" + CreateShortcut "$SMPROGRAMS\Pamhyr2\Uninstall.lnk" "$INSTDIR\uninstall.exe" + CreateShortcut "$SMPROGRAMS\Pamhyr2\Pamhyr2.lnk" "$INSTDIR\pamhyr\pamhyr.exe" SectionEnd Section "Uninstall" - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\PAMHYR" - DeleteRegKey HKLM SOFTWARE\NSIS_PAMHYR + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Pamhyr2" + DeleteRegKey HKLM SOFTWARE\NSIS_Pamhyr2 - Delete "$SMPROGRAMS\PAMHYR\*.lnk" + Delete "$SMPROGRAMS\Pamhyr2\*.lnk" - RMDir "$SMPROGRAMS\PAMHYR" + RMDir "$SMPROGRAMS\Pamhyr2" RMDir /R "$INSTDIR" SectionEnd \ No newline at end of file diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py index c41fde979f36195354d2ae2c519f4a4c2b9de925..47e148508b1d80c3877b5bebfd9bb8995da15e91 100644 --- a/src/View/MainWindow.py +++ b/src/View/MainWindow.py @@ -134,10 +134,10 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): title = "(dbg) " if self.conf.debug else "" if self.model is not None: - title += f"PAMHYR - {self.model.name}" + title += f"Pamhyr2 - {self.model.name}" self.setWindowTitle(title) else: - title += "PAMHYR" + title += "Pamhyr2" self.setWindowTitle(title) def enable_actions(self, action:str, enable:bool): diff --git a/src/View/ui/about.ui b/src/View/ui/about.ui index 579e0095f9e36116e06a7cd98bedaf6817318c86..273d9de05a112d3b0df41ccf7276b471f385aa5b 100644 --- a/src/View/ui/about.ui +++ b/src/View/ui/about.ui @@ -39,7 +39,7 @@ </font> </property> <property name="text"> - <string>About PAMHYR</string> + <string>About Pamhyr2</string> </property> </widget> </item> diff --git a/src/config.py b/src/config.py index d1ebb71ec8cdfb4df4bc9ae8ded5ca045c71a8f9..c7db1cdc3b5c3f46e33f295997b40618642f2329 100644 --- a/src/config.py +++ b/src/config.py @@ -96,7 +96,7 @@ class Config(SQL): INSERT INTO solver VALUES ( 'mage8', 'default-mage', - 'Default PAMHYR mage 8 version', + 'Default Pamhyr2 mage 8 version', '', '', '', @@ -265,7 +265,7 @@ class Config(SQL): posix = os.name == 'posix' ctor = solver_type_list["mage8"] 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""" self._solvers.append(new) diff --git a/src/lang/fr.ts b/src/lang/fr.ts index a8dad28ed88b51856363576e23923ab286a2ac74..de1e50a32252eed2a4e9770984db5d0be791ecd4 100644 --- a/src/lang/fr.ts +++ b/src/lang/fr.ts @@ -486,12 +486,12 @@ <message> <location filename="../View/ui/about.ui" line="42"/> <source>About PAMHYR</source> - <translation>À propos de PAMHYR</translation> + <translation type="obsolete">À propos de PAMHYR</translation> </message> <message> <location filename="../View/ui/about.ui" line="56"/> <source>Version: @version</source> - <translation type="unfinished"></translation> + <translation>Version: @version</translation> </message> <message> <location filename="../View/ui/about.ui" line="63"/> @@ -518,6 +518,11 @@ <source>Sigma</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../View/ui/about.ui" line="42"/> + <source>About Pamhyr2</source> + <translation>À propos de Pamhyr2</translation> + </message> </context> <context> <name>Frictions</name> @@ -1408,7 +1413,7 @@ <message> <location filename="../View/ui/SolverLog.ui" line="106"/> <source>results</source> - <translation type="unfinished"></translation> + <translation>Résultats</translation> </message> <message> <location filename="../View/ui/EditSedimentLayers.ui" line="63"/> @@ -1626,82 +1631,82 @@ <translation type="unfinished"></translation> </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> <translation type="unfinished"></translation> </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> <translation type="unfinished"></translation> </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> <translation type="unfinished"></translation> </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> <translation type="unfinished"></translation> </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> <translation type="unfinished"></translation> </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> <translation type="unfinished"></translation> </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> <translation type="unfinished"></translation> </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> <translation type="unfinished"></translation> </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> <translation type="unfinished"></translation> </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> <translation type="unfinished"></translation> </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> <translation type="unfinished"></translation> </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'état initial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="253"/> - <source>Ligne d'eau : - Z : Cote (m) - A : Aire mouillée (mu00B2) - p : Périmètre mouillé (m) + <location filename="../View/Geometry/Profile/mainwindow_ui_profile.py" line="254"/> + <source>Ligne d'eau : + Z : Cote (m) + A : Aire mouillée (mu00B2) + p : Périmètre mouillé (m) L : Largeur au miroir (m)</source> <translation type="unfinished"></translation> </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>'Maj + Clic' : Ligne d'eau & 'Ctrl + Clic' : Sélectionner des points</source> <translation type="unfinished"></translation> </message> <message> <location filename="../View/Geometry/Profile/Table.py" line="142"/> - <source>Abscisse en travers calculée en projétant les points + <source>Abscisse en travers calculée en projétant les points sur le plan défini par les deux points nommés extrêmes </source> <translation type="unfinished"></translation> </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> </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> <translation type="unfinished"></translation> </message> @@ -1905,7 +1910,7 @@ sur le plan défini par les deux points nommés extrêmes </source> </message> <message> <location filename="../View/Geometry/Window.py" line="166"/> - <source>Vous avez sélectionné plus de 5 profils. + <source>Vous avez sélectionné plus de 5 profils. Seuls les 5 premiers seront édités.</source> <translation type="unfinished"></translation> </message> @@ -1945,8 +1950,8 @@ Seuls les 5 premiers seront édités.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../View/Plot/PamhyrToolbar.py" line="148"/> - <source>Select destination file</source> + <location filename="../View/Geometry/mainwindow_ui_reach.py" line="342"/> + <source>Vue isométrique (Alt+E)</source> <translation type="unfinished"></translation> </message> <message> @@ -1958,37 +1963,37 @@ Seuls les 5 premiers seront édités.</source> <context> <name>Network</name> <message> - <location filename="../View/Network/GraphWidget.py" line="809"/> + <location filename="../View/Network/GraphWidget.py" line="812"/> <source>Add node</source> <translation>Ajouter un nœud</translation> </message> <message> - <location filename="../View/Network/GraphWidget.py" line="817"/> + <location filename="../View/Network/GraphWidget.py" line="820"/> <source>Delete the node</source> <translation>Supprimer un nœud</translation> </message> <message> - <location filename="../View/Network/GraphWidget.py" line="818"/> + <location filename="../View/Network/GraphWidget.py" line="821"/> <source>Disable the node</source> <translation>Déactiver un nœud</translation> </message> <message> - <location filename="../View/Network/GraphWidget.py" line="826"/> + <location filename="../View/Network/GraphWidget.py" line="829"/> <source>Delete the reach</source> <translation>Supprimer un bief</translation> </message> <message> - <location filename="../View/Network/GraphWidget.py" line="829"/> + <location filename="../View/Network/GraphWidget.py" line="832"/> <source>Disable the reach</source> <translation>Déactiver un bief</translation> </message> <message> - <location filename="../View/Network/GraphWidget.py" line="832"/> + <location filename="../View/Network/GraphWidget.py" line="835"/> <source>Enable the reach</source> <translation>Activer un bief</translation> </message> <message> - <location filename="../View/Network/GraphWidget.py" line="835"/> + <location filename="../View/Network/GraphWidget.py" line="838"/> <source>Reverse the reach orientation</source> <translation>Inverser l'orientation du bief</translation> </message>