geneweb-debian/patches/0011-gui-Debian-specific-changes.patch

From: Guillaume Brochu <guillaume.brochu@gmail.com>
Date: Sat, 3 Nov 2018 07:42:06 -0400
Subject: gui-Debian-specific-changes

To adapt gui for Debian
---
 gui/gui.ml         | 38 +++++++++++++++++++++++++++-----------
 gui/gw/gui_lex.txt | 16 ++++++++++++++++
 2 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/gui/gui.ml b/gui/gui.ml
index f68b90d..09ae132 100644
--- a/gui/gui.ml
+++ b/gui/gui.ml
@@ -14,14 +14,17 @@ type conf =
     waiting_pids : mutable list int }
 ;
 
-value bin_dir =
-  let path = Filename.dirname (Sys.argv.(0)) in
-  if Filename.is_relative path then
-    Filename.concat (Sys.getcwd ()) path
-  else path
+value bin_dir = "/usr/bin";
+
+value share_dir = "/usr/share/geneweb";
+
+value home_dir =
+  try Sys.getenv "HOME" with
+  [ Not_found ->
+    Sys.getcwd ()]
 ;
 
-value share_dir = bin_dir;
+value assistant_default_bases_dir = home_dir;
 
 value trace = ref False;
 
@@ -34,9 +37,10 @@ value default_lang =
 
 value lang = ref default_lang;
 value lexicon_mtime = ref 0.0;
-value lexicon_file = Filename.concat bin_dir "gui_lex.txt";
 
-value config_gui_file = Filename.concat bin_dir "config.txt";
+value lexicon_file = Filename.concat share_dir "lang/gui_lex.txt";
+
+value config_gui_file = Filename.concat home_dir ".geneweb-gui-config.txt";
 
 (**/**) (* Gestion du dictionnaire des langues pour GUI. *)
 
@@ -255,7 +259,7 @@ value config_browser () =
     [ "Win32" | "Cygwin" ->
         ["C:\\Program Files\\Mozilla Firefox\\firefox.exe";
          "C:\\Program Files\\Internet Explorer\\iexplore.exe"]
-    | _ -> ["/usr/bin/firefox"; "/usr/bin/mozilla"] ]
+    | _ -> ["/usr/bin/x-www-browser"] ]
   in
   match List.filter Sys.file_exists default_browsers with
   [ [] -> None
@@ -1290,7 +1294,13 @@ value launch_config () =
     let page_0 = GMisc.label
       ~text:(transl "This assistant will help you to setup GeneWeb") ()
     in
-    let bases_dir = ref "" in
+    let page_0b = GMisc.label
+      ~text:(transl "Unlike geneweb and gwsetup, geneweb-gui is designed to work with bases stored in your home folder." ^ "\n\n" ^
+             transl "It is not recommended to use the bases stored in /var/lib/geneweb with geneweb-gui." ^ "\n\n" ^
+             transl "It is also not recommended to use ports 2316 or 2317 that are already used by the geneweb and gwsetup daemons." )
+      ~line_wrap:True ()
+    in
+    let bases_dir = ref assistant_default_bases_dir in
     let page_1 = GPack.hbox ~spacing:5 () in
     let _label = GMisc.label
       ~text:(transl "select bases directory")
@@ -1312,7 +1322,7 @@ value launch_config () =
            let num = assistant#current_page in
            let page = assistant#nth_page num in
            assistant#set_page_complete page (bases_dir.val <> "") }));
-    let port = ref 2317 in
+    let port = ref 2315 in (*to avoid conflicts with port 2317*)
     let page_2 = GPack.hbox ~homogeneous:False ~spacing:5 () in
     let _label = GMisc.label
       ~text:(transl "enter port")
@@ -1376,6 +1386,12 @@ value launch_config () =
          ~page_type:`INTRO
          ~complete:True
          page_0#as_widget);
+    ignore
+      (assistant#append_page
+         ~title:(transl "About geneweb-gui")
+         ~page_type:`CONTENT
+         ~complete:True
+         page_0b#as_widget);
     ignore
       (assistant#append_page
          ~title:(transl "Setup bases directory")
diff --git a/gui/gw/gui_lex.txt b/gui/gw/gui_lex.txt
index 2019eb2..9174e60 100644
--- a/gui/gw/gui_lex.txt
+++ b/gui/gw/gui_lex.txt
@@ -201,6 +201,22 @@ fr: Consang
 en: Update_nldb
 fr: Update_nldb
 
+    About geneweb-gui
+en: About geneweb-gui
+fr: À propos de geneweb-gui
+
+    Unlike geneweb and gwsetup, geneweb-gui is designed to work with bases stored in your home folder.
+en: Unlike geneweb and gwsetup, geneweb-gui is designed to work with bases stored in your home folder.
+fr: Contrairement à geneweb et gwsetup, geneweb-gui est conçu pour fonctionner avec des bases rangées dans votre dossier personnel.
+
+    It is not recommended to use the bases stored in /var/lib/geneweb with geneweb-gui.
+en: It is not recommended to use the bases stored in /var/lib/geneweb with geneweb-gui.
+fr: Il est déconseillé d'utiliser les bases contenues dans /var/lib/geneweb avec geneweb-gui.
+
+    It is also not recommended to use ports 2316 or 2317 that are already used by the geneweb and gwsetup daemons.
+en: It is also not recommended to use ports 2316 or 2317 that are already used by the geneweb and gwsetup daemons.
+fr: Il est également déconseillé d'utiliser les ports 2316 ou 2317 qui sont déjà utilisés par les services geneweb et gwsetup.
+
     Your configuration file is:
 en: Your configuration file is:
 fr: Votre fichier de configuration est: