From 27d483f822a5708d0ea8c36b0cf01460bf6996f5 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 23 Feb 2015 15:25:23 +0100 Subject: ui: drop rest of GtkAlignments Use VBoxes and margin properties on the children. Alignments are deprecated since 3.14. --- src/applet-dialogs.c | 15 ++++++++------- src/connection-editor/ce-page-ethernet.ui | 3 +-- src/connection-editor/ce-page-general.ui | 2 +- src/connection-editor/ce-page-infiniband.ui | 3 +-- src/connection-editor/ce-page-vlan.ui | 2 +- src/connection-editor/ce-page-wifi.ui | 6 ++---- src/connection-editor/ce-page-wimax.ui | 3 +-- src/connection-editor/page-ethernet.c | 7 ++++--- src/connection-editor/page-general.c | 6 +++--- src/connection-editor/page-infiniband.c | 7 ++++--- src/connection-editor/page-vlan.c | 6 +++--- src/connection-editor/page-wifi.c | 12 +++++++----- src/connection-editor/page-wimax.c | 7 ++++--- src/gsm-unlock.ui | 3 +-- 14 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/applet-dialogs.c b/src/applet-dialogs.c index 86554ece..3122d0ae 100644 --- a/src/applet-dialogs.c +++ b/src/applet-dialogs.c @@ -1271,7 +1271,7 @@ void applet_mobile_pin_dialog_start_spinner (GtkWidget *dialog, const char *text) { GtkBuilder *builder; - GtkWidget *spinner, *widget, *hbox, *align; + GtkWidget *spinner, *widget, *hbox, *vbox; g_return_if_fail (dialog != NULL); g_return_if_fail (text != NULL); @@ -1283,8 +1283,9 @@ applet_mobile_pin_dialog_start_spinner (GtkWidget *dialog, const char *text) g_return_if_fail (spinner != NULL); g_object_set_data (G_OBJECT (dialog), "spinner", spinner); - align = GTK_WIDGET (gtk_builder_get_object (builder, "spinner_alignment")); - gtk_container_add (GTK_CONTAINER (align), spinner); + vbox = GTK_WIDGET (gtk_builder_get_object (builder, "spinner_vbox")); + gtk_container_add (GTK_CONTAINER (vbox), spinner); + gtk_widget_set_halign (spinner, GTK_ALIGN_FILL); gtk_spinner_start (GTK_SPINNER (spinner)); widget = GTK_WIDGET (gtk_builder_get_object (builder, "progress_label")); @@ -1314,7 +1315,7 @@ void applet_mobile_pin_dialog_stop_spinner (GtkWidget *dialog, const char *text) { GtkBuilder *builder; - GtkWidget *spinner, *widget, *align; + GtkWidget *spinner, *widget, *vbox; g_return_if_fail (dialog != NULL); @@ -1326,9 +1327,9 @@ applet_mobile_pin_dialog_stop_spinner (GtkWidget *dialog, const char *text) gtk_spinner_stop (GTK_SPINNER (spinner)); g_object_set_data (G_OBJECT (dialog), "spinner", NULL); - /* Remove it from the alignment */ - align = GTK_WIDGET (gtk_builder_get_object (builder, "spinner_alignment")); - gtk_container_remove (GTK_CONTAINER (align), spinner); + /* Remove it from the vbox */ + vbox = GTK_WIDGET (gtk_builder_get_object (builder, "spinner_vbox")); + gtk_container_remove (GTK_CONTAINER (vbox), spinner); widget = GTK_WIDGET (gtk_builder_get_object (builder, "progress_label")); if (text) { diff --git a/src/connection-editor/ce-page-ethernet.ui b/src/connection-editor/ce-page-ethernet.ui index 327a8e98..8e2fcb48 100644 --- a/src/connection-editor/ce-page-ethernet.ui +++ b/src/connection-editor/ce-page-ethernet.ui @@ -178,10 +178,9 @@ - + True False - 0 diff --git a/src/connection-editor/ce-page-general.ui b/src/connection-editor/ce-page-general.ui index 1944997a..c47b10eb 100644 --- a/src/connection-editor/ce-page-general.ui +++ b/src/connection-editor/ce-page-general.ui @@ -104,7 +104,7 @@ - + True True diff --git a/src/connection-editor/ce-page-infiniband.ui b/src/connection-editor/ce-page-infiniband.ui index 7773eee0..4bb2fba6 100644 --- a/src/connection-editor/ce-page-infiniband.ui +++ b/src/connection-editor/ce-page-infiniband.ui @@ -43,10 +43,9 @@ - + True False - 0 diff --git a/src/connection-editor/ce-page-vlan.ui b/src/connection-editor/ce-page-vlan.ui index 27b52658..2ea15e28 100644 --- a/src/connection-editor/ce-page-vlan.ui +++ b/src/connection-editor/ce-page-vlan.ui @@ -153,7 +153,7 @@ - + True False diff --git a/src/connection-editor/ce-page-wifi.ui b/src/connection-editor/ce-page-wifi.ui index e2e544be..beaeb9cf 100644 --- a/src/connection-editor/ce-page-wifi.ui +++ b/src/connection-editor/ce-page-wifi.ui @@ -118,10 +118,9 @@ - + True False - 0 @@ -294,10 +293,9 @@ - + True False - 0 1 diff --git a/src/connection-editor/ce-page-wimax.ui b/src/connection-editor/ce-page-wimax.ui index 5d7468b8..bdd4682b 100644 --- a/src/connection-editor/ce-page-wimax.ui +++ b/src/connection-editor/ce-page-wimax.ui @@ -10,10 +10,9 @@ 12 6 - + True False - 0 diff --git a/src/connection-editor/page-ethernet.c b/src/connection-editor/page-ethernet.c index dd3b2f18..e82c1b94 100644 --- a/src/connection-editor/page-ethernet.c +++ b/src/connection-editor/page-ethernet.c @@ -63,7 +63,7 @@ ethernet_private_init (CEPageEthernet *self) { CEPageEthernetPrivate *priv = CE_PAGE_ETHERNET_GET_PRIVATE (self); GtkBuilder *builder; - GtkWidget *align; + GtkWidget *vbox; GtkLabel *label; builder = CE_PAGE (self)->builder; @@ -73,8 +73,9 @@ ethernet_private_init (CEPageEthernet *self) gtk_widget_set_tooltip_text (GTK_WIDGET (priv->device_mac), _("This option locks this connection to the network device specified by its permanent MAC address entered here. Example: 00:11:22:33:44:55")); - align = GTK_WIDGET (gtk_builder_get_object (builder, "ethernet_device_mac_alignment")); - gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->device_mac)); + vbox = GTK_WIDGET (gtk_builder_get_object (builder, "ethernet_device_mac_vbox")); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (priv->device_mac)); + gtk_widget_set_halign (GTK_WIDGET (priv->device_mac), GTK_ALIGN_FILL); gtk_widget_show_all (GTK_WIDGET (priv->device_mac)); /* Set mnemonic widget for device MAC label */ diff --git a/src/connection-editor/page-general.c b/src/connection-editor/page-general.c index e0ad4708..85b4d743 100644 --- a/src/connection-editor/page-general.c +++ b/src/connection-editor/page-general.c @@ -135,7 +135,7 @@ general_private_init (CEPageGeneral *self) { CEPageGeneralPrivate *priv = CE_PAGE_GENERAL_GET_PRIVATE (self); GtkBuilder *builder; - GtkWidget *align; + GtkWidget *vbox; GtkLabel *label; builder = CE_PAGE (self)->builder; @@ -143,8 +143,8 @@ general_private_init (CEPageGeneral *self) /*-- Firewall zone --*/ priv->firewall_zone = GTK_COMBO_BOX_TEXT (gtk_combo_box_text_new ()); - align = GTK_WIDGET (gtk_builder_get_object (builder, "firewall_zone_alignment")); - gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->firewall_zone)); + vbox = GTK_WIDGET (gtk_builder_get_object (builder, "firewall_zone_vbox")); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (priv->firewall_zone)); gtk_widget_show_all (GTK_WIDGET (priv->firewall_zone)); /* Get zones from FirewallD */ diff --git a/src/connection-editor/page-infiniband.c b/src/connection-editor/page-infiniband.c index c2256048..7cef6b8e 100644 --- a/src/connection-editor/page-infiniband.c +++ b/src/connection-editor/page-infiniband.c @@ -49,7 +49,7 @@ infiniband_private_init (CEPageInfiniband *self) { CEPageInfinibandPrivate *priv = CE_PAGE_INFINIBAND_GET_PRIVATE (self); GtkBuilder *builder; - GtkWidget *align; + GtkWidget *vbox; GtkLabel *label; builder = CE_PAGE (self)->builder; @@ -59,8 +59,9 @@ infiniband_private_init (CEPageInfiniband *self) gtk_widget_set_tooltip_text (GTK_WIDGET (priv->device_mac), _("This option locks this connection to the network device specified by its permanent MAC address entered here. Example: 00:11:22:33:44:55")); - align = GTK_WIDGET (gtk_builder_get_object (builder, "infiniband_device_mac_alignment")); - gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->device_mac)); + vbox = GTK_WIDGET (gtk_builder_get_object (builder, "infiniband_device_mac_vbox")); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (priv->device_mac)); + gtk_widget_set_halign (GTK_WIDGET (priv->device_mac), GTK_ALIGN_FILL); gtk_widget_show_all (GTK_WIDGET (priv->device_mac)); /* Set mnemonic widget for device MAC label */ diff --git a/src/connection-editor/page-vlan.c b/src/connection-editor/page-vlan.c index e070d60b..3a7a147d 100644 --- a/src/connection-editor/page-vlan.c +++ b/src/connection-editor/page-vlan.c @@ -63,7 +63,7 @@ vlan_private_init (CEPageVlan *self) { CEPageVlanPrivate *priv = CE_PAGE_VLAN_GET_PRIVATE (self); GtkBuilder *builder; - GtkWidget *align; + GtkWidget *vbox; GtkLabel *label; builder = CE_PAGE (self)->builder; @@ -72,8 +72,8 @@ vlan_private_init (CEPageVlan *self) gtk_combo_box_set_entry_text_column (priv->parent, 0); priv->parent_entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->parent))); - align = GTK_WIDGET (gtk_builder_get_object (builder, "vlan_parent_alignment")); - gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->parent)); + vbox = GTK_WIDGET (gtk_builder_get_object (builder, "vlan_parent_vbox")); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (priv->parent)); gtk_widget_show_all (GTK_WIDGET (priv->parent)); /* Set mnemonic widget for parent label */ diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c index c6d0cc4f..97a49c3f 100644 --- a/src/connection-editor/page-wifi.c +++ b/src/connection-editor/page-wifi.c @@ -59,7 +59,7 @@ wifi_private_init (CEPageWifi *self) CEPageWifiPrivate *priv = CE_PAGE_WIFI_GET_PRIVATE (self); GtkBuilder *builder; GtkWidget *widget; - GtkWidget *align; + GtkWidget *vbox; GtkLabel *label; builder = CE_PAGE (self)->builder; @@ -78,8 +78,9 @@ wifi_private_init (CEPageWifi *self) gtk_widget_set_tooltip_text (GTK_WIDGET (priv->bssid), _("This option locks this connection to the Wi-Fi access point (AP) specified by the BSSID entered here. Example: 00:11:22:33:44:55")); - align = GTK_WIDGET (gtk_builder_get_object (builder, "wifi_bssid_alignment")); - gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->bssid)); + vbox = GTK_WIDGET (gtk_builder_get_object (builder, "wifi_bssid_vbox")); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (priv->bssid)); + gtk_widget_set_halign (GTK_WIDGET (priv->bssid), GTK_ALIGN_FILL); gtk_widget_show_all (GTK_WIDGET (priv->bssid)); /* Device MAC */ @@ -88,8 +89,9 @@ wifi_private_init (CEPageWifi *self) gtk_widget_set_tooltip_text (GTK_WIDGET (priv->device_mac), _("This option locks this connection to the network device specified by its permanent MAC address entered here. Example: 00:11:22:33:44:55")); - align = GTK_WIDGET (gtk_builder_get_object (builder, "wifi_device_mac_alignment")); - gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->device_mac)); + vbox = GTK_WIDGET (gtk_builder_get_object (builder, "wifi_device_mac_vbox")); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (priv->device_mac)); + gtk_widget_set_halign (GTK_WIDGET (priv->device_mac), GTK_ALIGN_FILL); gtk_widget_show_all (GTK_WIDGET (priv->device_mac)); /* Set mnemonic widget for device MAC label */ diff --git a/src/connection-editor/page-wimax.c b/src/connection-editor/page-wimax.c index 757f2949..aff955f5 100644 --- a/src/connection-editor/page-wimax.c +++ b/src/connection-editor/page-wimax.c @@ -41,7 +41,7 @@ wimax_private_init (CEPageWimax *self) { CEPageWimaxPrivate *priv = CE_PAGE_WIMAX_GET_PRIVATE (self); GtkBuilder *builder; - GtkWidget *align; + GtkWidget *vbox; GtkLabel *label; builder = CE_PAGE (self)->builder; @@ -53,8 +53,9 @@ wimax_private_init (CEPageWimax *self) gtk_widget_set_tooltip_text (GTK_WIDGET (priv->device_mac), _("This option locks this connection to the network device specified by its permanent MAC address entered here. Example: 00:11:22:33:44:55")); - align = GTK_WIDGET (gtk_builder_get_object (builder, "wimax_device_mac_alignment")); - gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->device_mac)); + vbox = GTK_WIDGET (gtk_builder_get_object (builder, "wimax_device_mac_vbox")); + gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (priv->device_mac)); + gtk_widget_set_halign (GTK_WIDGET (priv->device_mac), GTK_ALIGN_FILL); gtk_widget_show_all (GTK_WIDGET (priv->device_mac)); /* Set mnemonic widget for device MAC label */ diff --git a/src/gsm-unlock.ui b/src/gsm-unlock.ui index fbb87991..0bb86b3b 100644 --- a/src/gsm-unlock.ui +++ b/src/gsm-unlock.ui @@ -223,10 +223,9 @@ 6 6 - + True False - 0 -- cgit v1.2.1