1 files changed, 16 insertions, 13 deletions

diff --git a/src/view/Zenity.php b/src/view/Zenity.php
index 1299d1c..72d5eed 100644
--- a/src/view/Zenity.php
+++ b/src/view/Zenity.php
@@ -1,7 +1,8 @@
 <?php
 // php/Zenity.php
 //
-// commande système zenity
+// générer les commandes qui ouvrent les fenêtres zenity, un objet = une commande
+// s'utilisent comme ceci: exec($Objet->get());
 
 abstract class ZenityCmd
 {
@@ -33,17 +34,17 @@ class ZenityList extends ZenityCmd
 {
         private $columns = 1; // tableau simple ou multidimensionnel?
         
-        public function __construct(string $text, array $rows = [], int $columns = 1)
+        public function __construct(string $text, array $rows = [])
         {
                 $this->command_type = ' --list';
                 parent::__construct($text, $rows);
-                $this->columns = $columns;
-                $this->height = 80 + count($this->rows) * 25;
-                $this->command .= ' --height=' . $this->height;
+                $this->columns = 1;
                 $this->command .= ' --hide-header'; // ligne inutile, il y a déjà le --text
                 if($this->rows !== [])
                 {
                         $this->command .= ' --width=' . $this->width;
+                        $this->height = 80 + count($this->rows) * 25;
+                        $this->command .= ' --height=' . $this->height;
                         $this->fillZenityList();
                 }
         }
@@ -54,8 +55,10 @@ class ZenityList extends ZenityCmd
         {
                 $this->rows = $rows;
                 $this->columns = count(StructTablesDB::$structureOfTables[$table]);
-                $this->width = 600;
+                $this->width = 800;
                 $this->command .= ' --width=' . $this->width;
+                $this->height = 80 + count($this->rows) * 25;
+                $this->command .= ' --height=' . $this->height;
                 $this->fillZenityList();
         }
         
@@ -100,7 +103,7 @@ class ZenityList extends ZenityCmd
 
 class ZenityQuestion extends ZenityCmd
 {
-        public function __construct($text)
+        public function __construct(string $text)
         {
                 $this->command_type = ' --question';
                 parent::__construct($text);
@@ -114,7 +117,7 @@ class ZenityQuestion extends ZenityCmd
 // si on clique sur 'Annuler', renvoie une chaine vide
 class ZenityForms extends ZenityCmd
 {
-    public function __construct($text, array $rows)
+    public function __construct(string $text, array $rows)
         {
                 $this->command_type = ' --forms';
                 parent::__construct($text, $rows);
@@ -122,12 +125,12 @@ class ZenityForms extends ZenityCmd
         self::entriesZenityForms($this->rows);
         }
     
-    private function entriesZenityForms($entries)
+    private function entriesZenityForms(array $input)
     {
         $output = '';
-                foreach($entries as $one_entry)
+                foreach($input as $one_question)
                 {
-                        $output .= ' --add-entry="' . $one_entry . '"'; // forme: ' "choix 1" "choix 2"'
+                        $output .= ' --add-entry="' . $one_question . '"'; // forme: ' "choix 1" "choix 2"'
                 }
                 $this->command .= $output;
     }
@@ -135,7 +138,7 @@ class ZenityForms extends ZenityCmd
 
 class ZenityCalendar extends ZenityCmd
 {
-        public function __construct($text)
+        public function __construct(string $text)
         {
                 $this->command_type = ' --calendar';
                 parent::__construct($text);
@@ -144,7 +147,7 @@ class ZenityCalendar extends ZenityCmd
 
 class ZenityEntry extends ZenityCmd
 {
-        public function __construct($text)
+        public function __construct(string $text)
         {
                 $this->command_type = ' --entry';
                 parent::__construct($text);