[network-manager-applet: 5/7] editor: allow toggling sensitivity of combo box IP methods on IPv4 page
- From: Jiří Klimeš <jklimes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet: 5/7] editor: allow toggling sensitivity of combo box IP methods on IPv4 page
- Date: Wed, 14 Oct 2015 07:53:53 +0000 (UTC)
commit 65e002554df5c72eff8f9783ade44fe6028218c1
Author: Jiří Klimeš <jklimes redhat com>
Date: Tue Oct 13 13:55:59 2015 +0200
editor: allow toggling sensitivity of combo box IP methods on IPv4 page
It is done the same way as for IPv6 methods.
src/connection-editor/page-ip4.c | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/src/connection-editor/page-ip4.c b/src/connection-editor/page-ip4.c
index e7c4fdd..7989a0f 100644
--- a/src/connection-editor/page-ip4.c
+++ b/src/connection-editor/page-ip4.c
@@ -94,6 +94,7 @@ typedef struct {
#define METHOD_COL_NAME 0
#define METHOD_COL_NUM 1
+#define METHOD_COL_ENABLED 2
#define IP4_METHOD_AUTO 0
#define IP4_METHOD_AUTO_ADDRESSES 1
@@ -111,6 +112,7 @@ ip4_private_init (CEPageIP4 *self, NMConnection *connection)
NMSettingConnection *s_con;
const char *connection_type;
char *str_auto = NULL, *str_auto_only = NULL;
+ GList *cells;
builder = CE_PAGE (self)->builder;
@@ -137,19 +139,24 @@ ip4_private_init (CEPageIP4 *self, NMConnection *connection)
}
priv->method = GTK_COMBO_BOX (gtk_builder_get_object (builder, "ip4_method"));
+ cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (priv->method));
+ gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (priv->method), cells->data,
+ "sensitive", METHOD_COL_ENABLED);
- priv->method_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_UINT);
+ priv->method_store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_BOOLEAN);
gtk_list_store_append (priv->method_store, &iter);
gtk_list_store_set (priv->method_store, &iter,
METHOD_COL_NAME, str_auto,
METHOD_COL_NUM, IP4_METHOD_AUTO,
+ METHOD_COL_ENABLED, TRUE,
-1);
gtk_list_store_append (priv->method_store, &iter);
gtk_list_store_set (priv->method_store, &iter,
METHOD_COL_NAME, str_auto_only,
METHOD_COL_NUM, IP4_METHOD_AUTO_ADDRESSES,
+ METHOD_COL_ENABLED, TRUE,
-1);
/* Manual is pointless for Mobile Broadband */
@@ -160,6 +167,7 @@ ip4_private_init (CEPageIP4 *self, NMConnection *connection)
gtk_list_store_set (priv->method_store, &iter,
METHOD_COL_NAME, _("Manual"),
METHOD_COL_NUM, IP4_METHOD_MANUAL,
+ METHOD_COL_ENABLED, TRUE,
-1);
}
@@ -172,12 +180,14 @@ ip4_private_init (CEPageIP4 *self, NMConnection *connection)
gtk_list_store_set (priv->method_store, &iter,
METHOD_COL_NAME, _("Link-Local Only"),
METHOD_COL_NUM, IP4_METHOD_LINK_LOCAL,
+ METHOD_COL_ENABLED, TRUE,
-1);
gtk_list_store_append (priv->method_store, &iter);
gtk_list_store_set (priv->method_store, &iter,
METHOD_COL_NAME, _("Shared to other computers"),
METHOD_COL_NUM, IP4_METHOD_SHARED,
+ METHOD_COL_ENABLED, TRUE,
-1);
}
@@ -187,6 +197,7 @@ ip4_private_init (CEPageIP4 *self, NMConnection *connection)
gtk_list_store_set (priv->method_store, &iter,
METHOD_COL_NAME, _("Disabled"),
METHOD_COL_NUM, IP4_METHOD_DISABLED,
+ METHOD_COL_ENABLED, TRUE,
-1);
}
gtk_combo_box_set_model (priv->method, GTK_TREE_MODEL (priv->method_store));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]