Merge branch 'topic/vadim/cmdline' into 'master'

Fix display of version and help on Windows

See merge request eng/ide/gnatstudio!882

Author: godunko

cli/src/gnatdoc_main.adb

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                               GNAT Studio                                --
 --                                                                          --
---                     Copyright (C) 2013-2023, AdaCore                     --
+--                     Copyright (C) 2013-2025, AdaCore                     --
 --                                                                          --
 -- This is free software;  you can redistribute it  and/or modify it  under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -21,6 +21,8 @@ with Ada.Command_Line;
 with Ada.Strings.Unbounded; use Ada.Strings.Unbounded;
 with Ada.Text_IO;           use Ada.Text_IO;
 
+with VSS.Strings.Conversions;
+
 with GNAT.Command_Line;     use GNAT.Command_Line;
 with GNAT.OS_Lib;
 with GNAT.Regpat;           use GNAT.Regpat;
@@ -415,10 +417,12 @@ begin
    if Show_Version then
       declare
          Version : constant String :=
-                     "GNATdoc "
-                       & To_String (Config.Version) & " ("
-                       & Config.Source_Date & ") hosted on "
-                       & Config.Target;
+           "GNATdoc "
+           & VSS.Strings.Conversions.To_UTF_8_String (Config.Version)
+           & " ("
+           & VSS.Strings.Conversions.To_UTF_8_String (Config.Source_Date)
+           & ") hosted on "
+           & VSS.Strings.Conversions.To_UTF_8_String (Config.Target);
       begin
          Put_Line (Version);
          return;

cli/src/gps-cli_utils.adb

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                               GNAT Studio                                --
 --                                                                          --
---                        Copyright (C) 2013-2023, AdaCore                  --
+--                        Copyright (C) 2013-2025, AdaCore                  --
 --                                                                          --
 -- This is free software;  you can redistribute it  and/or modify it  under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -15,6 +15,16 @@
 -- of the license.                                                          --
 ------------------------------------------------------------------------------
 
+with Ada.Strings.Fixed;                        use Ada.Strings.Fixed;
+with GNAT.IO;                                  use GNAT.IO;
+with GNAT.OS_Lib;
+
+with VSS.Strings.Conversions;
+
+with GNATCOLL.Scripts.Projects;
+with GNATCOLL.VFS_Utils;
+with GNATCOLL.Utils;
+
 with GPS.CLI_Target_Loaders;
 with GPS.CLI_Scripts;
 
@@ -39,14 +49,6 @@ with Language.Ada;
 with Language.C;
 with Language.Cpp;
 
-with GNAT.IO;                                  use GNAT.IO;
-with Ada.Strings.Fixed;                        use Ada.Strings.Fixed;
-with Ada.Strings.Unbounded;
-with GNATCOLL.Scripts.Projects;
-with GNATCOLL.VFS_Utils;
-with GNATCOLL.Utils;
-with GNAT.OS_Lib;
-
 package body GPS.CLI_Utils is
 
    procedure Register_Classes
@@ -261,9 +263,11 @@ package body GPS.CLI_Utils is
          elsif Switch = "--version" or else Switch = "-v" then
             Put_Line
               ("GNAT Studio version "
-               & Ada.Strings.Unbounded.To_String (Config.Version) & " ("
-               & Config.Source_Date & ") hosted on "
-               & Config.Target);
+               & VSS.Strings.Conversions.To_UTF_8_String (Config.Version)
+               & " ("
+               & VSS.Strings.Conversions.To_UTF_8_String (Config.Source_Date)
+               & ") hosted on "
+               & VSS.Strings.Conversions.To_UTF_8_String (Config.Target));
             GNAT.OS_Lib.OS_Exit (0);
          end if;
 

common/core/src/config.ads.in

@@ -1,7 +1,7 @@
 -----------------------------------------------------------------------
---                               GNAT Studio                                --
+--                               GNAT Studio                         --
 --                                                                   --
---                     Copyright (C) 2001-2018, AdaCore              --
+--                     Copyright (C) 2001-2025, AdaCore              --
 --                                                                   --
 -- GPS is free  software;  you can redistribute it and/or modify  it --
 -- under the terms of the GNU General Public License as published by --
@@ -20,7 +20,7 @@
 --  This package contains target specific parameters that are set at configure
 --  time.
 
-with Ada.Strings.Unbounded;
+with VSS.Strings;
 
 package Config is
 
@@ -33,14 +33,13 @@ package Config is
    -- Constants --
    ---------------
 
-   Current_Year : constant String := "@CURRENT_YEAR@";
+   Current_Year : constant VSS.Strings.Virtual_String := "@CURRENT_YEAR@";
    --  The year to display in copyright notices
 
-   Version : Ada.Strings.Unbounded.Unbounded_String :=
-     Ada.Strings.Unbounded.To_Unbounded_String ("@GPS_VERSION@");
+   Version : VSS.Strings.Virtual_String := "@GPS_VERSION@";
    --  Version number of this software
 
-   Target  : constant String := "@TARGET@";
+   Target  : constant VSS.Strings.Virtual_String := "@TARGET@";
    --  Target for which GPS is built
 
    Darwin_Target : constant Boolean := @TARGET_IS_DARWIN@;
@@ -57,7 +56,7 @@ package Config is
    --  variable and do different things based on it. Consider using this
    --  variable as a last resort, to address very target specific issues.
 
-   Source_Date : constant String := "@GPS_DATE@";
+   Source_Date : constant VSS.Strings.Virtual_String := "@GPS_DATE@";
 
    Max_Frame : constant := 500;
    --  Maximum number of frames displayed in the backtrace window

common/ui/src/gui_utils.adb

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                               GNAT Studio                                --
 --                                                                          --
---                     Copyright (C) 2000-2024, AdaCore                     --
+--                     Copyright (C) 2000-2025, AdaCore                     --
 --                                                                          --
 -- This is free software;  you can redistribute it  and/or modify it  under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -15,87 +15,89 @@
 -- of the license.                                                          --
 ------------------------------------------------------------------------------
 
-with Ada.Calendar;              use Ada.Calendar;
+with Ada.Calendar; use Ada.Calendar;
 with Ada.Strings.Fixed;
-with Ada.Strings.Equal_Case_Insensitive; use Ada.Strings;
+with Ada.Strings.Equal_Case_Insensitive;
+use Ada.Strings;
 with Ada.Unchecked_Conversion;
 with Ada.Unchecked_Deallocation;
-
 with GNAT.Directory_Operations; use GNAT.Directory_Operations;
 with GNAT.OS_Lib;               use GNAT.OS_Lib;
 with GNATCOLL.Utils;            use GNATCOLL.Utils;
+with Interfaces.C;
+
+with GNATCOLL.Traces;   use GNATCOLL.Traces;
 
-with VSS.Strings;               use VSS.Strings;
-with VSS.Strings.Conversions;   use VSS.Strings.Conversions;
-
-with Glib.Convert;              use Glib.Convert;
-with Glib.Object;               use Glib.Object;
-with Glib.Properties;           use Glib.Properties;
-with Glib.Menu_Model;           use Glib.Menu_Model;
-with Glib.Values;               use Glib.Values;
-with Glib.Variant;              use Glib.Variant;
-
-with Gdk;                       use Gdk;
-with Gdk.Cursor;                use Gdk.Cursor;
-with Gdk.Device;                use Gdk.Device;
-with Gdk.Event;                 use Gdk.Event;
-with Gdk.Keyval;                use Gdk.Keyval;
+with VSS.Application;
+with VSS.Strings;                    use VSS.Strings;
+with VSS.Strings.Conversions;
+with VSS.Strings.Formatters.Strings; use VSS.Strings.Formatters.Strings;
+with VSS.Strings.Templates;          use VSS.Strings.Templates;
+
+with Glib.Convert;    use Glib.Convert;
+with Glib.Object;     use Glib.Object;
+with Glib.Properties; use Glib.Properties;
+with Glib.Menu_Model; use Glib.Menu_Model;
+with Glib.Values;     use Glib.Values;
+with Glib.Variant;    use Glib.Variant;
+
+with Gdk;               use Gdk;
+with Gdk.Cursor;        use Gdk.Cursor;
+with Gdk.Device;        use Gdk.Device;
+with Gdk.Event;         use Gdk.Event;
+with Gdk.Keyval;        use Gdk.Keyval;
 with Gdk.Main;
 with Gdk.Pixbuf;
-with Gdk.RGBA;                  use Gdk.RGBA;
-with Gdk.Types.Keysyms;         use Gdk.Types.Keysyms;
-with Gdk.Types;                 use Gdk.Types;
-with Gdk.Window;                use Gdk.Window;
-
-with Gtk.Adjustment;            use Gtk.Adjustment;
-with Gtk.Alignment;             use Gtk.Alignment;
-with Gtk.Bin;                   use Gtk.Bin;
-with Gtk.Box;                   use Gtk.Box;
-with Gtk.Button;                use Gtk.Button;
-with Gtk.Cell_Renderer;         use Gtk.Cell_Renderer;
-with Gtk.Cell_Renderer_Pixbuf;  use Gtk.Cell_Renderer_Pixbuf;
-with Gtk.Check_Button;          use Gtk.Check_Button;
-with Gtk.Container;             use Gtk.Container;
-with Gtk.Dialog;                use Gtk.Dialog;
-with Gtk.Enums;                 use Gtk.Enums;
-with Gtk.Event_Box;             use Gtk.Event_Box;
-with Gtk.Frame;                 use Gtk.Frame;
-with Gtk.GEntry;                use Gtk.GEntry;
-with Gtk.Handlers;              use Gtk.Handlers;
-with Gtk.Image;                 use Gtk.Image;
-with Gtk.Label;                 use Gtk.Label;
-with Gtk.List_Store;            use Gtk.List_Store;
-with Gtk.Menu;                  use Gtk.Menu;
-with Gtk.Menu_Bar;              use Gtk.Menu_Bar;
-with Gtk.Menu_Item;             use Gtk.Menu_Item;
-with Gtk.Menu_Shell;            use Gtk.Menu_Shell;
-with Gtk.Separator_Menu_Item;   use Gtk.Separator_Menu_Item;
-with Gtk.Style_Context;         use Gtk.Style_Context;
-with Gtk.Text_Iter;             use Gtk.Text_Iter;
-with Gtk.Text_Mark;             use Gtk.Text_Mark;
-with Gtk.Text_Tag;              use Gtk.Text_Tag;
-with Gtk.Text_View;             use Gtk.Text_View;
-with Gtk.Tree_Selection;        use Gtk.Tree_Selection;
-with Gtk.Tree_Store;            use Gtk.Tree_Store;
-with Gtk.Tree_View;             use Gtk.Tree_View;
-with Gtk.Tree_View_Column;      use Gtk.Tree_View_Column;
-with Gtk.Widget;                use Gtk.Widget;
+with Gdk.RGBA;          use Gdk.RGBA;
+with Gdk.Types.Keysyms; use Gdk.Types.Keysyms;
+with Gdk.Types;         use Gdk.Types;
+with Gdk.Window;        use Gdk.Window;
+
+with Gtk.Adjustment;           use Gtk.Adjustment;
+with Gtk.Alignment;            use Gtk.Alignment;
+with Gtk.Bin;                  use Gtk.Bin;
+with Gtk.Box;                  use Gtk.Box;
+with Gtk.Button;               use Gtk.Button;
+with Gtk.Cell_Renderer;        use Gtk.Cell_Renderer;
+with Gtk.Cell_Renderer_Pixbuf; use Gtk.Cell_Renderer_Pixbuf;
+with Gtk.Check_Button;         use Gtk.Check_Button;
+with Gtk.Container;            use Gtk.Container;
+with Gtk.Dialog;               use Gtk.Dialog;
+with Gtk.Enums;                use Gtk.Enums;
+with Gtk.Event_Box;            use Gtk.Event_Box;
+with Gtk.Frame;                use Gtk.Frame;
+with Gtk.GEntry;               use Gtk.GEntry;
+with Gtk.Handlers;             use Gtk.Handlers;
+with Gtk.Image;                use Gtk.Image;
+with Gtk.Label;                use Gtk.Label;
+with Gtk.List_Store;           use Gtk.List_Store;
+with Gtk.Menu;                 use Gtk.Menu;
+with Gtk.Menu_Bar;             use Gtk.Menu_Bar;
+with Gtk.Menu_Item;            use Gtk.Menu_Item;
+with Gtk.Menu_Shell;           use Gtk.Menu_Shell;
+with Gtk.Separator_Menu_Item;  use Gtk.Separator_Menu_Item;
+with Gtk.Style_Context;        use Gtk.Style_Context;
+with Gtk.Text_Iter;            use Gtk.Text_Iter;
+with Gtk.Text_Mark;            use Gtk.Text_Mark;
+with Gtk.Text_Tag;             use Gtk.Text_Tag;
+with Gtk.Text_View;            use Gtk.Text_View;
+with Gtk.Tree_Selection;       use Gtk.Tree_Selection;
+with Gtk.Tree_Store;           use Gtk.Tree_Store;
+with Gtk.Tree_View;            use Gtk.Tree_View;
+with Gtk.Tree_View_Column;     use Gtk.Tree_View_Column;
+with Gtk.Widget;               use Gtk.Widget;
 with Gtkada.Types;
 
-with Pango.Enums;               use Pango.Enums;
+with Pango.Enums; use Pango.Enums;
 
-with Gtkada.Handlers;           use Gtkada.Handlers;
-with Gtkada.MDI;                use Gtkada.MDI;
+with Gtkada.Handlers; use Gtkada.Handlers;
+with Gtkada.MDI;      use Gtkada.MDI;
 
-with VSS.Application;
-
-with Basic_Types;               use Basic_Types;
-with Config;                    use Config;
-with Interfaces.C;
-with String_List_Utils;         use String_List_Utils;
-with String_Utils;              use String_Utils;
-with Glib_String_Utils;         use Glib_String_Utils;
-with GNATCOLL.Traces;           use GNATCOLL.Traces;
+with Basic_Types;       use Basic_Types;
+with Config;            use Config;
+with String_List_Utils; use String_List_Utils;
+with String_Utils;      use String_Utils;
+with Glib_String_Utils; use Glib_String_Utils;
 
 package body GUI_Utils is
 
@@ -259,12 +261,17 @@ package body GUI_Utils is
       while Iter /= Null_Iter loop
          declare
             Str : Virtual_String
-              renames To_Virtual_String (Model.Get_String (Iter, Col));
+              renames VSS.Strings.Conversions.To_Virtual_String
+                        (Model.Get_String (Iter, Col));
          begin
-            exit when Str = Text
+            exit when
+              Str = Text
               or else (not Case_Sensitive
                        and then Equal_Case_Insensitive
-                         (To_UTF_8_String (Text), To_UTF_8_String (Str)));
+                                  (VSS.Strings.Conversions.To_UTF_8_String
+                                     (Text),
+                                   VSS.Strings.Conversions.To_UTF_8_String
+                                     (Str)));
          end;
 
          Model.Next (Iter);
@@ -277,7 +284,7 @@ package body GUI_Utils is
             Gtk.List_Store.Append (Model, Iter);
          end if;
 
-         Model.Set (Iter, Col, To_UTF_8_String (Text));
+         Model.Set (Iter, Col, VSS.Strings.Conversions.To_UTF_8_String (Text));
       end if;
 
       if Select_Text then
@@ -3046,11 +3053,13 @@ package body GUI_Utils is
    function Create_Logo_And_Title_Area
      (Is_Dark_Theme : Boolean) return Gtk_Widget
    is
-      Frame  : Gtk_Frame;
-      Vbox   : Gtk_Box;
-      Logo   : Gtk_Image;
-      Label  : Gtk_Label;
-      Suffix : constant String := (if Is_Dark_Theme then "-dark" else "");
+      Frame    : Gtk_Frame;
+      Vbox     : Gtk_Box;
+      Logo     : Gtk_Image;
+      Label    : Gtk_Label;
+      Suffix   : constant String := (if Is_Dark_Theme then "-dark" else "");
+      Template : VSS.Strings.Templates.Virtual_String_Template := "Version {}";
+
    begin
       Gtk_New (Frame);
       Get_Style_Context (Frame).Add_Class ("gps-welcome-dialog-logo-area");
@@ -3065,7 +3074,10 @@ package body GUI_Utils is
          Size      => Icon_Size_Dialog);
       Vbox.Pack_Start (Logo, Expand => False);
 
-      Gtk_New (Label, "Version " & To_String (Config.Version));
+      Gtk_New
+        (Label,
+         VSS.Strings.Conversions.To_UTF_8_String
+           (Template.Format (Image (Config.Version))));
       Label.Set_Alignment (0.75, 0.5);
       Get_Style_Context (Label).Add_Class ("gps-welcome-dialog-version");
       Vbox.Pack_Start (Label, Expand => False, Padding => 10);