Fix various issues such as #68 and #70

deb_package.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DISTRO="unstable" # TODO lister les valeurs possibles
+DISTRO="unstable" # TODO lister les valeurs possibles (debian ? ubuntu ? elementary ?)
 PACKAGE_NAME="drawing" # TODO et pour elementary ?
 VERSION="0.4"
 

debian/control

@@ -8,7 +8,7 @@ Homepage: https://maoschanz.github.io/drawing/
 
 Package: drawing
 Architecture: any
-Depends: python3-gi, python3-gi-cairo, gir1.2-gtk-3.0
+Depends: python3-gi (>=3.30.0), python3-gi-cairo (>=3.30.0), gir1.2-gtk-3.0 (>=3.24.0)
 Description: A drawing application for the GNOME desktop.
  A simple application to draw or edit pictures.
  It includes tools like: Pencil, Selection, Shape, Text, …

help/C/selection_tools.page

@@ -15,7 +15,7 @@
 
   <title>Selection</title>
 
-  <p>The <gui style="button">Select</gui> tool, which is available from the side
+  <p>The <gui style="button">Selection</gui> tool, which is available from the side
   bar (along with <link xref="drawing_tools">the other tools</link>), allows you
   to define a part of the image.</p>
 

po/ru.po

@@ -552,11 +552,10 @@ msgstr "Размер инструмента"
 msgid "No options"
 msgstr ""
 
-#. <property name="relief">none</property>
 #: src/ui/window.ui:220 src/ui/window.ui:238 src/tools/ui/tool_select.ui:259
 #: src/tools/ui/tool_select.ui:277
 msgid "Preview"
-msgstr "Предварительный просмотр"
+msgstr "Предпросмотр"
 
 #: src/ui/win-menus.ui:21
 #, fuzzy

src/tools/selection_tools/tool_select.py

@@ -44,7 +44,7 @@ def __init__(self, window, **kwargs):
 		self.window.bottom_panel_box.add(self.bottom_panel)
 		self.implements_panel = True
 		# self.needed_width_for_long = XXX TODO currently harcoded
-		self.needed_width_for_long = 400
+		self.needed_width_for_long = 450
 
 	############################################################################
 	# UI implementations #######################################################

src/ui/window.ui

@@ -46,13 +46,20 @@
             <property name="visible">True</property>
             <property name="orientation">horizontal</property>
             <child>
-              <object class="GtkScrolledWindow" id="tools_scrollable_box">
+              <object class="GtkScrolledWindow">
                 <property name="visible">True</property>
-                <property name="vscrollbar-policy">automatic</property>
+                <property name="vscrollbar-policy">external</property>
                 <property name="hscrollbar-policy">never</property>
-                <!-- <child> -->
-                <!--   the flowbox will move here if needed -->
-                <!-- </child> -->
+                <child>
+                  <object class="GtkBox" id="tools_scrollable_box">
+                    <property name="visible">True</property>
+                    <property name="expand">False</property>
+                    <property name="halign">center</property>
+                    <!-- <child> -->
+                    <!--   the flowbox will move here if needed -->
+                    <!-- </child> -->
+                  </object>
+                </child>
               </object>
             </child>
             <child>

src/window.py

@@ -634,17 +634,14 @@ def set_tools_labels_visibility(self, visible):
 			self.tools[tool_id].label_widget.set_visible(visible)
 		nb_tools = len(self.tools)
 		if visible:
-			if self.tools_panel.get_parent() is self.tools_nonscrollable_box:
-				self.tools_nonscrollable_box.remove(self.tools_panel)
-				self.tools_scrollable_box.add(self.tools_panel)
 			self.tools_panel.set_min_children_per_line(nb_tools)
+			self.tools_nonscrollable_box.remove(self.tools_panel)
+			self.tools_scrollable_box.add(self.tools_panel)
 		else:
-			if self.tools_panel.get_parent() is self.tools_scrollable_box:
-				self.tools_scrollable_box.remove(self.tools_panel)
-				self.tools_nonscrollable_box.add(self.tools_panel)
-				# FIXME largeur des boutons pétée
-			nb_tools = len(self.tools)
-			self.tools_panel.set_min_children_per_line( (nb_tools+(nb_tools % 3))/3 )
+			self.tools_scrollable_box.remove(self.tools_panel)
+			self.tools_nonscrollable_box.add(self.tools_panel)
+			nb_min = int( (nb_tools+(nb_tools % 3))/3 ) - 1
+			self.tools_panel.set_min_children_per_line(nb_min)
 		self.tools_panel.set_max_children_per_line(nb_tools)
 
 	def on_show_labels_setting_changed(self, *args):