Commit b5a3ee75 authored by Pierre-Antoine Rouby's avatar Pierre-Antoine Rouby
Browse files

doc: Delete user documentation and use gitlab wiki instead.

Showing with 15 additions and 14 deletions
+15 -14
...@@ -262,8 +262,8 @@ build-linux: ...@@ -262,8 +262,8 @@ build-linux:
- mkdir -p pamhyr/doc/ - mkdir -p pamhyr/doc/
- mkdir -p pamhyr/doc/images/ - mkdir -p pamhyr/doc/images/
- mkdir -p pamhyr/doc/html/ - mkdir -p pamhyr/doc/html/
- cp ../doc/users/documentation.pdf pamhyr/doc/Pamhyr2-users.pdf # - cp ../doc/users/documentation.pdf pamhyr/doc/Pamhyr2-users.pdf
- cp ../doc/users/documentation.html pamhyr/doc/Pamhyr2-users.html # - cp ../doc/users/documentation.html pamhyr/doc/Pamhyr2-users.html
- cp ../doc/dev/documentation.pdf pamhyr/doc/Pamhyr2-dev.pdf - cp ../doc/dev/documentation.pdf pamhyr/doc/Pamhyr2-dev.pdf
- cp ../doc/dev/documentation.html pamhyr/doc/Pamhyr2-dev.html - cp ../doc/dev/documentation.html pamhyr/doc/Pamhyr2-dev.html
#- cp ../doc/users/images/* pamhyr/doc/images #- cp ../doc/users/images/* pamhyr/doc/images
......
...@@ -53,9 +53,9 @@ copy /y ..\tests_cases\Saar\Saar.pamhyr pamhyr\tests_cases\Saar\ ...@@ -53,9 +53,9 @@ copy /y ..\tests_cases\Saar\Saar.pamhyr pamhyr\tests_cases\Saar\
rem Documentations rem Documentations
mkdir pamhyr\doc mkdir pamhyr\doc
mkdir pamhyr\doc\images mkdir pamhyr\doc\images
copy /y ..\doc\users\documentation.pdf pamhyr\doc\Pamhyr2-users.pdf rem copy /y ..\doc\users\documentation.pdf pamhyr\doc\Pamhyr2-users.pdf
copy /y ..\doc\dev\documentation.pdf pamhyr\doc\Pamhyr2-dev.pdf copy /y ..\doc\dev\documentation.pdf pamhyr\doc\Pamhyr2-dev.pdf
copy /y ..\doc\users\documentation.html pamhyr\doc\Pamhyr2-users.html rem copy /y ..\doc\users\documentation.html pamhyr\doc\Pamhyr2-users.html
copy /y ..\doc\dev\documentation.html pamhyr\doc\Pamhyr2-dev.html copy /y ..\doc\dev\documentation.html pamhyr\doc\Pamhyr2-dev.html
copy /y ..\doc\users\images\* pamhyr\doc\images copy /y ..\doc\users\images\* pamhyr\doc\images
copy /y ..\doc\dev\images\* pamhyr\doc\images copy /y ..\doc\dev\images\* pamhyr\doc\images
......
...@@ -209,12 +209,9 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): ...@@ -209,12 +209,9 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
"action_menu_results_last": self.open_last_results, "action_menu_results_last": self.open_last_results,
"action_open_results_from_file": self.open_results_from_file, "action_open_results_from_file": self.open_results_from_file,
# Help # Help
"action_menu_pamhyr_users_pdf": "action_menu_pamhyr_users_wiki": self.open_doc_user,
lambda: self.open_doc_user(ext="pdf"),
"action_menu_pamhyr_developers_pdf": "action_menu_pamhyr_developers_pdf":
lambda: self.open_doc_dev(ext="pdf"), lambda: self.open_doc_dev(ext="pdf"),
"action_menu_pamhyr_users_html":
lambda: self.open_doc_user(ext="html"),
"action_menu_pamhyr_developers_html": "action_menu_pamhyr_developers_html":
lambda: self.open_doc_dev(ext="html"), lambda: self.open_doc_dev(ext="html"),
"action_menu_mage": self.open_doc_mage, "action_menu_mage": self.open_doc_mage,
...@@ -937,6 +934,11 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): ...@@ -937,6 +934,11 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
) )
def open_doc(self, filename): def open_doc(self, filename):
if "https://" in filename:
url = QUrl(filename)
QDesktopServices.openUrl(url)
return
if _doc == "external": if _doc == "external":
url = QUrl(f"file://{self._doc_path_file(filename)}") url = QUrl(f"file://{self._doc_path_file(filename)}")
QDesktopServices.openUrl(url) QDesktopServices.openUrl(url)
...@@ -951,8 +953,8 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): ...@@ -951,8 +953,8 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
) )
doc.show() doc.show()
def open_doc_user(self, ext="pdf"): def open_doc_user(self):
self.open_doc(f"Pamhyr2-users.{ext}") self.open_doc(f"https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home")
def open_doc_dev(self, ext="pdf"): def open_doc_dev(self, ext="pdf"):
self.open_doc(f"Pamhyr2-dev.{ext}") self.open_doc(f"Pamhyr2-dev.{ext}")
......
...@@ -162,8 +162,7 @@ ...@@ -162,8 +162,7 @@
<property name="title"> <property name="title">
<string>Pamhyr2 </string> <string>Pamhyr2 </string>
</property> </property>
<addaction name="action_menu_pamhyr_users_pdf"/> <addaction name="action_menu_pamhyr_users_wiki"/>
<addaction name="action_menu_pamhyr_users_html"/>
<addaction name="action_menu_pamhyr_developers_pdf"/> <addaction name="action_menu_pamhyr_developers_pdf"/>
<addaction name="action_menu_pamhyr_developers_html"/> <addaction name="action_menu_pamhyr_developers_html"/>
</widget> </widget>
...@@ -908,9 +907,9 @@ ...@@ -908,9 +907,9 @@
<string>Open mage documentation</string> <string>Open mage documentation</string>
</property> </property>
</action> </action>
<action name="action_menu_pamhyr_users_pdf"> <action name="action_menu_pamhyr_users_wiki">
<property name="text"> <property name="text">
<string>Users (pdf)</string> <string>Users (wiki)</string>
</property> </property>
</action> </action>
<action name="action_menu_pamhyr_users_html"> <action name="action_menu_pamhyr_users_html">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment