clients: reorganize source tree, put all the installed clients together

Create a new clients/ subdirectory at the top level, and move cli/ and
tui/ into it, as well as nm-online.c (which was previously in test/,
which made no sense).

cli/ was split into two subdirectories, src/ and completion/. While
this does simplify things (given that the completion file and the
binary both need to be named "nmcli"), it bloats the source tree, and
we can work around it by just renaming the completion file at install
time. Then we can combine the two directories into one and just have
it all under clients/cli/.

1 files changed, 163 insertions, 0 deletions

diff --git a/clients/tui/nmt-page-vlan.c b/clients/tui/nmt-page-vlan.c
new file mode 100644
index 0000000000..f6de671c85
--- /dev/null
+++ b/clients/tui/nmt-page-vlan.c
@@ -0,0 +1,163 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/*
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Copyright 2013 Red Hat, Inc.
+ */
+
+/**
+ * SECTION:nmt-page-vlan
+ * @short_description: The editor page for VLAN connections
+ */
+
+#include "config.h"
+
+#include <glib.h>
+#include <glib/gi18n-lib.h>
+
+#include <nm-device-ethernet.h>
+
+#include "nm-editor-bindings.h"
+
+#include "nmt-page-vlan.h"
+#include "nmt-device-entry.h"
+#include "nmt-mac-entry.h"
+#include "nmt-mtu-entry.h"
+
+G_DEFINE_TYPE (NmtPageVlan, nmt_page_vlan, NMT_TYPE_PAGE_DEVICE)
+
+#define NMT_PAGE_VLAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NMT_TYPE_PAGE_VLAN, NmtPageVlanPrivate))
+
+typedef struct {
+	NMSettingWired *s_wired;
+
+} NmtPageVlanPrivate;
+
+NmtNewtWidget *
+nmt_page_vlan_new (NMConnection   *conn,
+                   NmtDeviceEntry *deventry)
+{
+	return g_object_new (NMT_TYPE_PAGE_VLAN,
+	                     "connection", conn,
+	                     "title", _("VLAN"),
+	                     "device-entry", deventry,
+	                     NULL);
+}
+
+static void
+nmt_page_vlan_init (NmtPageVlan *vlan)
+{
+}
+
+static gboolean
+vlan_device_filter (NmtDeviceEntry *deventry,
+                    NMDevice       *device,
+                    gpointer        user_data)
+{
+	// FIXME
+	return NM_IS_DEVICE_ETHERNET (device);
+}
+
+static void
+nmt_page_vlan_constructed (GObject *object)
+{
+	NmtPageVlan *vlan = NMT_PAGE_VLAN (object);
+	NmtPageVlanPrivate *priv = NMT_PAGE_VLAN_GET_PRIVATE (vlan);
+	NmtDeviceEntry *deventry;
+	NmtPageGrid *grid;
+	NMSettingWired *s_wired;
+	NMSettingVlan *s_vlan;
+	NmtNewtWidget *widget, *parent, *id_entry;
+	NMConnection *conn;
+
+	conn = nmt_editor_page_get_connection (NMT_EDITOR_PAGE (vlan));
+	s_vlan = nm_connection_get_setting_vlan (conn);
+	if (!s_vlan) {
+		nm_connection_add_setting (conn, nm_setting_vlan_new ());
+		s_vlan = nm_connection_get_setting_vlan (conn);
+	}
+	s_wired = nm_connection_get_setting_wired (conn);
+	if (!s_wired) {
+		/* It makes things simpler if we always have a NMSettingWired;
+		 * we'll hold a ref on one, and add it to and remove it from
+		 * the connection as needed.
+		 */
+		s_wired = NM_SETTING_WIRED (nm_setting_wired_new ());
+	}
+	priv->s_wired = g_object_ref_sink (s_wired);
+
+	deventry = nmt_page_device_get_device_entry (NMT_PAGE_DEVICE (object));
+	g_object_bind_property (s_vlan, NM_SETTING_VLAN_INTERFACE_NAME,
+	                        deventry, "interface-name",
+	                        G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+
+	grid = NMT_PAGE_GRID (vlan);
+
+	nm_editor_bind_vlan_name (s_vlan);
+
+	widget = parent = nmt_device_entry_new (_("Parent"), 40, G_TYPE_NONE);
+	nmt_device_entry_set_device_filter (NMT_DEVICE_ENTRY (widget),
+	                                    vlan_device_filter, vlan);
+	g_object_bind_property (s_vlan, NM_SETTING_VLAN_PARENT,
+	                        widget, "interface-name",
+	                        G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+	g_object_bind_property (s_wired, NM_SETTING_WIRED_MAC_ADDRESS,
+	                        widget, "mac-address",
+	                        G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+	nmt_page_grid_append (grid, NULL, widget, NULL);
+
+	widget = id_entry = nmt_newt_entry_numeric_new (8, 0, 4095);
+	g_object_bind_property (s_vlan, NM_SETTING_VLAN_ID,
+	                        widget, "text",
+	                        G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+	nmt_page_grid_append (grid, _("VLAN id"), widget, NULL);
+
+	nmt_page_grid_append (grid, NULL, nmt_newt_separator_new (), NULL);
+
+	widget = nmt_mac_entry_new (40, ETH_ALEN);
+	g_object_bind_property (s_wired, NM_SETTING_WIRED_CLONED_MAC_ADDRESS,
+	                        widget, "mac-address",
+	                        G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+	nmt_page_grid_append (grid, _("Cloned MAC address"), widget, NULL);
+
+	widget = nmt_mtu_entry_new ();
+	g_object_bind_property (s_wired, NM_SETTING_WIRED_MTU,
+	                        widget, "mtu",
+	                        G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+	nmt_page_grid_append (grid, _("MTU"), widget, NULL);
+
+	G_OBJECT_CLASS (nmt_page_vlan_parent_class)->constructed (object);
+}
+
+static void
+nmt_page_vlan_finalize (GObject *object)
+{
+	NmtPageVlanPrivate *priv = NMT_PAGE_VLAN_GET_PRIVATE (object);
+
+	g_clear_object (&priv->s_wired);
+
+	G_OBJECT_CLASS (nmt_page_vlan_parent_class)->finalize (object);
+}
+
+static void
+nmt_page_vlan_class_init (NmtPageVlanClass *vlan_class)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (vlan_class);
+
+	g_type_class_add_private (vlan_class, sizeof (NmtPageVlanPrivate));
+
+	/* virtual methods */
+	object_class->constructed = nmt_page_vlan_constructed;
+	object_class->finalize    = nmt_page_vlan_finalize;
+}