GNOME.org
 

[network-manager-applet/general-page: 1/5] editor: add a "General" page for 'connection' setting properties

commit fd9787e0a14417ecc018a9d6e3d7f310f52227ab
Author: JiÅÃ KlimeÅ <jklimes redhat com>
Date:   Thu Oct 4 16:00:34 2012 -0400

    editor: add a "General" page for 'connection' setting properties
    
    and add "Firewall zone" combo box.
    
    Firewall zones bits are based on a patch from Thomas Woerner <twoerner redhat com>.

 src/connection-editor/Makefile.am            |    3 +
 src/connection-editor/ce-page-general.ui     |   42 ++++
 src/connection-editor/nm-connection-editor.c |    3 +
 src/connection-editor/page-general.c         |  269 ++++++++++++++++++++++++++
 src/connection-editor/page-general.h         |   56 ++++++
 5 files changed, 373 insertions(+), 0 deletions(-)
---
diff --git a/src/connection-editor/Makefile.am b/src/connection-editor/Makefile.am
index 08cbb7f..912d472 100644
--- a/src/connection-editor/Makefile.am
+++ b/src/connection-editor/Makefile.am
@@ -26,6 +26,8 @@ nm_connection_editor_SOURCES = \
 	main.c \
 	ce-page.h \
 	ce-page.c \
+	page-general.h \
+	page-general.c \
 	page-ethernet.h \
 	page-ethernet.c \
 	page-8021x-security.h \
@@ -83,6 +85,7 @@ uidir = $(datadir)/nm-applet
 ui_DATA = \
 	nm-connection-editor.ui \
 	ce-new-connection.ui \
+	ce-page-general.ui \
 	ce-page-ethernet.ui \
 	ce-page-wifi.ui \
 	ce-page-wifi-security.ui \
diff --git a/src/connection-editor/ce-page-general.ui b/src/connection-editor/ce-page-general.ui
new file mode 100644
index 0000000..72c8e05
--- /dev/null
+++ b/src/connection-editor/ce-page-general.ui
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.16"/>
+  <object class="GtkTable" id="GeneralPage">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="border_width">12</property>
+    <property name="n_rows">1</property>
+    <property name="n_columns">2</property>
+    <property name="column_spacing">12</property>
+    <property name="row_spacing">6</property>
+    <child>
+      <object class="GtkLabel" id="firewall_zone_label">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="xalign">0</property>
+        <property name="label" translatable="yes">Firewall _zone:</property>
+        <property name="use_underline">True</property>
+      </object>
+      <packing>
+        <property name="right_attach">1</property>
+        <property name="top_attach">0</property>
+        <property name="bottom_attach">1</property>
+        <property name="x_options">GTK_FILL</property>
+        <property name="y_options"></property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkAlignment" id="firewall_zone_alignment">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="right_attach">2</property>
+        <property name="top_attach">0</property>
+        <property name="bottom_attach">1</property>
+        <property name="y_options"></property>
+      </packing>
+    </child>
+  </object>
+</interface>
diff --git a/src/connection-editor/nm-connection-editor.c b/src/connection-editor/nm-connection-editor.c
index a17e365..7612567 100644
--- a/src/connection-editor/nm-connection-editor.c
+++ b/src/connection-editor/nm-connection-editor.c
@@ -56,6 +56,7 @@
 #include "nma-marshal.h"
 
 #include "ce-page.h"
+#include "page-general.h"
 #include "page-ethernet.h"
 #include "page-8021x-security.h"
 #include "page-wifi.h"
@@ -821,6 +822,8 @@ nm_connection_editor_set_connection (NMConnectionEditor *editor,
 	g_assert (s_con);
 
 	connection_type = nm_setting_connection_get_connection_type (s_con);
+	if (!add_page (editor, ce_page_general_new, editor->connection, error))
+		goto out;
 	if (!strcmp (connection_type, NM_SETTING_WIRED_SETTING_NAME)) {
 		if (!add_page (editor, ce_page_ethernet_new, editor->connection, error))
 			goto out;
diff --git a/src/connection-editor/page-general.c b/src/connection-editor/page-general.c
new file mode 100644
index 0000000..0cc7dd3
--- /dev/null
+++ b/src/connection-editor/page-general.c
@@ -0,0 +1,269 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager Connection editor -- Connection editor for NetworkManager
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2012 Red Hat, Inc.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
+#include <nm-setting-connection.h>
+
+#include "page-general.h"
+
+G_DEFINE_TYPE (CEPageGeneral, ce_page_general, CE_TYPE_PAGE)
+
+#define CE_PAGE_GENERAL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CE_TYPE_PAGE_GENERAL, CEPageGeneralPrivate))
+
+typedef struct {
+	NMSettingConnection *setting;
+
+#if GTK_CHECK_VERSION(2,24,0)
+	GtkComboBoxText *firewall_zone;
+#else
+	GtkComboBox *firewall_zone;
+#endif
+} CEPageGeneralPrivate;
+
+/* TRANSLATORS: Default zone set for firewall, when no zone is selected */
+#define FIREWALL_ZONE_DEFAULT _("Default")
+#define FIREWALL_ZONE_TOOLTIP_AVAILBALE _("The zone defines the trust level of the connection. Default is not a regular zone, selecting it results in the use of the default zone set in the firewall. Only usable if firewalld is active.")
+#define FIREWALL_ZONE_TOOLTIP_UNAVAILBALE _("FirewallD is not running.")
+
+static void
+general_private_init (CEPageGeneral *self)
+{
+	CEPageGeneralPrivate *priv = CE_PAGE_GENERAL_GET_PRIVATE (self);
+	GtkBuilder *builder;
+	GtkWidget *align;
+	GtkLabel *label;
+
+	builder = CE_PAGE (self)->builder;
+
+	/*-- Firewall zone --*/
+#if GTK_CHECK_VERSION(2,24,0)
+	priv->firewall_zone = GTK_COMBO_BOX_TEXT (gtk_combo_box_text_new ());
+#else
+	priv->firewall_zone = GTK_COMBO_BOX (gtk_combo_box_new_text ());
+#endif
+
+	align = GTK_WIDGET (gtk_builder_get_object (builder, "firewall_zone_alignment"));
+	gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->firewall_zone));
+	gtk_widget_show_all (GTK_WIDGET (priv->firewall_zone));
+
+	/* Set mnemonic widget for device Firewall zone label */
+	label = GTK_LABEL (GTK_WIDGET (gtk_builder_get_object (builder, "firewall_zone_label")));
+	gtk_label_set_mnemonic_widget (label, GTK_WIDGET (priv->firewall_zone));
+}
+
+static void
+stuff_changed (GtkWidget *w, gpointer user_data)
+{
+	ce_page_changed (CE_PAGE (user_data));
+}
+
+/* Get zones from firewalld */
+static char **
+get_zones_from_firewall (void)
+{
+	DBusGConnection *bus;
+	GError *error = NULL;
+	DBusGProxy *proxy;
+	char **zones;
+
+	bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
+	if (error || !bus) {
+		g_message ("Getting zones from FirewallD not possible (failed to connect to D-Bus: %s).",
+		           (error && error->message) ? error->message : "unknown");
+		g_error_free (error);
+	} else {
+		proxy = dbus_g_proxy_new_for_name (bus,
+		                                   "org.fedoraproject.FirewallD1",
+		                                   "/org/fedoraproject/FirewallD1",
+		                                   "org.fedoraproject.FirewallD1.zone");
+		if (proxy) {
+			/* get zones */
+			if (!dbus_g_proxy_call (proxy, "getZones", &error,
+			                        G_TYPE_INVALID,
+			                        G_TYPE_STRV, &zones, G_TYPE_INVALID)) {
+				g_warning ("Could not get zones from FirewallD: %s", error->message);
+				g_error_free (error);
+			} else
+				return zones;
+
+		} else {
+			g_message ("FirewallD not available.");
+		}
+	}
+
+	return NULL;
+}
+
+static void
+populate_ui (CEPageGeneral *self)
+{
+	CEPageGeneralPrivate *priv = CE_PAGE_GENERAL_GET_PRIVATE (self);
+	NMSettingConnection *setting = priv->setting;
+	char **zones;
+	char **zone_ptr;
+	const char *s_zone;
+	guint32 combo_idx = 0, idx;
+
+	s_zone = nm_setting_connection_get_zone (setting);
+	
+	/* Always add "fake" 'Default' zone for default firewall settings */
+#if GTK_CHECK_VERSION (2,24,0)
+	gtk_combo_box_text_append_text (priv->firewall_zone, FIREWALL_ZONE_DEFAULT);
+#else
+	gtk_combo_box_append_text (priv->firewall_zone, FIREWALL_ZONE_DEFAULT);
+#endif
+
+	/* Get zones from FirewallD and list them in the combo */
+	zones = get_zones_from_firewall ();
+
+	for (zone_ptr = zones, idx = 0; zone_ptr && *zone_ptr; zone_ptr++, idx++) {
+#if GTK_CHECK_VERSION (2,24,0)
+		gtk_combo_box_text_append_text (priv->firewall_zone, *zone_ptr);
+#else
+		gtk_combo_box_append_text (priv->firewall_zone, *zone_ptr);
+#endif
+		if (g_strcmp0 (s_zone, *zone_ptr) == 0)
+			combo_idx = idx + 1;
+	}
+
+	if (s_zone && combo_idx == 0) {
+		/* Unknown zone in connection setting - add it to combobox */
+#if GTK_CHECK_VERSION (2,24,0)
+		gtk_combo_box_text_append_text (priv->firewall_zone, s_zone);
+#else
+		gtk_combo_box_append_text (priv->firewall_zone, s_zone);
+#endif
+		combo_idx = idx + 1;
+	}
+	gtk_combo_box_set_active (GTK_COMBO_BOX (priv->firewall_zone), combo_idx);
+
+	/* Zone tooltip and availability */
+	if (zones) {
+		gtk_widget_set_tooltip_text (GTK_WIDGET (priv->firewall_zone), FIREWALL_ZONE_TOOLTIP_AVAILBALE);
+		gtk_widget_set_sensitive (GTK_WIDGET (priv->firewall_zone), TRUE);
+	} else {
+		gtk_widget_set_tooltip_text (GTK_WIDGET (priv->firewall_zone), FIREWALL_ZONE_TOOLTIP_UNAVAILBALE);
+		gtk_widget_set_sensitive (GTK_WIDGET (priv->firewall_zone), FALSE);
+	}
+	g_strfreev (zones);
+}
+
+static void
+finish_setup (CEPageGeneral *self, gpointer unused, GError *error, gpointer user_data)
+{
+	CEPageGeneralPrivate *priv = CE_PAGE_GENERAL_GET_PRIVATE (self);
+
+	if (error)
+		return;
+
+	populate_ui (self);
+
+	g_signal_connect (priv->firewall_zone, "changed", G_CALLBACK (stuff_changed), self);
+}
+
+CEPage *
+ce_page_general_new (NMConnection *connection,
+                     GtkWindow *parent_window,
+                     NMClient *client,
+                     NMRemoteSettings *settings,
+                     const char **out_secrets_setting_name,
+                     GError **error)
+{
+	CEPageGeneral *self;
+	CEPageGeneralPrivate *priv;
+
+	self = CE_PAGE_GENERAL (ce_page_new (CE_TYPE_PAGE_GENERAL,
+	                                     connection,
+	                                     parent_window,
+	                                     client,
+	                                     settings,
+	                                     UIDIR "/ce-page-general.ui",
+	                                     "GeneralPage",
+	                                     _("General")));
+	if (!self) {
+		g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC,
+		                     _("Could not load General user interface."));
+		return NULL;
+	}
+
+	general_private_init (self);
+	priv = CE_PAGE_GENERAL_GET_PRIVATE (self);
+
+	priv->setting = nm_connection_get_setting_connection (connection);
+	if (!priv->setting) {
+		priv->setting = NM_SETTING_CONNECTION (nm_setting_connection_new ());
+		nm_connection_add_setting (connection, NM_SETTING (priv->setting));
+	}
+
+	g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
+
+	return CE_PAGE (self);
+}
+
+static void
+ui_to_setting (CEPageGeneral *self)
+{
+	CEPageGeneralPrivate *priv = CE_PAGE_GENERAL_GET_PRIVATE (self);
+	char *zone;
+
+#if GTK_CHECK_VERSION (2,24,0)
+	zone = gtk_combo_box_text_get_active_text (priv->firewall_zone);
+#else
+	zone = gtk_combo_box_get_active_text (priv->firewall_zone);
+#endif
+
+	if (g_strcmp0 (zone, FIREWALL_ZONE_DEFAULT) == 0)
+		zone = NULL;
+	g_object_set (priv->setting, NM_SETTING_CONNECTION_ZONE, zone, NULL);
+
+	g_free (zone);
+}
+
+static gboolean
+validate (CEPage *page, NMConnection *connection, GError **error)
+{
+	CEPageGeneral *self = CE_PAGE_GENERAL (page);
+	CEPageGeneralPrivate *priv = CE_PAGE_GENERAL_GET_PRIVATE (self);
+
+	ui_to_setting (self);
+	return nm_setting_verify (NM_SETTING (priv->setting), NULL, error);
+}
+
+static void
+ce_page_general_init (CEPageGeneral *self)
+{
+}
+
+static void
+ce_page_general_class_init (CEPageGeneralClass *connection_class)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (connection_class);
+	CEPageClass *parent_class = CE_PAGE_CLASS (connection_class);
+
+	g_type_class_add_private (object_class, sizeof (CEPageGeneralPrivate));
+
+	/* virtual methods */
+	parent_class->validate = validate;
+}
+
diff --git a/src/connection-editor/page-general.h b/src/connection-editor/page-general.h
new file mode 100644
index 0000000..d8a2a2f
--- /dev/null
+++ b/src/connection-editor/page-general.h
@@ -0,0 +1,56 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager Connection editor -- Connection editor for NetworkManager
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2012 Red Hat, Inc.
+ */
+
+#ifndef __PAGE_GENERAL_H__
+#define __PAGE_GENERAL_H__
+
+#include <nm-connection.h>
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include "ce-page.h"
+
+#define CE_TYPE_PAGE_GENERAL            (ce_page_general_get_type ())
+#define CE_PAGE_GENERAL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CE_TYPE_PAGE_GENERAL, CEPageGeneral))
+#define CE_PAGE_GENERAL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CE_TYPE_PAGE_GENERAL, CEPageGeneralClass))
+#define CE_IS_PAGE_GENERAL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CE_TYPE_PAGE_GENERAL))
+#define CE_IS_PAGE_GENERAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CE_TYPE_PAGE_GENERAL))
+#define CE_PAGE_GENERAL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CE_TYPE_PAGE_GENERAL, CEPageGeneralClass))
+
+typedef struct {
+	CEPage parent;
+} CEPageGeneral;
+
+typedef struct {
+	CEPageClass parent;
+} CEPageGeneralClass;
+
+GType ce_page_general_get_type (void);
+
+CEPage *ce_page_general_new (NMConnection *connection,
+                                     GtkWindow *parent,
+                                     NMClient *client,
+                                     NMRemoteSettings *settings,
+                                     const char **out_secrets_setting_name,
+                                     GError **error);
+
+#endif  /* __PAGE_GENERAL_H__ */
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]