X-Git-Url: http://nitlanguage.org

diff --git a/lib/linux/ui.nit b/lib/linux/ui.nit
index 87ad531..8a6cc81 100644
--- a/lib/linux/ui.nit
+++ b/lib/linux/ui.nit
@@ -43,7 +43,7 @@ redef class App
 		bar.title = "app.nit" # TODO offer a portable API to name windows
 		bar.show_close_button = true
 
-		# TODO add back button
+		bar.add back_button.native
 
 		return bar
 	end
@@ -55,22 +55,22 @@ redef class App
 		return stack
 	end
 
+	# Button on the header bar to go back
+	var back_button = new BackButton is lazy
+
 	# On GNU/Linux, we go through all the callbacks once,
 	# there is no complex life-cycle.
 	redef fun run
 	do
 		app.on_create
 		app.on_restore_state
-		app.on_start
 		app.on_resume
 
-		native_window.show_all
 		gtk_main
 
 		app.on_pause
 		app.on_stop
 		app.on_save_state
-		app.on_destroy
 	end
 
 	# Spacing between GTK controls, default at 2
@@ -88,7 +88,13 @@ redef class App
 		# improved with GTK 3.18 and interpolate_size.
 		native_window.resizable = false
 
+		native_window.show_all
+
 		super
+
+		if window.enable_back_button then
+			back_button.native.show
+		else back_button.native.hide
 	end
 end
 
@@ -159,6 +165,7 @@ redef class HorizontalLayout
 	redef fun add(item)
 	do
 		super
+		# FIXME abstract the use either homogeneous or weight to balance views size in a layout
 		native.homogeneous = true
 		native.set_child_packing(item.native, true, true, 0, new GtkPackType.start)
 	end
@@ -171,8 +178,6 @@ redef class VerticalLayout
 	do
 		super
 
-		# FIXME abstract the use either homogeneous or weight to balance views size in a layout
-		native.homogeneous = true
 		native.set_child_packing(item.native, true, true, 0, new GtkPackType.start)
 	end
 end
@@ -187,6 +192,9 @@ redef class ListLayout
 	# Container inside `native`
 	var native_list_box = new GtkListBox
 
+	# `GtkListBoxRow` used to contains children `View`s
+	var native_rows = new Map[View, GtkListBoxRow]
+
 	init do
 		native_list_box.selection_mode = new GtkSelectionMode.none
 		native.add native_list_box
@@ -200,13 +208,32 @@ redef class ListLayout
 	redef fun add(item)
 	do
 		super
-		if item isa View then native_list_box.add item.native
+		if item isa View then
+			var native_row = new GtkListBoxRow
+			#native_row.activable = false # TODO with GTK 3.14
+			#native_row.selectable = false
+			native_row.add item.native
+
+			native_rows[item] = native_row
+			native_list_box.add native_row
+			native_row.show
+		end
 	end
 
 	redef fun remove(item)
 	do
 		super
-		if item isa View then native_list_box.remove item.native
+		if item isa View then
+			var native_row = native_rows.get_or_null(item)
+			if native_row == null then
+				print_error "Error: {self} does not contains {item}"
+				return
+			end
+
+			native_list_box.remove native_row
+			native_rows.keys.remove item
+			native_row.destroy
+		end
 	end
 end
 
@@ -222,12 +249,80 @@ redef class Button
 	init do native.signal_connect("clicked", self, null)
 end
 
+# Button to go back between windows
+class BackButton
+	super Button
+
+	# TODO i18n
+	redef fun text=(value) do super(value or else "Back")
+
+	redef fun signal(sender, data)
+	do
+		super
+
+		app.window.on_back_button
+	end
+end
+
 redef class Label
 	redef type NATIVE: GtkLabel
 	redef var native = new GtkLabel("")
 
 	redef fun text do return native.text
+
+	redef fun text=(value)
+	do
+		var cfmt = pango_markup_format.to_cstring
+		var cvalue = (value or else "").to_cstring
+		native.set_markup(cfmt, cvalue)
+	end
+
+	# Pango format string applied to the `text` attribute
+	var pango_markup_format = "\%s" is lazy
+
+	redef fun size=(size)
+	do
+		if size == null or size == 1.0 then
+			pango_markup_format = "\%s"
+		else if size < 1.0 then
+			pango_markup_format = "<span size=\"small\">\%s</span>"
+		else#if size > 1.0 then
+			pango_markup_format = "<span size=\"large\">\%s</span>"
+		end
+
+		# Force reloading `text`
+		text = text
+	end
+
+	redef fun align=(align)
+	do
+		align = align or else 0.0
+
+		# Set whole label alignement
+		native.set_alignment(align, 0.5)
+
+		# Set multiline justification
+		native.justify = if align == 0.5 then
+			new GtkJustification.center
+		else if align < 0.5 then
+			new GtkJustification.left
+		else#if align > 0.5 then
+			new GtkJustification.right
+	end
+end
+
+redef class CheckBox
+	redef type NATIVE: GtkCheckButton
+	redef var native = new GtkCheckButton
+
+	redef fun signal(sender, data) do notify_observers new ToggleEvent(self)
+	init do native.signal_connect("toggled", self, null)
+
+	redef fun text do return native.text
 	redef fun text=(value) do native.text = (value or else "").to_s
+
+	redef fun is_checked do return native.active
+	redef fun is_checked=(value) do native.active = value
 end
 
 redef class TextInput
@@ -246,3 +341,7 @@ redef class TextInput
 		super
 	end
 end
+
+redef class Text
+	redef fun open_in_browser do system("xdg-open '{self.escape_to_sh}' &")
+end