[gnome-software/1081-gsapp-show-packaging-format-in-origin-ui-string: 38/38] gs-origin-popover-row: Remove the 'Format' row
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/1081-gsapp-show-packaging-format-in-origin-ui-string: 38/38] gs-origin-popover-row: Remove the 'Format' row
- Date: Tue, 9 Feb 2021 15:14:23 +0000 (UTC)
commit 92ec0ec5aa47c723aabb2718bacf08dc0fc180e7
Author: Milan Crha <mcrha redhat com>
Date: Tue Feb 9 16:12:43 2021 +0100
gs-origin-popover-row: Remove the 'Format' row
The packaging format is part of the repository title now.
Related to https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1081
src/gs-origin-popover-row.c | 16 ----------------
src/gs-origin-popover-row.ui | 29 -----------------------------
2 files changed, 45 deletions(-)
---
diff --git a/src/gs-origin-popover-row.c b/src/gs-origin-popover-row.c
index f5ee8c5a3..7e2a8d171 100644
--- a/src/gs-origin-popover-row.c
+++ b/src/gs-origin-popover-row.c
@@ -19,9 +19,6 @@ typedef struct
GtkWidget *url_box;
GtkWidget *url_title;
GtkWidget *url_label;
- GtkWidget *format_box;
- GtkWidget *format_title;
- GtkWidget *format_label;
GtkWidget *installation_box;
GtkWidget *installation_title;
GtkWidget *installation_label;
@@ -41,7 +38,6 @@ refresh_ui (GsOriginPopoverRow *row)
{
GsOriginPopoverRowPrivate *priv = gs_origin_popover_row_get_instance_private (row);
g_autofree gchar *origin_ui = NULL;
- g_autofree gchar *packaging_format = NULL;
g_autofree gchar *url = NULL;
g_assert (GS_IS_ORIGIN_POPOVER_ROW (row));
@@ -68,14 +64,6 @@ refresh_ui (GsOriginPopoverRow *row)
gtk_widget_hide (priv->url_box);
}
- packaging_format = gs_app_get_packaging_format (priv->app);
- if (packaging_format != NULL) {
- gtk_label_set_text (GTK_LABEL (priv->format_label), packaging_format);
- gtk_widget_show (priv->format_box);
- } else {
- gtk_widget_hide (priv->format_box);
- }
-
if (gs_app_get_bundle_kind (priv->app) == AS_BUNDLE_KIND_FLATPAK &&
gs_app_get_scope (priv->app) != AS_APP_SCOPE_UNKNOWN) {
AsAppScope scope = gs_app_get_scope (priv->app);
@@ -142,7 +130,6 @@ gs_origin_popover_row_set_size_group (GsOriginPopoverRow *row, GtkSizeGroup *siz
GsOriginPopoverRowPrivate *priv = gs_origin_popover_row_get_instance_private (row);
gtk_size_group_add_widget (size_group, priv->url_title);
- gtk_size_group_add_widget (size_group, priv->format_title);
gtk_size_group_add_widget (size_group, priv->installation_title);
gtk_size_group_add_widget (size_group, priv->branch_title);
gtk_size_group_add_widget (size_group, priv->version_title);
@@ -178,9 +165,6 @@ gs_origin_popover_row_class_init (GsOriginPopoverRowClass *klass)
gtk_widget_class_bind_template_child_private (widget_class, GsOriginPopoverRow, url_box);
gtk_widget_class_bind_template_child_private (widget_class, GsOriginPopoverRow, url_title);
gtk_widget_class_bind_template_child_private (widget_class, GsOriginPopoverRow, url_label);
- gtk_widget_class_bind_template_child_private (widget_class, GsOriginPopoverRow, format_box);
- gtk_widget_class_bind_template_child_private (widget_class, GsOriginPopoverRow, format_title);
- gtk_widget_class_bind_template_child_private (widget_class, GsOriginPopoverRow, format_label);
gtk_widget_class_bind_template_child_private (widget_class, GsOriginPopoverRow, installation_box);
gtk_widget_class_bind_template_child_private (widget_class, GsOriginPopoverRow, installation_title);
gtk_widget_class_bind_template_child_private (widget_class, GsOriginPopoverRow, installation_label);
diff --git a/src/gs-origin-popover-row.ui b/src/gs-origin-popover-row.ui
index 3fd4eb0df..b46c838f9 100644
--- a/src/gs-origin-popover-row.ui
+++ b/src/gs-origin-popover-row.ui
@@ -51,35 +51,6 @@
</child>
</object>
</child>
- <child>
- <object class="GtkBox" id="format_box">
- <property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="format_title">
- <property name="visible">True</property>
- <property name="halign">start</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes" comments="Translators: The packaging format of
the app being installed, e.g. 'RPM' or 'Flatpak'">Format</property>
- <style>
- <class name="app-row-origin-text"/>
- <class name="dim-label"/>
- </style>
- </object>
- </child>
- <child>
- <object class="GtkLabel" id="format_label">
- <property name="visible">True</property>
- <property name="halign">start</property>
- <property name="ellipsize">end</property>
- <style>
- <class name="app-row-origin-text"/>
- </style>
- </object>
- </child>
- </object>
- </child>
<child>
<object class="GtkBox" id="installation_box">
<property name="visible">True</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]