GNOME.org
 

[gnome-builder] flatpak: add installation dialog

commit e992197b5dd4f35df6442be7a1935badd3e665c3
Author: Christian Hergert <chergert redhat com>
Date:   Thu Mar 14 11:09:24 2019 -0700

    flatpak: add installation dialog
    
    This is a dialog that can be used in the async workflow of
    bootstrapping runtimes to query the user if it is okay to
    install runtimes now.
    
    It would be nice if we could include an estimate on size at
    some point from this dialog.

 src/plugins/flatpak/flatpak.gresource.xml         |   1 +
 src/plugins/flatpak/gbp-flatpak-install-dialog.c  | 318 ++++++++++++++++++++++
 src/plugins/flatpak/gbp-flatpak-install-dialog.h  |  49 ++++
 src/plugins/flatpak/gbp-flatpak-install-dialog.ui | 135 +++++++++
 src/plugins/flatpak/meson.build                   |   1 +
 5 files changed, 504 insertions(+)
---
diff --git a/src/plugins/flatpak/flatpak.gresource.xml b/src/plugins/flatpak/flatpak.gresource.xml
index e24f61d3d..494fd672a 100644
--- a/src/plugins/flatpak/flatpak.gresource.xml
+++ b/src/plugins/flatpak/flatpak.gresource.xml
@@ -3,5 +3,6 @@
   <gresource prefix="/plugins/flatpak">
     <file>flatpak.plugin</file>
     <file preprocess="xml-stripblanks">gbp-flatpak-clone-widget.ui</file>
+    <file preprocess="xml-stripblanks">gbp-flatpak-install-dialog.ui</file>
   </gresource>
 </gresources>
