[gnome-software] Convert GtkBox::expand properties to hexpand/vexpand properties.
- From: Kalev Lember <klember src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] Convert GtkBox::expand properties to hexpand/vexpand properties.
- Date: Fri, 28 Sep 2018 08:06:46 +0000 (UTC)
commit 1cc857b6e4b9b8774cd7ba3cae7e467cb45c1ca6
Author: Robert Ancell <robert ancell canonical com>
Date: Wed Sep 26 12:20:47 2018 +1200
Convert GtkBox::expand properties to hexpand/vexpand properties.
GtkBox::expand is removed in GTK+ 4.
src/gnome-software.ui | 17 +----------------
src/gs-app-addon-row.ui | 8 ++------
src/gs-app-folder-dialog.ui | 4 +---
src/gs-app-row.ui | 20 ++++++--------------
src/gs-category-page.ui | 12 ++----------
src/gs-details-page.ui | 18 +++++++-----------
src/gs-editor.ui | 9 ++++-----
src/gs-feature-tile.ui | 4 +---
src/gs-history-dialog.ui | 2 +-
src/gs-overview-page.ui | 4 ++--
src/gs-popular-tile.ui | 8 ++------
src/gs-repo-row.ui | 4 +---
src/gs-repos-dialog.ui | 6 ++----
src/gs-review-dialog.ui | 6 +++---
src/gs-third-party-repo-row.ui | 4 +---
15 files changed, 36 insertions(+), 90 deletions(-)
---
diff --git a/src/gnome-software.ui b/src/gnome-software.ui
index f1082ea9..79787692 100644
--- a/src/gnome-software.ui
+++ b/src/gnome-software.ui
@@ -407,6 +407,7 @@
<property name="visible">True</property>
<property name="halign">fill</property>
<property name="valign">fill</property>
+ <property name="vexpand">True</property>
<child type="overlay">
<object class="GtkRevealer" id="notification_event">
<property name="visible">True</property>
@@ -447,9 +448,6 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
<child>
<object class="GtkButton" id="button_events_no_space">
@@ -457,9 +455,6 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
<child>
<object class="GtkButton" id="button_events_network_settings">
@@ -467,9 +462,6 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
<child>
<object class="GtkButton" id="button_events_restart_required">
@@ -477,9 +469,6 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
<child>
<object class="GtkButton" id="button_events_more_info">
@@ -487,9 +476,6 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
</object>
<packing>
@@ -599,7 +585,6 @@
</object>
<packing>
- <property name="expand">True</property>
<property name="position">2</property>
</packing>
</child>
diff --git a/src/gs-app-addon-row.ui b/src/gs-app-addon-row.ui
index b67c897f..8f643870 100644
--- a/src/gs-app-addon-row.ui
+++ b/src/gs-app-addon-row.ui
@@ -26,6 +26,7 @@
<property name="margin_start">12</property>
<property name="orientation">vertical</property>
<property name="valign">start</property>
+ <property name="hexpand">True</property>
<child>
<object class="GtkLabel" id="name_label">
<property name="visible">True</property>
@@ -45,18 +46,13 @@
<property name="max_width_chars">20</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
+ <property name="vexpand">True</property>
<style>
<class name="dim-label"/>
</style>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="label">
diff --git a/src/gs-app-folder-dialog.ui b/src/gs-app-folder-dialog.ui
index b1b31cd7..d161c1b9 100644
--- a/src/gs-app-folder-dialog.ui
+++ b/src/gs-app-folder-dialog.ui
@@ -36,6 +36,7 @@
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">none</property>
<property name="valign">fill</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkFrame" id="frame">
<property name="visible">True</property>
@@ -55,9 +56,6 @@
</object>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
</object>
</child>
diff --git a/src/gs-app-row.ui b/src/gs-app-row.ui
index 6f9054fa..dcba79b0 100644
--- a/src/gs-app-row.ui
+++ b/src/gs-app-row.ui
@@ -99,12 +99,14 @@
<property name="margin_top">3</property>
<property name="orientation">vertical</property>
<property name="spacing">3</property>
+ <property name="hexpand">True</property>
<property name="valign">center</property>
<child>
<object class="GtkLabel" id="description_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
+ <property name="vexpand">True</property>
<property name="margin_start">24</property>
<property name="margin_end">24</property>
<property name="wrap">True</property>
@@ -114,7 +116,6 @@
<property name="xalign">0</property>
</object>
<packing>
- <property name="expand">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -145,27 +146,27 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">horizontal</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkLabel" id="label_origin">
<property name="visible">True</property>
<property name="xalign">0.0</property>
<property name="yalign">1.0</property>
<property name="halign">start</property>
+ <property name="hexpand">True</property>
<property name="ellipsize">end</property>
<style>
<class name="app-row-origin-text"/>
<class name="dim-label"/>
</style>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
<child>
<object class="GtkBox" id="label_installed">
<property name="orientation">horizontal</property>
<property name="no_show_all">True</property>
<property name="halign">end</property>
+ <property name="hexpand">True</property>
<property name="valign">end</property>
<property name="spacing">6</property>
<property name="margin-right">24</property>
@@ -199,14 +200,8 @@
</packing>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
</object>
<packing>
@@ -214,9 +209,6 @@
</packing>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
<child>
<object class="GtkBox" id="vertical_box">
@@ -275,6 +267,7 @@
<property name="visible">True</property>
<property name="halign">center</property>
<property name="valign">center</property>
+ <property name="vexpand">True</property>
<property name="label">150 MB</property>
<property name="margin-top">6</property>
<style>
@@ -284,7 +277,6 @@
</object>
<packing>
<property name="pack_type">end</property>
- <property name="expand">True</property>
</packing>
</child>
</object>
diff --git a/src/gs-category-page.ui b/src/gs-category-page.ui
index 60a9103a..08ba5923 100644
--- a/src/gs-category-page.ui
+++ b/src/gs-category-page.ui
@@ -135,9 +135,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="hexpand">True</property>
</object>
<packing>
- <property name="expand">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -159,9 +159,9 @@
<property name="can_focus">False</property>
<property name="wrap">True</property>
<property name="label" translatable="yes">Extensions are used at
your own risk. If you have any system problems, it is recommended to disable them.</property>
+ <property name="hexpand">True</property>
</object>
<packing>
- <property name="expand">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -224,10 +224,6 @@
<property name="can_focus">False</property>
<property name="xalign">0.0</property>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- </packing>
</child>
<child>
<object class="GtkArrow" id="arrow1">
@@ -290,10 +286,6 @@
<property name="can_focus">False</property>
<property name="xalign">0.0</property>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- </packing>
</child>
<child>
<object class="GtkArrow" id="arrow2">
diff --git a/src/gs-details-page.ui b/src/gs-details-page.ui
index 2bde48ff..9b9f5dd3 100644
--- a/src/gs-details-page.ui
+++ b/src/gs-details-page.ui
@@ -251,18 +251,19 @@
<property name="visible">True</property>
<property name="spacing">3</property>
<property name="orientation">vertical</property>
+ <property name="hexpand">True</property>
<child>
<object class="GtkProgressBar" id="progressbar_top">
<property name="visible">True</property>
<property name="fraction">0.5</property>
<property name="valign">center</property>
+ <property name="vexpand">True</property>
<property name="width_request">624</property>
<style>
<class name="upgrade-progressbar"/>
</style>
</object>
<packing>
- <property name="expand">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -299,7 +300,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
<property name="position">4</property>
</packing>
</child>
@@ -362,12 +362,12 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
+ <property name="hexpand">True</property>
<child>
<placeholder/>
</child>
</object>
<packing>
- <property name="expand">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -420,10 +420,8 @@
<property name="icon_name">camera-photo-symbolic</property>
<property name="icon_size">6</property>
<property name="valign">end</property>
+ <property name="vexpand">True</property>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
<child>
<object class="GtkLabel">
@@ -431,11 +429,9 @@
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">start</property>
+ <property name="vexpand">True</property>
<property name="label" translatable="yes">No screenshot provided</property>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
</object>
<packing>
@@ -580,6 +576,7 @@
<property name="can_focus">False</property>
<property name="row_spacing">9</property>
<property name="column_spacing">12</property>
+ <property name="hexpand">True</property>
<child>
<object class="GtkImage" id="image_details_kudo_translated">
<property name="visible">True</property>
@@ -721,7 +718,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -731,6 +727,7 @@
<property name="can_focus">False</property>
<property name="row_spacing">9</property>
<property name="column_spacing">24</property>
+ <property name="hexpand">True</property>
<child>
<object class="GtkLabel" id="label_details_version_title">
<property name="visible">True</property>
@@ -1105,7 +1102,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
<property name="position">1</property>
</packing>
</child>
diff --git a/src/gs-editor.ui b/src/gs-editor.ui
index b94f0e8d..23598667 100644
--- a/src/gs-editor.ui
+++ b/src/gs-editor.ui
@@ -117,6 +117,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="hexpand">True</property>
<child>
<object class="GtkBox" id="box_featured">
<property name="visible">True</property>
@@ -149,6 +150,7 @@
<object class="GtkBox">
<property name="can_focus">False</property>
<property name="spacing">16</property>
+ <property name="hexpand">True</property>
<child>
<object class="GtkLabel" id="label_infobar_css">
<property name="visible">True</property>
@@ -158,13 +160,11 @@
<property name="label" translatable="yes">Error message here</property>
</object>
<packing>
- <property name="expand">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -182,6 +182,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkTextView" id="textview_css">
<property name="width_request">400</property>
@@ -196,7 +197,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
@@ -211,7 +211,6 @@
</style>
</object>
<packing>
- <property name="expand">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -430,9 +429,9 @@
<property name="label" translatable="yes" comments="button in the info
bar">Undo</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="hexpand">True</property>
</object>
<packing>
- <property name="expand">True</property>
<property name="position">0</property>
</packing>
</child>
diff --git a/src/gs-feature-tile.ui b/src/gs-feature-tile.ui
index 1e414755..52fc5af7 100644
--- a/src/gs-feature-tile.ui
+++ b/src/gs-feature-tile.ui
@@ -43,15 +43,13 @@
<property name="xalign">0</property>
<property name="halign">start</property>
<property name="valign">end</property>
+ <property name="vexpand">True</property>
<property name="wrap">True</property>
<attributes>
<attribute name="scale" value="2.5"/>
<attribute name="weight" value="700"/>
</attributes>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="subtitle">
diff --git a/src/gs-history-dialog.ui b/src/gs-history-dialog.ui
index 1be978ba..0f1c0d0c 100644
--- a/src/gs-history-dialog.ui
+++ b/src/gs-history-dialog.ui
@@ -23,6 +23,7 @@
<property name="shadow_type">none</property>
<property name="hscrollbar_policy">never</property>
<property name="vscrollbar_policy">automatic</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkFrame" id="frame">
<property name="visible">True</property>
@@ -43,7 +44,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
<property name="position">1</property>
</packing>
</child>
diff --git a/src/gs-overview-page.ui b/src/gs-overview-page.ui
index 39dbd232..ad377516 100644
--- a/src/gs-overview-page.ui
+++ b/src/gs-overview-page.ui
@@ -219,7 +219,7 @@
<object class="GtkSeparator" id="categories_expander_lsep">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
- <property name="expand">True</property>
+ <property name="hexpand">True</property>
<property name="valign">center</property>
</object>
<packing>
@@ -280,7 +280,7 @@
<object class="GtkSeparator" id="categories_expander_rsep">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
- <property name="expand">True</property>
+ <property name="hexpand">True</property>
<property name="valign">center</property>
</object>
<packing>
diff --git a/src/gs-popular-tile.ui b/src/gs-popular-tile.ui
index 146e53c5..bc2ba434 100644
--- a/src/gs-popular-tile.ui
+++ b/src/gs-popular-tile.ui
@@ -72,10 +72,8 @@
<property name="height-request">64</property>
<property name="visible">True</property>
<property name="valign">center</property>
+ <property name="vexpand">True</property>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="label">
@@ -102,15 +100,13 @@
<property name="xalign">0.5</property>
<property name="yalign">1.0</property>
<property name="halign">center</property>
+ <property name="vexpand">True</property>
<property name="ellipsize">end</property>
<style>
<class name="app-row-origin-text"/>
<class name="dim-label"/>
</style>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
</object>
</child>
diff --git a/src/gs-repo-row.ui b/src/gs-repo-row.ui
index 767a75b3..9a4e5251 100644
--- a/src/gs-repo-row.ui
+++ b/src/gs-repo-row.ui
@@ -17,6 +17,7 @@
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
+ <property name="hexpand">True</property>
<child>
<object class="GtkBox" id="hbox">
<property name="visible">True</property>
@@ -127,9 +128,6 @@
</object>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
</object>
</child>
diff --git a/src/gs-repos-dialog.ui b/src/gs-repos-dialog.ui
index f79a1d00..7a14e998 100644
--- a/src/gs-repos-dialog.ui
+++ b/src/gs-repos-dialog.ui
@@ -34,6 +34,7 @@
<child>
<object class="GtkStack" id="stack">
<property name="visible">True</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkSpinner" id="spinner">
<property name="visible">True</property>
@@ -163,6 +164,7 @@
<property name="shadow_type">in</property>
<property name="halign">fill</property>
<property name="valign">start</property>
+ <property name="vexpand">True</property>
<property name="margin_top">9</property>
<child>
<object class="GtkListBox" id="listbox">
@@ -172,9 +174,6 @@
</object>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
</object>
</child>
@@ -185,7 +184,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
<property name="position">1</property>
</packing>
</child>
diff --git a/src/gs-review-dialog.ui b/src/gs-review-dialog.ui
index 79f0fcb6..c3e0e366 100644
--- a/src/gs-review-dialog.ui
+++ b/src/gs-review-dialog.ui
@@ -71,6 +71,7 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">20</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkBox" id="box4">
<property name="visible">True</property>
@@ -175,6 +176,7 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
@@ -211,6 +213,7 @@
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkTextView" id="text_view">
<property name="visible">True</property>
@@ -224,19 +227,16 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
<property name="position">1</property>
</packing>
</child>
diff --git a/src/gs-third-party-repo-row.ui b/src/gs-third-party-repo-row.ui
index 3cc0e6c0..998c5f71 100644
--- a/src/gs-third-party-repo-row.ui
+++ b/src/gs-third-party-repo-row.ui
@@ -17,6 +17,7 @@
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
+ <property name="hexpand">True</property>
<child>
<object class="GtkBox" id="hbox">
<property name="visible">True</property>
@@ -52,9 +53,6 @@
</packing>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
<child>
<object class="GsProgressButton" id="button">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
