Fix case where last text field edited might not be saved, bump version

Author: SMerrony

README.md

@@ -100,6 +100,7 @@ The executable will be found in the `bin` subdirectory.
 
 ## Changes
 
+* 0.2.1 Fix case where last text field edited might not be saved
 * 0.2.0 Add button to delete sound file from a track - Issue #2
 * 0.1.1 Fix adding new tracks with no associated sound file - Issue #1
 * 0.1.0 Initial release - runs OK on GNU/Linux and Windows

alire.toml

@@ -10,7 +10,7 @@ The MD can plan in advance the order of performance; later, `eMDee` will facilit
 Additional controls may be added to specific tracks such as changing the volume level.
 """
 
-version = "0.2.0" # TODO Update for each release
+version = "0.2.1" # TODO Update for each release
 
 authors = ["Stephen Merrony"]
 maintainers = ["Stephen Merrony <merrony@gmail.com>"]
@@ -28,6 +28,7 @@ windows = true
 '...'   = false
 
 [[depends-on]]
+gnat = "^13.0"
 gtkada = "^24.0.0"
 
 [[depends-on]]

examples/test_session_2.toml

@@ -1,37 +1,37 @@
 [session]
-comment = ""
-description = "Test Session"
+comment = "Notes"
+description = "Test Session updated"
 fontsize = "M"
 leadin = 0
 midiport = ""
 [[track]]
-comment = ""
+comment = "1"
 path = "/home/steve/Ada/emdee/all_notes_off.mid"
 skip = false
 title = "All notes off"
 volume = 100
 [[track]]
-comment = "Mix up choir first!"
+comment = "2"
 path = "/home/steve/Desktop/Brugeria_MP3/Accompaniments/AvoirUnBonCopain.mid"
 skip = false
 title = "Avoir un bon copain"
 volume = 100
 [[track]]
-comment = "Bring men forward"
-path = "/home/steve/Desktop/Brugeria_MP3/Accompaniments/Fauré-CantiqueDeJeanRacine-Master_Piano.mp3"
+comment = "3"
+path = "/home/steve/Desktop/Brugeria_MP3/Accompaniments/Fauré-CantiqueDeJeanRacine-Master_Piano.mp3"
 skip = false
 title = "Cantique de Jean Racine"
 volume = 95
 [[track]]
-comment = ""
+comment = "4"
 path = "/home/steve/Ada/emdee/all_notes_off.mid"
 skip = false
-title = "sdf"
+title = "sdf2"
 volume = 100
 [[track]]
-comment = "ggg"
+comment = "56"
 path = "/home/steve/Ada/emdee/all_notes_off.mid"
 skip = false
-title = "sdfg"
+title = "sdfg3"
 volume = 100
 

src/gui-tracks.adb

@@ -6,12 +6,11 @@ with Ada.Directories;
 with Ada.Strings.Unbounded;   use Ada.Strings.Unbounded;
 with Ada.Text_IO;
 
-with Gdk.Event;
-
 with Glib;                    use Glib;
 
 with Gtk.Adjustment;
 with Gtk.Check_Button;
+with Gtk.Editable;            use Gtk.Editable;
 with Gtk.Enums;               use Gtk.Enums;
 with Gtk.Spin_Button;
 with Gtk.Toggle_Button;
@@ -44,32 +43,28 @@ package body GUI.Tracks is
       Set_Dirty;
    end New_Track_File_Del_Btn_CB;
 
-   function Comment_Changed_CB (Self : access Gtk_Widget_Record'Class; 
-                              Event : Gdk.Event.Gdk_Event_Focus) return Boolean is
-      pragma Unreferenced (Event);
-      Name      : constant String  := Self.Get_Name;
+   procedure Comment_Changed_CB (Self : Gtk_Editable) is
+      Ent       : constant Gtk_Entry := -Self;
+      Name      : constant String  := Ent.Get_Name;
       Track_Num : constant Integer := Integer'Value (Name (9 .. Name'Last));
    begin
       if Sess.Tracks (Track_Num).Comment /= Gtk_Entry (Tracks_Grid.Get_Child_At (Comment_Col, Gint (Track_Num))).Get_Text then
          Sess.Tracks (Track_Num).Comment := To_Unbounded_String (Gtk_Entry (Tracks_Grid.Get_Child_At (Comment_Col, Gint (Track_Num))).Get_Text);
          Set_Dirty;
       end if;
-      return False;
    end Comment_Changed_CB;
 
-   function Title_Changed_CB (Self : access Gtk_Widget_Record'Class; 
-                              Event : Gdk.Event.Gdk_Event_Focus) return Boolean is
-      pragma Unreferenced (Event);
-      Name      : constant String  := Self.Get_Name;
+   procedure Title_Changed_CB (Self : Gtk_Editable) is
+      Ent       : constant Gtk_Entry := -Self;
+      Name      : constant String  := Ent.Get_Name;
       Track_Num : constant Integer := Integer'Value (Name (7 .. Name'Last));
    begin
       if Sess.Tracks.Length > 0 and then
          Sess.Tracks (Track_Num).Title /= Gtk_Entry (Tracks_Grid.Get_Child_At (Title_Col, Gint (Track_Num))).Get_Text then
          Sess.Tracks (Track_Num).Title := To_Unbounded_String (Gtk_Entry (Tracks_Grid.Get_Child_At (Title_Col, Gint (Track_Num))).Get_Text);
          Set_Dirty;
       end if;
-      return False;
-   end Title_Changed_CB;
+   end Title_Changed_CB;   
 
    procedure Track_Insert_Btn_CB (Self : access Gtk_Button_Record'Class) is
       pragma Unreferenced (Self);
@@ -309,7 +304,7 @@ package body GUI.Tracks is
          Title_Entry.Set_Text (To_String (Track.Title));
          Title_Entry.Set_Name ("Title" & Row'Image);
          Tracks_Grid.Attach (Title_Entry, Title_Col, Track_Row);
-         Title_Entry.On_Focus_Out_Event (Call => Title_Changed_CB'Access);
+         On_Changed (+Title_Entry, Title_Changed_CB'Access);
 
          Gtk.Check_Button.Gtk_New (Skip_Check, "");
          Skip_Check.Set_Active (Track.Skip);
@@ -323,7 +318,7 @@ package body GUI.Tracks is
          Comment_Entry.Set_Text (To_String (Track.Comment));
          Comment_Entry.Set_Name ("Comment" & Row'Image);
          Tracks_Grid.Attach (Comment_Entry, Comment_Col, Track_Row);
-         Comment_Entry.On_Focus_Out_Event (Call => Comment_Changed_CB'Access);
+         On_Changed (+Comment_Entry, Comment_Changed_CB'Access);
 
          case Track.File_Type is
             when NONE | UNKNOWN =>

src/gui.adb

@@ -17,6 +17,7 @@ with Glib.Error;              use Glib.Error;
 with Gtk.Box;                 use Gtk.Box;
 with Gtk.Button;              use Gtk.Button;
 with Gtk.Container;
+with Gtk.Editable;            use Gtk.Editable;
 with Gtk.Enums;               use Gtk.Enums;
 with Gtk.Frame;
 with Gtk.Style_Context;
@@ -115,26 +116,22 @@ package body GUI is
       end if;
    end Select_Previous_Track;
 
-   function Comment_Changed_CB (Self : access Gtk_Widget_Record'Class;
-                                Event : Gdk.Event.Gdk_Event_Focus) return Boolean is
-      pragma Unreferenced (Self, Event);
+   procedure Comment_Changed_CB (Self : Gtk_Editable) is
+      pragma Unreferenced (Self);
    begin
       if Session_Comment_Entry.Get_Text /= Sess.Comment then
          Set_Dirty;
          Sess.Comment := To_Unbounded_String (Session_Comment_Entry.Get_Text);
       end if;
-      return False;
    end Comment_Changed_CB;
 
-   function Desc_Changed_CB (Self : access Gtk_Widget_Record'Class;
-                             Event : Gdk.Event.Gdk_Event_Focus) return Boolean is
-      pragma Unreferenced (Self, Event);
+   procedure Desc_Changed_CB (Self : Gtk_Editable) is
+      pragma Unreferenced (Self);
    begin
       if Session_Desc_Entry.Get_Text /= Sess.Desc then
          Set_Dirty;
          Sess.Desc := To_Unbounded_String (Session_Desc_Entry.Get_Text);
       end if;
-      return False;
    end Desc_Changed_CB;
 
    function Update_Status_Box_CB (SB : Gtk.Box.Gtk_Box) return Boolean is
@@ -255,15 +252,14 @@ package body GUI is
       Session_Header_Grid.Attach (Child => Session_Label, Left => 0, Top => 0);
       Gtk_New (Session_Desc_Entry);
       Session_Desc_Entry.Set_Width_Chars (60);
-      Session_Desc_Entry.On_Focus_Out_Event (Call => Desc_Changed_CB'Access);
-      --  Session_Desc_Entry.On_Focus_Out_Event ... TODO probably better than Update_Text_Fields
+      On_Changed (+Session_Desc_Entry, Desc_Changed_CB'Access);
       Session_Header_Grid.Attach (Child => Session_Desc_Entry, Left => 1, Top => 0);
 
       Gtk_New (Comment_Label, " Notes: ");
       Session_Header_Grid.Attach (Child => Comment_Label, Left => 0, Top => 1);
       Gtk_New (Session_Comment_Entry);
       Session_Comment_Entry.Set_Width_Chars (80);
-      Session_Comment_Entry.On_Focus_Out_Event (Call => Comment_Changed_CB'Access);
+      On_Changed (+Session_Comment_Entry, Comment_Changed_CB'Access);
       Session_Header_Grid.Attach (Child => Session_Comment_Entry, Left => 1, Top => 1);
       Main_Box.Pack_Start (Child => Session_Header_Grid, Expand => False);
 

src/gui.ads

@@ -22,7 +22,7 @@ package GUI is
 
    package SB_Timeout_P is new Glib.Main.Generic_Sources (Gtk.Box.Gtk_Box);
 
-   App_SemVer    : constant String := "0.2.0";  --  TODO Update Version each release!
+   App_SemVer    : constant String := "0.2.1";  --  TODO Update Version each release!
    App_Title     : constant String := "eMDee";
    App_ID        : constant String := "fr.merrony." & App_Title;
    App_Comment   : constant String := "Musical Director's Assistant";