Bring back supported versions section as a dialog

src/exm-comment-dialog.c

@@ -21,14 +21,13 @@
 
 #include "exm-comment-dialog.h"
 
+#include "exm-config.h"
 #include "exm-comment-tile.h"
 #include "web/exm-comment-provider.h"
 #include "web/model/exm-comment.h"
 
 #include <glib/gi18n.h>
 
-#include "exm-config.h"
-
 struct _ExmCommentDialog
 {
     AdwDialog parent_instance;

src/exm-comment-dialog.h

@@ -1,7 +1,26 @@
+/*
+ * exm-comment-dialog.h
+ *
+ * Copyright 2022-2025 Matthew Jakeman <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 #pragma once
 
-#include <glib-object.h>
-#include <gtk/gtk.h>
 #include <adwaita.h>
 
 G_BEGIN_DECLS

src/exm-detail-view.blp

@@ -190,7 +190,50 @@ template $ExmDetailView: Adw.NavigationPage {
                   }
                 }
 
-                $ExmInfoBar ext_info_bar {}
+                Adw.PreferencesGroup {
+                  Adw.ActionRow {
+                    [prefix]
+                    Gtk.Image {
+                      icon-name: "folder-download-symbolic";
+                    }
+
+                    title: C_("Number of downloads", "Downloads");
+
+                    [suffix]
+                    Gtk.Label downloads_label {
+                      styles [
+                        "numeric",
+                      ]
+                    }
+                  }
+
+                  Adw.ActionRow {
+                    [prefix]
+                    Gtk.Image {
+                      icon-name: "system-software-install-symbolic";
+                    }
+
+                    action-name: "detail.show-versions";
+                    activatable: true;
+                    title: _("Version");
+
+                    [suffix]
+                    Gtk.Box {
+                      spacing: 6;
+
+                      Gtk.Label version_label {
+                        // TODO: Drop when version-label is available
+                        styles [
+                          "numeric",
+                        ]
+                      }
+
+                      Gtk.Image {
+                        icon-name: "go-next-symbolic";
+                      }
+                    }
+                  }
+                }
 
                 Adw.PreferencesGroup {
                   title: _("Links");
@@ -201,9 +244,9 @@ template $ExmDetailView: Adw.NavigationPage {
                       icon-name: "go-home-symbolic";
                     }
 
-                    title: _("Homepage");
-                    activatable: true;
                     action-name: "detail.open-homepage";
+                    activatable: true;
+                    title: _("Homepage");
 
                     [suffix]
                     Gtk.Image {
@@ -226,9 +269,9 @@ template $ExmDetailView: Adw.NavigationPage {
                       icon-name: "web-browser-symbolic";
                     }
 
-                    title: _("View on Extensions");
-                    activatable: true;
                     action-name: "detail.open-extensions";
+                    activatable: true;
+                    title: _("View on Extensions");
 
                     [suffix]
                     Gtk.Image {
@@ -247,8 +290,8 @@ template $ExmDetailView: Adw.NavigationPage {
                     ]
 
                     label: _("Reviews and Comments");
-                    xalign: 0;
                     selectable: true;
+                    xalign: 0;
                   }
 
                   // TODO: Abstract into common class

src/exm-detail-view.c

@@ -21,25 +21,21 @@
 
 #include "exm-detail-view.h"
 
-#include "exm-screenshot.h"
-#include "exm-screenshot-view.h"
-#include "exm-info-bar.h"
-#include "exm-comment-tile.h"
+#include "exm-config.h"
 #include "exm-comment-dialog.h"
+#include "exm-comment-tile.h"
+#include "exm-enums.h"
 #include "exm-install-button.h"
 #include "exm-screenshot.h"
-
+#include "exm-screenshot-view.h"
+#include "exm-types.h"
+#include "exm-versions-dialog.h"
+#include "local/exm-manager.h"
+#include "web/exm-comment-provider.h"
 #include "web/exm-data-provider.h"
 #include "web/exm-image-resolver.h"
-#include "web/exm-comment-provider.h"
-#include "web/model/exm-shell-version-map.h"
 #include "web/model/exm-comment.h"
-#include "local/exm-manager.h"
-
-#include "exm-types.h"
-#include "exm-enums.h"
-
-#include "exm-config.h"
+#include "web/model/exm-shell-version-map.h"
 
 #include <glib/gi18n.h>
 
@@ -69,7 +65,9 @@ struct _ExmDetailView
     ExmScreenshot *ext_screenshot;
     GtkOverlay *ext_screenshot_container;
     GtkButton *ext_screenshot_popout_button;
-    ExmInfoBar *ext_info_bar;
+    GtkLabel *downloads_label;
+    GtkLabel *version_label;
+    ExmVersionsDialog *ext_versions_dialog;
     GtkScrolledWindow *scroll_area;
     GtkStack *comment_stack;
     GtkFlowBox *comment_box;
@@ -447,7 +445,7 @@ on_data_loaded (GObject      *source,
         gtk_label_set_label (self->ext_title, name);
         gtk_label_set_label (self->ext_author, creator);
         gtk_label_set_label (self->ext_description, description);
-        g_object_set (self->ext_info_bar, "downloads", downloads, NULL);
+        gtk_label_set_label (self->downloads_label, g_strdup_printf ("%'d", downloads));
 
         if (self->resolver_cancel)
         {
@@ -506,7 +504,14 @@ on_data_loaded (GObject      *source,
         adw_action_row_set_subtitle (self->link_homepage, self->uri_homepage);
         adw_action_row_set_subtitle (self->link_extensions, self->uri_extensions);
 
-        g_object_set (self->ext_info_bar, "version", 0.0, NULL);
+        gtk_label_set_label (self->version_label, _("Unsupported"));
+
+        if (self->ext_versions_dialog)
+        {
+            g_object_unref (self->ext_versions_dialog);
+            self->ext_versions_dialog = NULL;
+        }
+        self->ext_versions_dialog = exm_versions_dialog_new ();
 
         for (version_iter = version_map->map;
              version_iter != NULL;
@@ -522,10 +527,17 @@ on_data_loaded (GObject      *source,
             else
                 version = g_strdup_printf ("%s.0", entry->shell_major_version);
 
-              if (version != NULL && self->shell_version != NULL &&
-                  (strcmp (version, self->shell_version) == 0 ||
-                   strncmp(version, self->shell_version, strchr(version, '.') - version) == 0))
-                  g_object_set (self->ext_info_bar, "version", entry->extension_version, NULL);
+              if (version != NULL && self->shell_version != NULL)
+              {
+                  exm_versions_dialog_add_version (self->ext_versions_dialog, entry->shell_minor_version
+                                                                              ? version
+                                                                              : entry->shell_major_version);
+
+                  if (strcmp (version, self->shell_version) == 0 ||
+                     strncmp(version, self->shell_version, strchr(version, '.') - version) == 0)
+                      gtk_label_set_label (self->version_label,
+                                           g_strdup_printf ("%.f", entry->extension_version));
+              }
 
             g_free (version);
         }
@@ -578,6 +590,20 @@ exm_detail_view_update (ExmDetailView *self)
         g_object_set (self->ext_install, "state", EXM_INSTALL_BUTTON_STATE_INSTALLED, NULL);
 }
 
+static void
+show_versions (GtkWidget  *widget,
+               const char *action_name G_GNUC_UNUSED,
+               GVariant   *parameter G_GNUC_UNUSED)
+{
+    ExmDetailView *self;
+    GtkWidget *toplevel;
+
+    self = EXM_DETAIL_VIEW (widget);
+    toplevel = GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (self)));
+
+    adw_dialog_present (ADW_DIALOG (g_object_ref (self->ext_versions_dialog)), toplevel);
+}
+
 static void
 open_link (ExmDetailView *self,
            const char    *action_name,
@@ -708,7 +734,8 @@ exm_detail_view_class_init (ExmDetailViewClass *klass)
     gtk_widget_class_bind_template_child (widget_class, ExmDetailView, ext_screenshot);
     gtk_widget_class_bind_template_child (widget_class, ExmDetailView, ext_screenshot_container);
     gtk_widget_class_bind_template_child (widget_class, ExmDetailView, ext_screenshot_popout_button);
-    gtk_widget_class_bind_template_child (widget_class, ExmDetailView, ext_info_bar);
+    gtk_widget_class_bind_template_child (widget_class, ExmDetailView, downloads_label);
+    gtk_widget_class_bind_template_child (widget_class, ExmDetailView, version_label);
     gtk_widget_class_bind_template_child (widget_class, ExmDetailView, link_homepage);
     gtk_widget_class_bind_template_child (widget_class, ExmDetailView, links_donations);
     gtk_widget_class_bind_template_child (widget_class, ExmDetailView, link_extensions);
@@ -722,6 +749,7 @@ exm_detail_view_class_init (ExmDetailViewClass *klass)
     gtk_widget_class_bind_template_callback (widget_class, screenshot_view_cb);
     gtk_widget_class_bind_template_callback (widget_class, install_remote);
 
+    gtk_widget_class_install_action (widget_class, "detail.show-versions", NULL, show_versions);
     gtk_widget_class_install_action (widget_class, "detail.open-extensions", NULL, (GtkWidgetActionActivateFunc) open_link);
     gtk_widget_class_install_action (widget_class, "detail.open-homepage", NULL, (GtkWidgetActionActivateFunc) open_link);
     gtk_widget_class_install_action (widget_class, "detail.open-donation", "i", (GtkWidgetActionActivateFunc) open_link);
@@ -734,7 +762,6 @@ exm_detail_view_init (ExmDetailView *self)
 
     g_type_ensure (EXM_TYPE_INSTALL_BUTTON);
     g_type_ensure (EXM_TYPE_SCREENSHOT);
-    g_type_ensure (EXM_TYPE_INFO_BAR);
 
     gtk_widget_init_template (GTK_WIDGET (self));
 

src/exm-detail-view.h

@@ -1,3 +1,24 @@
+/*
+ * exm-detail-view.h
+ *
+ * Copyright 2022-2025 Matthew Jakeman <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 #pragma once
 
 #include <adwaita.h>
@@ -8,13 +29,11 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE (ExmDetailView, exm_detail_view, EXM, DETAIL_VIEW, AdwNavigationPage)
 
-ExmDetailView *exm_detail_view_new (void);
+ExmDetailView *exm_detail_view_new           (void);
 
-void
-exm_detail_view_load_for_uuid (ExmDetailView *self,
-                               gchar         *uuid);
+void           exm_detail_view_load_for_uuid (ExmDetailView *self,
+                                              gchar         *uuid);
 
-void
-exm_detail_view_update (ExmDetailView *self);
+void           exm_detail_view_update        (ExmDetailView *self);
 
 G_END_DECLS