diff --git a/src/plugins/flatpak/gbp-flatpak-install-dialog.c 
b/src/plugins/flatpak/gbp-flatpak-install-dialog.c
new file mode 100644
index 000000000..57aad9b08
--- /dev/null
+++ b/src/plugins/flatpak/gbp-flatpak-install-dialog.c
@@ -0,0 +1,318 @@
+/* gbp-flatpak-install-dialog.c
+ *
+ * Copyright 2019 Christian Hergert <chergert redhat com>
+ *
+ * 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
+ */
+
+#define G_LOG_DOMAIN "gbp-flatpak-install-dialog"
+
+#include "config.h"
+
+#include <glib/gi18n.h>
+
+#include <libide-gui.h>
+#include <libide-threading.h>
+#include <flatpak/flatpak.h>
+
+#include "gbp-flatpak-install-dialog.h"
+#include "gbp-flatpak-util.h"
+
+struct _GbpFlatpakInstallDialog
+{
+  GtkDialog      parent_instance;
+  GtkListStore  *liststore1;
+  IdeTask       *close_task;
+  gchar        **saved_runtimes;
+  gint           response_id;
+};
+
+G_DEFINE_TYPE (GbpFlatpakInstallDialog, gbp_flatpak_install_dialog, GTK_TYPE_DIALOG)
+
+GbpFlatpakInstallDialog *
+gbp_flatpak_install_dialog_new (void)
+{
+  return g_object_new (GBP_TYPE_FLATPAK_INSTALL_DIALOG,
+                       "use-header-bar", TRUE,
+                       NULL);
+}
+
+static gchar **
+get_runtimes (GbpFlatpakInstallDialog *self)
+{
+  GPtrArray *ar = NULL;
+  GtkTreeIter iter;
+
+  g_assert (GBP_IS_FLATPAK_INSTALL_DIALOG (self));
+
+  ar = g_ptr_array_new ();
+
+  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (self->liststore1), &iter))
+    {
+      do
+        {
+          g_autofree gchar *name = NULL;
+          g_autofree gchar *arch = NULL;
+          g_autofree gchar *branch = NULL;
+
+          gtk_tree_model_get (GTK_TREE_MODEL (self->liststore1), &iter,
+                              0, &name,
+                              1, &arch,
+                              2, &branch,
+                              -1);
+
+          g_ptr_array_add (ar, g_strdup_printf ("%s/%s/%s", name, arch, branch ?: ""));
+        }
+      while (gtk_tree_model_iter_next (GTK_TREE_MODEL (self->liststore1), &iter));
+    }
+
+  g_ptr_array_add (ar, NULL);
+
+  return (gchar **)g_ptr_array_free (ar, FALSE);
+}
+
+static void
+gbp_flatpak_install_dialog_response (GtkDialog *dialog,
+                                     gint       response_id)
+{
+  GbpFlatpakInstallDialog *self = (GbpFlatpakInstallDialog *)dialog;
+
+  g_assert (GBP_IS_FLATPAK_INSTALL_DIALOG (self));
+
+  self->response_id = response_id;
+
+  g_clear_pointer (&self->saved_runtimes, g_strfreev);
+  self->saved_runtimes = get_runtimes (self);
+
+  if (self->close_task && response_id == GTK_RESPONSE_OK)
+    ide_task_return_boolean (self->close_task, TRUE);
+
+  if (GTK_DIALOG_CLASS (gbp_flatpak_install_dialog_parent_class)->response)
+    GTK_DIALOG_CLASS (gbp_flatpak_install_dialog_parent_class)->response (dialog, response_id);
+
+  gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+static void
+gbp_flatpak_install_dialog_finalize (GObject *object)
+{
+  GbpFlatpakInstallDialog *self = (GbpFlatpakInstallDialog *)object;
+
+  g_clear_object (&self->close_task);
+  g_clear_pointer (&self->saved_runtimes, g_strfreev);
+
+  G_OBJECT_CLASS (gbp_flatpak_install_dialog_parent_class)->finalize (object);
+}
+
+static void
+gbp_flatpak_install_dialog_class_init (GbpFlatpakInstallDialogClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  dialog_class->response = gbp_flatpak_install_dialog_response;
+
+  object_class->finalize = gbp_flatpak_install_dialog_finalize;
+
+  gtk_widget_class_set_template_from_resource (widget_class, 
"/plugins/flatpak/gbp-flatpak-install-dialog.ui");
+  gtk_widget_class_bind_template_child (widget_class, GbpFlatpakInstallDialog, liststore1);
+}
+
+static void
+gbp_flatpak_install_dialog_init (GbpFlatpakInstallDialog *self)
+{
+  GtkWidget *button;
+
+  self->response_id = GTK_RESPONSE_CANCEL;
+
+  gtk_widget_init_template (GTK_WIDGET (self));
+
+  gtk_window_set_title (GTK_WINDOW (self), _("Install Missing SDK?"));
+  gtk_window_set_application (GTK_WINDOW (self), GTK_APPLICATION (IDE_APPLICATION_DEFAULT));
+
+  gtk_dialog_add_buttons (GTK_DIALOG (self),
+                          _("_Cancel"), GTK_RESPONSE_CANCEL,
+                          _("_Install"), GTK_RESPONSE_OK,
+                          NULL);
+  gtk_dialog_set_default_response (GTK_DIALOG (self), GTK_RESPONSE_OK);
+
+  button = gtk_dialog_get_widget_for_response (GTK_DIALOG (self), GTK_RESPONSE_OK);
+  dzl_gtk_widget_add_style_class (button, "suggested-action");
+}
+
+static void
+gbp_flatpak_install_dialog_on_close_cb (GbpFlatpakInstallDialog *self,
+                                        IdeTask                 *task)
+{
+  g_assert (GBP_IS_FLATPAK_INSTALL_DIALOG (self));
+  g_assert (IDE_IS_TASK (task));
+
+  g_signal_handlers_disconnect_by_func (self,
+                                        G_CALLBACK (gbp_flatpak_install_dialog_on_close_cb),
+                                        task);
+
+  if (self->response_id != GTK_RESPONSE_OK)
+    ide_task_return_new_error (task,
+                               G_IO_ERROR,
+                               G_IO_ERROR_CANCELLED,
+                               "User cancelled the request");
+}
+
+void
+gbp_flatpak_install_dialog_run_async (GbpFlatpakInstallDialog *self,
+                                      GCancellable            *cancellable,
+                                      GAsyncReadyCallback      callback,
+                                      gpointer                 user_data)
+{
+  g_autoptr(IdeTask) task = NULL;
+
+  g_return_if_fail (GBP_IS_FLATPAK_INSTALL_DIALOG (self));
+  g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable));
+
+  task = ide_task_new (self, cancellable, callback, user_data);
+  ide_task_set_source_tag (task, gbp_flatpak_install_dialog_run_async);
+
+  if (self->close_task != NULL)
+    {
+      ide_task_chain (self->close_task, task);
+      return;
+    }
+
+  ide_task_set_release_on_propagate (task, FALSE);
+  self->close_task = g_object_ref (task);
+
+  if (cancellable != NULL)
+    g_signal_connect_object (cancellable,
+                             "cancelled",
+                             G_CALLBACK (gtk_window_close),
+                             self,
+                             G_CONNECT_SWAPPED);
+
+  g_signal_connect_object (self,
+                           "close",
+                           G_CALLBACK (gbp_flatpak_install_dialog_on_close_cb),
+                           self->close_task,
+                           G_CONNECT_AFTER);
+
+  ide_gtk_window_present (GTK_WINDOW (self));
+}
+
+gboolean
+gbp_flatpak_install_dialog_run_finish (GbpFlatpakInstallDialog  *self,
+                                       GAsyncResult             *result,
+                                       GError                  **error)
+{
+  g_return_val_if_fail (GBP_IS_FLATPAK_INSTALL_DIALOG (self), FALSE);
+  g_return_val_if_fail (IDE_IS_TASK (result), FALSE);
+
+  return ide_task_propagate_boolean (IDE_TASK (result), error);
+}
+
+static gboolean
+gbp_flatpak_install_dialog_contains (GbpFlatpakInstallDialog *self,
+                                     const gchar             *name,
+                                     const gchar             *arch,
+                                     const gchar             *branch)
+{
+  GtkTreeIter iter;
+
+  g_assert (GBP_IS_FLATPAK_INSTALL_DIALOG (self));
+  g_assert (name);
+  g_assert (arch);
+  g_assert (branch);
+
+  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (self->liststore1), &iter))
+    {
+      do
+        {
+          g_autofree gchar *item_name = NULL;
+          g_autofree gchar *item_arch = NULL;
+          g_autofree gchar *item_branch = NULL;
+
+          gtk_tree_model_get (GTK_TREE_MODEL (self->liststore1), &iter,
+                              0, &item_name,
+                              1, &item_arch,
+                              2, &item_branch,
+                              -1);
+
+          if (g_str_equal (item_name, name) &&
+              g_str_equal (item_arch, arch) &&
+              g_str_equal (item_branch, branch))
+            return TRUE;
+        }
+      while (gtk_tree_model_iter_next (GTK_TREE_MODEL (self->liststore1), &iter));
+    }
+
+  return FALSE;
+}
+
+void
+gbp_flatpak_install_dialog_add_runtime (GbpFlatpakInstallDialog *self,
+                                        const gchar             *runtime_id)
+{
+  g_autofree gchar *name = NULL;
+  g_autofree gchar *arch = NULL;
+  g_autofree gchar *branch = NULL;
+
+  g_assert (GBP_IS_FLATPAK_INSTALL_DIALOG (self));
+  g_assert (runtime_id != NULL);
+
+  if (g_str_has_prefix (runtime_id, "flatpak:"))
+    runtime_id += strlen ("flatpak:");
+
+  if (gbp_flatpak_split_id (runtime_id, &name, &arch, &branch) &&
+      !gbp_flatpak_install_dialog_contains (self, name, arch, branch))
+    {
+      GtkTreeIter iter;
+
+      gtk_list_store_append (self->liststore1, &iter);
+      gtk_list_store_set (self->liststore1, &iter,
+                          0, name,
+                          1, arch,
+                          2, branch,
+                          -1);
+    }
+}
+
+gchar **
+gbp_flatpak_install_dialog_get_runtimes (GbpFlatpakInstallDialog *self)
+{
+  g_assert (GBP_IS_FLATPAK_INSTALL_DIALOG (self));
+
+  if (self->saved_runtimes != NULL)
+    return g_strdupv (self->saved_runtimes);
+
+  return get_runtimes (self);
+}
+
+void
+gbp_flatpak_install_dialog_add_runtime_full (GbpFlatpakInstallDialog *self,
+                                             const gchar *name,
+                                             const gchar *arch,
+                                             const gchar *branch)
+{
+  g_autofree gchar *runtime_id = NULL;
+
+  g_return_if_fail (GBP_IS_FLATPAK_INSTALL_DIALOG (self));
+  g_return_if_fail (name != NULL);
+
+  if (arch == NULL)
+    arch = flatpak_get_default_arch ();
+
+  runtime_id = g_strdup_printf ("%s/%s/%s", name, arch, branch ?: "");
+  gbp_flatpak_install_dialog_add_runtime (self, runtime_id);
+}
diff --git a/src/plugins/flatpak/gbp-flatpak-install-dialog.h 
b/src/plugins/flatpak/gbp-flatpak-install-dialog.h
new file mode 100644
index 000000000..04092be46
--- /dev/null
+++ b/src/plugins/flatpak/gbp-flatpak-install-dialog.h
@@ -0,0 +1,49 @@
+/* gbp-flatpak-install-dialog.h
+ *
+ * Copyright 2019 Christian Hergert <chergert redhat com>
+ *
+ * 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 <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define GBP_TYPE_FLATPAK_INSTALL_DIALOG (gbp_flatpak_install_dialog_get_type())
+
+G_DECLARE_FINAL_TYPE (GbpFlatpakInstallDialog, gbp_flatpak_install_dialog, GBP, FLATPAK_INSTALL_DIALOG, 
GtkDialog)
+
+GbpFlatpakInstallDialog  *gbp_flatpak_install_dialog_new              (void);
+void                      gbp_flatpak_install_dialog_add_runtime      (GbpFlatpakInstallDialog  *self,
+                                                                       const gchar              *runtime_id);
+void                      gbp_flatpak_install_dialog_add_runtime_full (GbpFlatpakInstallDialog  *self,
+                                                                       const gchar              *name,
+                                                                       const gchar              *arch,
+                                                                       const gchar              *branch);
+gchar                   **gbp_flatpak_install_dialog_get_runtimes     (GbpFlatpakInstallDialog  *self);
+gboolean                  gbp_flatpak_install_dialog_has_runtime      (GbpFlatpakInstallDialog  *self,
+                                                                       const gchar              *runtime_id);
+void                      gbp_flatpak_install_dialog_run_async        (GbpFlatpakInstallDialog  *self,
+                                                                       GCancellable             *cancellable,
+                                                                       GAsyncReadyCallback       callback,
+                                                                       gpointer                  user_data);
+gboolean                  gbp_flatpak_install_dialog_run_finish       (GbpFlatpakInstallDialog  *self,
+                                                                       GAsyncResult             *result,
+                                                                       GError                  **error);
+
+G_END_DECLS
diff --git a/src/plugins/flatpak/gbp-flatpak-install-dialog.ui 
b/src/plugins/flatpak/gbp-flatpak-install-dialog.ui
new file mode 100644
index 000000000..58f7bdc69
--- /dev/null
+++ b/src/plugins/flatpak/gbp-flatpak-install-dialog.ui
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.0 -->
+<interface>
+  <requires lib="gtk+" version="3.24"/>
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name arch -->
+      <column type="gchararray"/>
+      <!-- column-name branch -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <template class="GbpFlatpakInstallDialog" parent="GtkDialog">
+    <property name="can_focus">False</property>
+    <property name="modal">True</property>
+    <property name="type_hint">normal</property>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="content">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_start">12</property>
+            <property name="margin_end">12</property>
+            <property name="margin_top">12</property>
+            <property name="margin_bottom">12</property>
+            <property name="vexpand">True</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="subtitle">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_top">6</property>
+                <property name="label" translatable="yes">Builder needs to install the following software 
development kits to build your project. Click “Install” to have Builder install them for you.</property>
+                <property name="wrap">True</property>
+                <property name="max_width_chars">50</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="margin_top">12</property>
+                <property name="vexpand">True</property>
+                <property name="shadow_type">in</property>
+                <property name="propagate_natural_width">True</property>
+                <property name="propagate_natural_height">True</property>
+                <child>
+                  <object class="GtkTreeView" id="runtimes">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="model">liststore1</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection">
+                        <property name="mode">none</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn">
+                        <property name="title" translatable="yes">Name</property>
+                        <property name="expand">True</property>
+                        <child>
+                          <object class="GtkCellRendererText"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn">
+                        <property name="title" translatable="yes">Architecture</property>
+                        <child>
+                          <object class="GtkCellRendererText"/>
+                          <attributes>
+                            <attribute name="text">1</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn">
+                        <property name="title" translatable="yes">Branch</property>
+                        <child>
+                          <object class="GtkCellRendererText"/>
+                          <attributes>
+                            <attribute name="text">2</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
+  </template>
+</interface>
diff --git a/src/plugins/flatpak/meson.build b/src/plugins/flatpak/meson.build
index 883b97c03..438dd08f2 100644
--- a/src/plugins/flatpak/meson.build
+++ b/src/plugins/flatpak/meson.build
@@ -14,6 +14,7 @@ plugins_sources += files([
   'gbp-flatpak-config-provider.c',
   'gbp-flatpak-dependency-updater.c',
   'gbp-flatpak-download-stage.c',
+  'gbp-flatpak-install-dialog.c',
   'gbp-flatpak-manifest.c',
   'gbp-flatpak-pipeline-addin.c',
   'gbp-flatpak-preferences-addin.c',
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]