[gnome-control-center/wip/gbsneto/connection-editor: 8/8] network: Use a table-like widget to edit routes
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/wip/gbsneto/connection-editor: 8/8] network: Use a table-like widget to edit routes
- Date: Tue, 23 May 2017 16:29:44 +0000 (UTC)
commit 3525a036bbd9f9f90c5ba5a1aaa6eff37186b7bd
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Tue May 23 13:04:52 2017 -0300
network: Use a table-like widget to edit routes
According to the latest mockups for the connection editor dialog [1],
the IPv4 and IPv6 pages are supposed to use a table-like editor to
manage the routes. This editor is not only easier to comprehend, but
also improves the size of the dialog, requiring much less vertical
space to present the routes.
The current implementation, however, uses a vertical layout and a toolbar,
which is inefficient in its usage of space.
Fix that by implementing the table-like editor widget, both in IPv4
and IPv6 pages.
[1]
https://raw.githubusercontent.com/gnome-design-team/gnome-mockups/master/system-settings/network/aday2/network-wires.png
https://bugzilla.gnome.org/show_bug.cgi?id=779841
panels/network/connection-editor/ce-page-ip4.c | 144 +++++++++++++----------
panels/network/connection-editor/ce-page-ip4.h | 1 -
panels/network/connection-editor/ce-page-ip6.c | 147 ++++++++++++++----------
panels/network/connection-editor/ce-page-ip6.h | 1 -
panels/network/connection-editor/ip4-page.ui | 141 ++++++++++++++---------
panels/network/connection-editor/ip6-page.ui | 141 ++++++++++++++---------
6 files changed, 343 insertions(+), 232 deletions(-)
---
diff --git a/panels/network/connection-editor/ce-page-ip4.c b/panels/network/connection-editor/ce-page-ip4.c
index 8e1a912..deb5d30 100644
--- a/panels/network/connection-editor/ce-page-ip4.c
+++ b/panels/network/connection-editor/ce-page-ip4.c
@@ -34,6 +34,8 @@
#define RADIO_IS_ACTIVE(x) (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(CE_PAGE
(page)->builder, x))))
+static void ensure_empty_routes_row (CEPageIP4 *page);
+
G_DEFINE_TYPE (CEPageIP4, ce_page_ip4, CE_TYPE_PAGE)
enum {
@@ -77,18 +79,10 @@ method_changed (GtkToggleButton *radio, CEPageIP4 *page)
}
static void
-switch_toggled (GObject *object,
- GParamSpec *pspec,
- CEPage *page)
-{
- ce_page_changed (page);
-}
-
-static void
update_row_sensitivity (CEPageIP4 *page, GtkWidget *list)
{
GList *children, *l;
- gint rows = 0;
+ gint rows = 0, i = 0;
children = gtk_container_get_children (GTK_CONTAINER (list));
for (l = children; l; l = l->next) {
@@ -105,7 +99,7 @@ update_row_sensitivity (CEPageIP4 *page, GtkWidget *list)
button = GTK_WIDGET (g_object_get_data (G_OBJECT (row), "delete-button"));
if (button != NULL)
- gtk_widget_set_sensitive (button, rows > 1);
+ gtk_widget_set_sensitive (button, rows > 1 && ++i < rows);
}
g_list_free (children);
}
@@ -235,6 +229,7 @@ add_address_row (CEPageIP4 *page,
gtk_widget_set_no_show_all (widget, FALSE);
delete_button = gtk_button_new ();
+ gtk_widget_set_sensitive (delete_button, FALSE);
gtk_style_context_add_class (gtk_widget_get_style_context (delete_button), "image-button");
g_signal_connect (delete_button, "clicked", G_CALLBACK (remove_row), page);
image = gtk_image_new_from_icon_name ("user-trash-symbolic", GTK_ICON_SIZE_MENU);
@@ -368,6 +363,29 @@ add_dns_section (CEPageIP4 *page)
g_string_free (string, TRUE);
}
+static gboolean
+validate_row (GtkWidget *row)
+{
+ GtkWidget *box;
+ GList *children, *l;
+ gboolean valid;
+
+ valid = FALSE;
+ box = gtk_bin_get_child (GTK_BIN (row));
+ children = gtk_container_get_children (GTK_CONTAINER (box));
+
+ for (l = children; l != NULL; l = l->next) {
+ if (!GTK_IS_ENTRY (l->data))
+ continue;
+
+ valid = valid || gtk_entry_get_text_length (l->data) > 0;
+ }
+
+ g_list_free (children);
+
+ return valid;
+}
+
static void
add_route_row (CEPageIP4 *page,
const gchar *address,
@@ -375,92 +393,83 @@ add_route_row (CEPageIP4 *page,
const gchar *gateway,
gint metric)
{
+ GtkSizeGroup *group;
GtkWidget *row;
- GtkWidget *row_grid;
- GtkWidget *label;
+ GtkWidget *row_box;
GtkWidget *widget;
GtkWidget *delete_button;
GtkWidget *image;
row = gtk_list_box_row_new ();
- row_grid = gtk_grid_new ();
- label = gtk_label_new (_("Address"));
- gtk_widget_set_halign (label, GTK_ALIGN_END);
- gtk_grid_attach (GTK_GRID (row_grid), label, 1, 1, 1, 1);
+ row_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ gtk_style_context_add_class (gtk_widget_get_style_context (row_box), "linked");
+
widget = gtk_entry_new ();
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+ g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
g_object_set_data (G_OBJECT (row), "address", widget);
gtk_entry_set_text (GTK_ENTRY (widget), address);
- gtk_widget_set_margin_start (widget, 10);
- gtk_widget_set_margin_end (widget, 10);
+ gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
gtk_widget_set_hexpand (widget, TRUE);
- gtk_grid_attach (GTK_GRID (row_grid), widget, 2, 1, 1, 1);
+ gtk_container_add (GTK_CONTAINER (row_box), widget);
+
+ group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder,
"routes_address_sizegroup"));
+ gtk_size_group_add_widget (group, widget);
- label = gtk_label_new (_("Netmask"));
- gtk_widget_set_halign (label, GTK_ALIGN_END);
- gtk_grid_attach (GTK_GRID (row_grid), label, 1, 2, 1, 1);
widget = gtk_entry_new ();
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+ g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
g_object_set_data (G_OBJECT (row), "netmask", widget);
gtk_entry_set_text (GTK_ENTRY (widget), netmask);
- gtk_widget_set_margin_start (widget, 10);
- gtk_widget_set_margin_end (widget, 10);
+ gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
gtk_widget_set_hexpand (widget, TRUE);
- gtk_grid_attach (GTK_GRID (row_grid), widget, 2, 2, 1, 1);
+ gtk_container_add (GTK_CONTAINER (row_box), widget);
+
+ group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder,
"routes_netmask_sizegroup"));
+ gtk_size_group_add_widget (group, widget);
- label = gtk_label_new (_("Gateway"));
- gtk_widget_set_halign (label, GTK_ALIGN_END);
- gtk_grid_attach (GTK_GRID (row_grid), label, 1, 3, 1, 1);
widget = gtk_entry_new ();
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+ g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
g_object_set_data (G_OBJECT (row), "gateway", widget);
gtk_entry_set_text (GTK_ENTRY (widget), gateway);
- gtk_widget_set_margin_start (widget, 10);
- gtk_widget_set_margin_end (widget, 10);
+ gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
gtk_widget_set_hexpand (widget, TRUE);
- gtk_grid_attach (GTK_GRID (row_grid), widget, 2, 3, 1, 1);
+ gtk_container_add (GTK_CONTAINER (row_box), widget);
+
+ group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder,
"routes_gateway_sizegroup"));
+ gtk_size_group_add_widget (group, widget);
/* Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) */
- label = gtk_label_new (C_("network parameters", "Metric"));
- gtk_widget_set_halign (label, GTK_ALIGN_END);
- gtk_grid_attach (GTK_GRID (row_grid), label, 1, 4, 1, 1);
widget = gtk_entry_new ();
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+ g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
g_object_set_data (G_OBJECT (row), "metric", widget);
if (metric >= 0) {
gchar *s = g_strdup_printf ("%d", metric);
gtk_entry_set_text (GTK_ENTRY (widget), s);
g_free (s);
}
- gtk_widget_set_margin_start (widget, 10);
- gtk_widget_set_margin_end (widget, 10);
+ gtk_entry_set_width_chars (GTK_ENTRY (widget), 5);
gtk_widget_set_hexpand (widget, TRUE);
- gtk_grid_attach (GTK_GRID (row_grid), widget, 2, 4, 1, 1);
+ gtk_container_add (GTK_CONTAINER (row_box), widget);
+
+ group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_metric_sizegroup"));
+ gtk_size_group_add_widget (group, widget);
delete_button = gtk_button_new ();
gtk_style_context_add_class (gtk_widget_get_style_context (delete_button), "image-button");
g_signal_connect (delete_button, "clicked", G_CALLBACK (remove_row), page);
- image = gtk_image_new_from_icon_name ("user-trash-symbolic", GTK_ICON_SIZE_MENU);
+ image = gtk_image_new_from_icon_name ("edit-delete-symbolic", GTK_ICON_SIZE_MENU);
atk_object_set_name (gtk_widget_get_accessible (delete_button), _("Delete Route"));
gtk_button_set_image (GTK_BUTTON (delete_button), image);
gtk_widget_set_halign (delete_button, GTK_ALIGN_CENTER);
gtk_widget_set_valign (delete_button, GTK_ALIGN_CENTER);
- gtk_grid_attach (GTK_GRID (row_grid), delete_button, 3, 1, 1, 4);
+ gtk_container_add (GTK_CONTAINER (row_box), delete_button);
g_object_set_data (G_OBJECT (row), "delete-button", delete_button);
- gtk_grid_set_row_spacing (GTK_GRID (row_grid), 10);
- gtk_widget_set_margin_start (row_grid, 10);
- gtk_widget_set_margin_end (row_grid, 10);
- gtk_widget_set_margin_top (row_grid, 10);
- gtk_widget_set_margin_bottom (row_grid, 10);
- gtk_widget_set_halign (row_grid, GTK_ALIGN_FILL);
-
- gtk_container_add (GTK_CONTAINER (row), row_grid);
+ gtk_container_add (GTK_CONTAINER (row), row_box);
gtk_widget_show_all (row);
gtk_container_add (GTK_CONTAINER (page->routes_list), row);
@@ -468,33 +477,37 @@ add_route_row (CEPageIP4 *page,
}
static void
-add_empty_route_row (CEPageIP4 *page)
+ensure_empty_routes_row (CEPageIP4 *page)
{
- add_route_row (page, "", "", "", -1);
+ GList *children, *l;
+
+ children = gtk_container_get_children (GTK_CONTAINER (page->routes_list));
+ l = children;
+
+ while (l && l->next)
+ l = l->next;
+
+ /* Add the last, stub row if needed*/
+ if (!l || validate_row (l->data))
+ add_route_row (page, "", "", "", -1);
+
+ g_list_free (children);
}
static void
add_routes_section (CEPageIP4 *page)
{
GtkWidget *widget;
- GtkWidget *frame;
GtkWidget *list;
gint i;
widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_section"));
- frame = gtk_frame_new (NULL);
- gtk_container_add (GTK_CONTAINER (widget), frame);
page->routes_list = list = gtk_list_box_new ();
gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE);
gtk_list_box_set_header_func (GTK_LIST_BOX (list), cc_list_box_update_header_func, NULL, NULL);
gtk_list_box_set_sort_func (GTK_LIST_BOX (list), (GtkListBoxSortFunc)sort_first_last, NULL, NULL);
- gtk_container_add (GTK_CONTAINER (frame), list);
- page->auto_routes = GTK_SWITCH (gtk_builder_get_object (CE_PAGE (page)->builder,
"auto_routes_switch"));
- gtk_switch_set_active (page->auto_routes, !nm_setting_ip_config_get_ignore_auto_routes
(page->setting));
- g_signal_connect (page->auto_routes, "notify::active", G_CALLBACK (switch_toggled), page);
-
- add_section_toolbar (page, widget, G_CALLBACK (add_empty_route_row));
+ gtk_container_add (GTK_CONTAINER (widget), list);
for (i = 0; i < nm_setting_ip_config_get_num_routes (page->setting); i++) {
NMIPRoute *route;
@@ -515,7 +528,7 @@ add_routes_section (CEPageIP4 *page)
nm_ip_route_get_metric (route));
}
if (nm_setting_ip_config_get_num_routes (page->setting) == 0)
- add_empty_route_row (page);
+ ensure_empty_routes_row (page);
gtk_widget_show_all (widget);
}
@@ -830,6 +843,9 @@ ui_to_setting (CEPageIP4 *page)
route = nm_ip_route_new (AF_INET, text_address, netmask, text_gateway, metric, NULL);
if (route)
g_ptr_array_add (routes, route);
+
+ if (!l || !l->next)
+ ensure_empty_routes_row (page);
}
g_list_free (children);
@@ -842,7 +858,7 @@ ui_to_setting (CEPageIP4 *page)
goto out;
ignore_auto_dns = g_utf8_strlen (dns_text, -1) > 0;
- ignore_auto_routes = !gtk_switch_get_active (page->auto_routes);
+ ignore_auto_routes = routes != NULL;
never_default = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (page->never_default));
g_object_set (page->setting,
diff --git a/panels/network/connection-editor/ce-page-ip4.h b/panels/network/connection-editor/ce-page-ip4.h
index 100075f..8441a2f 100644
--- a/panels/network/connection-editor/ce-page-ip4.h
+++ b/panels/network/connection-editor/ce-page-ip4.h
@@ -48,7 +48,6 @@ struct _CEPageIP4
GtkToggleButton *disabled;
GtkWidget *address_list;
GtkWidget *dns_entry;
- GtkSwitch *auto_routes;
GtkWidget *routes_list;
GtkWidget *never_default;
};
diff --git a/panels/network/connection-editor/ce-page-ip6.c b/panels/network/connection-editor/ce-page-ip6.c
index c2b8109..cc2544a 100644
--- a/panels/network/connection-editor/ce-page-ip6.c
+++ b/panels/network/connection-editor/ce-page-ip6.c
@@ -34,6 +34,8 @@
#define RADIO_IS_ACTIVE(x) (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(CE_PAGE
(page)->builder, x))))
+static void ensure_empty_routes_row (CEPageIP6 *page);
+
G_DEFINE_TYPE (CEPageIP6, ce_page_ip6, CE_TYPE_PAGE)
enum {
@@ -78,18 +80,10 @@ method_changed (GtkToggleButton *button, CEPageIP6 *page)
}
static void
-switch_toggled (GObject *object,
- GParamSpec *pspec,
- CEPage *page)
-{
- ce_page_changed (page);
-}
-
-static void
update_row_sensitivity (CEPageIP6 *page, GtkWidget *list)
{
GList *children, *l;
- gint rows = 0;
+ gint rows = 0, i = 0;
children = gtk_container_get_children (GTK_CONTAINER (list));
for (l = children; l; l = l->next) {
@@ -106,7 +100,7 @@ update_row_sensitivity (CEPageIP6 *page, GtkWidget *list)
button = GTK_WIDGET (g_object_get_data (G_OBJECT (row), "delete-button"));
if (button != NULL)
- gtk_widget_set_sensitive (button, rows > 1);
+ gtk_widget_set_sensitive (button, rows > 1 && ++i < rows);
}
g_list_free (children);
}
@@ -333,6 +327,30 @@ add_dns_section (CEPageIP6 *page)
g_string_free (string, TRUE);
}
+
+static gboolean
+validate_row (GtkWidget *row)
+{
+ GtkWidget *box;
+ GList *children, *l;
+ gboolean valid;
+
+ valid = FALSE;
+ box = gtk_bin_get_child (GTK_BIN (row));
+ children = gtk_container_get_children (GTK_CONTAINER (box));
+
+ for (l = children; l != NULL; l = l->next) {
+ if (!GTK_IS_ENTRY (l->data))
+ continue;
+
+ valid = valid || gtk_entry_get_text_length (l->data) > 0;
+ }
+
+ g_list_free (children);
+
+ return valid;
+}
+
static void
add_route_row (CEPageIP6 *page,
const gchar *address,
@@ -340,88 +358,78 @@ add_route_row (CEPageIP6 *page,
const gchar *gateway,
const gchar *metric)
{
+ GtkSizeGroup *group;
GtkWidget *row;
- GtkWidget *row_grid;
- GtkWidget *label;
+ GtkWidget *row_box;
GtkWidget *widget;
GtkWidget *delete_button;
GtkWidget *image;
row = gtk_list_box_row_new ();
- row_grid = gtk_grid_new ();
- label = gtk_label_new (_("Address"));
- gtk_widget_set_halign (label, GTK_ALIGN_END);
- gtk_grid_attach (GTK_GRID (row_grid), label, 1, 1, 1, 1);
+ row_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ gtk_style_context_add_class (gtk_widget_get_style_context (row_box), "linked");
+
widget = gtk_entry_new ();
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+ g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
g_object_set_data (G_OBJECT (row), "address", widget);
gtk_entry_set_text (GTK_ENTRY (widget), address);
- gtk_widget_set_margin_start (widget, 10);
- gtk_widget_set_margin_end (widget, 10);
+ gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
gtk_widget_set_hexpand (widget, TRUE);
- gtk_grid_attach (GTK_GRID (row_grid), widget, 2, 1, 1, 1);
+ gtk_container_add (GTK_CONTAINER (row_box), widget);
+
+ group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder,
"routes_address_sizegroup"));
+ gtk_size_group_add_widget (group, widget);
- label = gtk_label_new (_("Prefix"));
- gtk_widget_set_halign (label, GTK_ALIGN_END);
- gtk_grid_attach (GTK_GRID (row_grid), label, 1, 2, 1, 1);
widget = gtk_entry_new ();
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+ g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
g_object_set_data (G_OBJECT (row), "prefix", widget);
gtk_entry_set_text (GTK_ENTRY (widget), prefix ? prefix : "");
- gtk_widget_set_margin_start (widget, 10);
- gtk_widget_set_margin_end (widget, 10);
+ gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
gtk_widget_set_hexpand (widget, TRUE);
- gtk_grid_attach (GTK_GRID (row_grid), widget, 2, 2, 1, 1);
+ gtk_container_add (GTK_CONTAINER (row_box), widget);
+
+ group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_prefix_sizegroup"));
+ gtk_size_group_add_widget (group, widget);
- label = gtk_label_new (_("Gateway"));
- gtk_widget_set_halign (label, GTK_ALIGN_END);
- gtk_grid_attach (GTK_GRID (row_grid), label, 1, 3, 1, 1);
widget = gtk_entry_new ();
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+ g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
g_object_set_data (G_OBJECT (row), "gateway", widget);
gtk_entry_set_text (GTK_ENTRY (widget), gateway);
- gtk_widget_set_margin_start (widget, 10);
- gtk_widget_set_margin_end (widget, 10);
+ gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
gtk_widget_set_hexpand (widget, TRUE);
- gtk_grid_attach (GTK_GRID (row_grid), widget, 2, 3, 1, 1);
+ gtk_container_add (GTK_CONTAINER (row_box), widget);
+
+ group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder,
"routes_gateway_sizegroup"));
+ gtk_size_group_add_widget (group, widget);
- /* Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) */
- label = gtk_label_new (C_("network parameters", "Metric"));
- gtk_widget_set_halign (label, GTK_ALIGN_END);
- gtk_grid_attach (GTK_GRID (row_grid), label, 1, 4, 1, 1);
widget = gtk_entry_new ();
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
+ g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
g_object_set_data (G_OBJECT (row), "metric", widget);
gtk_entry_set_text (GTK_ENTRY (widget), metric ? metric : "");
- gtk_widget_set_margin_start (widget, 10);
- gtk_widget_set_margin_end (widget, 10);
+ gtk_entry_set_width_chars (GTK_ENTRY (widget), 5);
gtk_widget_set_hexpand (widget, TRUE);
- gtk_grid_attach (GTK_GRID (row_grid), widget, 2, 4, 1, 1);
+ gtk_container_add (GTK_CONTAINER (row_box), widget);
+
+ group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_metric_sizegroup"));
+ gtk_size_group_add_widget (group, widget);
delete_button = gtk_button_new ();
gtk_style_context_add_class (gtk_widget_get_style_context (delete_button), "image-button");
g_signal_connect (delete_button, "clicked", G_CALLBACK (remove_row), page);
- image = gtk_image_new_from_icon_name ("user-trash-symbolic", GTK_ICON_SIZE_MENU);
+ image = gtk_image_new_from_icon_name ("edit-delete-symbolic", GTK_ICON_SIZE_MENU);
atk_object_set_name (gtk_widget_get_accessible (delete_button), _("Delete Route"));
gtk_button_set_image (GTK_BUTTON (delete_button), image);
gtk_widget_set_halign (delete_button, GTK_ALIGN_CENTER);
gtk_widget_set_valign (delete_button, GTK_ALIGN_CENTER);
- gtk_grid_attach (GTK_GRID (row_grid), delete_button, 3, 1, 1, 4);
+ gtk_container_add (GTK_CONTAINER (row_box), delete_button);
g_object_set_data (G_OBJECT (row), "delete-button", delete_button);
- gtk_grid_set_row_spacing (GTK_GRID (row_grid), 10);
- gtk_widget_set_margin_start (row_grid, 10);
- gtk_widget_set_margin_end (row_grid, 10);
- gtk_widget_set_margin_top (row_grid, 10);
- gtk_widget_set_margin_bottom (row_grid, 10);
- gtk_widget_set_halign (row_grid, GTK_ALIGN_FILL);
-
- gtk_container_add (GTK_CONTAINER (row), row_grid);
+ gtk_container_add (GTK_CONTAINER (row), row_box);
gtk_widget_show_all (row);
gtk_container_add (GTK_CONTAINER (page->routes_list), row);
@@ -429,6 +437,24 @@ add_route_row (CEPageIP6 *page,
}
static void
+ensure_empty_routes_row (CEPageIP6 *page)
+{
+ GList *children, *l;
+
+ children = gtk_container_get_children (GTK_CONTAINER (page->routes_list));
+ l = children;
+
+ while (l && l->next)
+ l = l->next;
+
+ /* Add the last, stub row if needed*/
+ if (!l || validate_row (l->data))
+ add_route_row (page, "", NULL, "", NULL);
+
+ g_list_free (children);
+}
+
+static void
add_empty_route_row (CEPageIP6 *page)
{
add_route_row (page, "", NULL, "", NULL);
@@ -438,24 +464,16 @@ static void
add_routes_section (CEPageIP6 *page)
{
GtkWidget *widget;
- GtkWidget *frame;
GtkWidget *list;
gint i;
widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_section"));
- frame = gtk_frame_new (NULL);
- gtk_container_add (GTK_CONTAINER (widget), frame);
page->routes_list = list = gtk_list_box_new ();
gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE);
gtk_list_box_set_header_func (GTK_LIST_BOX (list), cc_list_box_update_header_func, NULL, NULL);
gtk_list_box_set_sort_func (GTK_LIST_BOX (list), (GtkListBoxSortFunc)sort_first_last, NULL, NULL);
- gtk_container_add (GTK_CONTAINER (frame), list);
- page->auto_routes = GTK_SWITCH (gtk_builder_get_object (CE_PAGE (page)->builder,
"auto_routes_switch"));
- gtk_switch_set_active (page->auto_routes, !nm_setting_ip_config_get_ignore_auto_routes
(page->setting));
- g_signal_connect (page->auto_routes, "notify::active", G_CALLBACK (switch_toggled), page);
-
- add_section_toolbar (page, widget, G_CALLBACK (add_empty_route_row));
+ gtk_container_add (GTK_CONTAINER (widget), list);
for (i = 0; i < nm_setting_ip_config_get_num_routes (page->setting); i++) {
NMIPRoute *route;
@@ -696,6 +714,7 @@ ui_to_setting (CEPageIP6 *page)
else
children = NULL;
+ ignore_auto_routes = FALSE;
for (l = children; l; l = l->next) {
GtkWidget *row = l->data;
GtkEntry *entry;
@@ -767,6 +786,11 @@ ui_to_setting (CEPageIP6 *page)
route = nm_ip_route_new (AF_INET6, text_address, prefix, text_gateway, metric, NULL);
nm_setting_ip_config_add_route (page->setting, route);
nm_ip_route_unref (route);
+
+ ignore_auto_routes = TRUE;
+
+ if (!l || !l->next)
+ ensure_empty_routes_row (page);
}
g_list_free (children);
@@ -774,7 +798,6 @@ ui_to_setting (CEPageIP6 *page)
goto out;
ignore_auto_dns = g_utf8_strlen (dns_text, -1) > 0;
- ignore_auto_routes = !gtk_switch_get_active (page->auto_routes);
never_default = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (page->never_default));
g_object_set (page->setting,
diff --git a/panels/network/connection-editor/ce-page-ip6.h b/panels/network/connection-editor/ce-page-ip6.h
index b06464b..57dd21e 100644
--- a/panels/network/connection-editor/ce-page-ip6.h
+++ b/panels/network/connection-editor/ce-page-ip6.h
@@ -48,7 +48,6 @@ struct _CEPageIP6
GtkToggleButton *disabled;
GtkWidget *address_list;
GtkWidget *dns_entry;
- GtkSwitch *auto_routes;
GtkWidget *routes_list;
GtkWidget *never_default;
};
diff --git a/panels/network/connection-editor/ip4-page.ui b/panels/network/connection-editor/ip4-page.ui
index fa9e392..00dad1a 100644
--- a/panels/network/connection-editor/ip4-page.ui
+++ b/panels/network/connection-editor/ip4-page.ui
@@ -153,62 +153,19 @@
</object>
</child>
<child>
- <object class="GtkBox" id="box3">
+ <object class="GtkLabel" id="heading_routes">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Routes</property>
<property name="margin_top">24</property>
- <property name="margin_bottom">5</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="heading_routes">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Routes</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Automatic</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSwitch" id="auto_routes_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="auto_routes_switch-accessible">
- <property name="accessible-name" translatable="yes">Automatic Routes</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="margin_bottom">6</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
@@ -218,7 +175,63 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <placeholder/>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">horizontal</property>
+ <child>
+ <object class="GtkLabel" id="routes_address_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Address</property>
+ <style>
+ <class name="dim-label" />
+ </style>
+ <attributes>
+ <attribute name="scale" value="0.8"/>
+ </attributes>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="routes_netmask_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Netmask</property>
+ <style>
+ <class name="dim-label" />
+ </style>
+ <attributes>
+ <attribute name="scale" value="0.8"/>
+ </attributes>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="routes_gateway_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Gateway</property>
+ <style>
+ <class name="dim-label" />
+ </style>
+ <attributes>
+ <attribute name="scale" value="0.8"/>
+ </attributes>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="routes_metric_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" comments="Translators: Please see
https://en.wikipedia.org/wiki/Metrics_(networking)">Metric</property>
+ <style>
+ <class name="dim-label" />
+ </style>
+ <attributes>
+ <attribute name="scale" value="0.8"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
</child>
</object>
<packing>
@@ -255,4 +268,28 @@
</object>
</child>
</object>
+ <object class="GtkSizeGroup" id="routes_address_sizegroup">
+ <property name="mode">horizontal</property>
+ <widgets>
+ <widget name="routes_address_label" />
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="routes_netmask_sizegroup">
+ <property name="mode">horizontal</property>
+ <widgets>
+ <widget name="routes_netmask_label" />
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="routes_gateway_sizegroup">
+ <property name="mode">horizontal</property>
+ <widgets>
+ <widget name="routes_gateway_label" />
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="routes_metric_sizegroup">
+ <property name="mode">horizontal</property>
+ <widgets>
+ <widget name="routes_metric_label" />
+ </widgets>
+ </object>
</interface>
diff --git a/panels/network/connection-editor/ip6-page.ui b/panels/network/connection-editor/ip6-page.ui
index cb4e356..feaedde 100644
--- a/panels/network/connection-editor/ip6-page.ui
+++ b/panels/network/connection-editor/ip6-page.ui
@@ -165,62 +165,19 @@
</object>
</child>
<child>
- <object class="GtkBox" id="box3">
+ <object class="GtkLabel" id="heading_routes">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Routes</property>
<property name="margin_top">24</property>
- <property name="margin_bottom">5</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="heading_routes">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Routes</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Automatic</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSwitch" id="auto_routes_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="auto_routes_switch-accessible">
- <property name="accessible-name" translatable="yes">Automatic Routes</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="margin_bottom">6</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
@@ -230,7 +187,63 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <placeholder/>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">horizontal</property>
+ <child>
+ <object class="GtkLabel" id="routes_address_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Address</property>
+ <style>
+ <class name="dim-label" />
+ </style>
+ <attributes>
+ <attribute name="scale" value="0.8"/>
+ </attributes>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="routes_prefix_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Prefix</property>
+ <style>
+ <class name="dim-label" />
+ </style>
+ <attributes>
+ <attribute name="scale" value="0.8"/>
+ </attributes>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="routes_gateway_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Gateway</property>
+ <style>
+ <class name="dim-label" />
+ </style>
+ <attributes>
+ <attribute name="scale" value="0.8"/>
+ </attributes>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="routes_metric_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" comments="Translators: Please see
https://en.wikipedia.org/wiki/Metrics_(networking)">Metric</property>
+ <style>
+ <class name="dim-label" />
+ </style>
+ <attributes>
+ <attribute name="scale" value="0.8"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
</child>
</object>
<packing>
@@ -267,4 +280,28 @@
</object>
</child>
</object>
+ <object class="GtkSizeGroup" id="routes_address_sizegroup">
+ <property name="mode">horizontal</property>
+ <widgets>
+ <widget name="routes_address_label" />
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="routes_prefix_sizegroup">
+ <property name="mode">horizontal</property>
+ <widgets>
+ <widget name="routes_prefix_label" />
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="routes_gateway_sizegroup">
+ <property name="mode">horizontal</property>
+ <widgets>
+ <widget name="routes_gateway_label" />
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="routes_metric_sizegroup">
+ <property name="mode">horizontal</property>
+ <widgets>
+ <widget name="routes_metric_label" />
+ </widgets>
+ </object>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
