network: Factor out most of NetDeviceWired, create NetDeviceEthernet
Rename NetDeviceWired to NetDeviceEthernet, but split out most of the code into a new NetDeviceSimple superclass that can later be used for other device types that we provide only minimal UI/support for. https://bugzilla.gnome.org/show_bug.cgi?id=677143
This commit is contained in:
Dan Winship
Bastien Nocera
parent
9e5a8eb5c8
commit
71c0325f28
8 changed files with 281 additions and 130 deletions
280
panels/network/net-device-simple.c
Normal file
280
panels/network/net-device-simple.c
Normal file
|
|
@ -0,0 +1,280 @@
|
|||
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
|
||||
*
|
||||
* Copyright (C) 2011-2012 Richard Hughes <richard@hughsie.com>
|
||||
* Copyright (C) 2012 Red Hat, Inc.
|
||||
*
|
||||
* Licensed under the GNU General Public License Version 2
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
#include <nm-client.h>
|
||||
#include <nm-device.h>
|
||||
#include <nm-remote-connection.h>
|
||||
|
||||
#include "panel-common.h"
|
||||
|
||||
#include "net-device-simple.h"
|
||||
|
||||
#define NET_DEVICE_SIMPLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NET_TYPE_DEVICE_SIMPLE, NetDeviceSimplePrivate))
|
||||
|
||||
struct _NetDeviceSimplePrivate
|
||||
{
|
||||
GtkBuilder *builder;
|
||||
gboolean updating_device;
|
||||
};
|
||||
|
||||
G_DEFINE_TYPE (NetDeviceSimple, net_device_simple, NET_TYPE_DEVICE)
|
||||
|
||||
static GtkWidget *
|
||||
device_simple_proxy_add_to_notebook (NetObject *object,
|
||||
GtkNotebook *notebook,
|
||||
GtkSizeGroup *heading_size_group)
|
||||
{
|
||||
GtkWidget *widget;
|
||||
GtkWindow *window;
|
||||
NetDeviceSimple *device_simple = NET_DEVICE_SIMPLE (object);
|
||||
|
||||
/* add widgets to size group */
|
||||
widget = GTK_WIDGET (gtk_builder_get_object (device_simple->priv->builder,
|
||||
"heading_ipv4"));
|
||||
gtk_size_group_add_widget (heading_size_group, widget);
|
||||
|
||||
/* reparent */
|
||||
window = GTK_WINDOW (gtk_builder_get_object (device_simple->priv->builder,
|
||||
"window_tmp"));
|
||||
widget = GTK_WIDGET (gtk_builder_get_object (device_simple->priv->builder,
|
||||
"vbox6"));
|
||||
g_object_ref (widget);
|
||||
gtk_container_remove (GTK_CONTAINER (window), widget);
|
||||
gtk_notebook_append_page (notebook, widget, NULL);
|
||||
g_object_unref (widget);
|
||||
return widget;
|
||||
}
|
||||
|
||||
static void
|
||||
update_off_switch_from_device_state (GtkSwitch *sw,
|
||||
NMDeviceState state,
|
||||
NetDeviceSimple *device_simple)
|
||||
{
|
||||
device_simple->priv->updating_device = TRUE;
|
||||
switch (state) {
|
||||
case NM_DEVICE_STATE_UNMANAGED:
|
||||
case NM_DEVICE_STATE_UNAVAILABLE:
|
||||
case NM_DEVICE_STATE_DISCONNECTED:
|
||||
case NM_DEVICE_STATE_DEACTIVATING:
|
||||
case NM_DEVICE_STATE_FAILED:
|
||||
gtk_switch_set_active (sw, FALSE);
|
||||
break;
|
||||
default:
|
||||
gtk_switch_set_active (sw, TRUE);
|
||||
break;
|
||||
}
|
||||
device_simple->priv->updating_device = FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
nm_device_simple_refresh_ui (NetDeviceSimple *device_simple)
|
||||
{
|
||||
char *hwaddr;
|
||||
GString *status;
|
||||
GtkWidget *widget;
|
||||
char *speed = NULL;
|
||||
NMDevice *nm_device;
|
||||
NMDeviceState state;
|
||||
NetDeviceSimplePrivate *priv = device_simple->priv;
|
||||
|
||||
/* set device kind */
|
||||
nm_device = net_device_get_nm_device (NET_DEVICE (device_simple));
|
||||
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_device"));
|
||||
gtk_label_set_label (GTK_LABEL (widget),
|
||||
panel_device_to_localized_string (nm_device));
|
||||
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "image_device"));
|
||||
gtk_image_set_from_icon_name (GTK_IMAGE (widget),
|
||||
panel_device_to_icon_name (nm_device),
|
||||
GTK_ICON_SIZE_DIALOG);
|
||||
|
||||
/* set up the device on/off switch */
|
||||
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "device_off_switch"));
|
||||
state = nm_device_get_state (nm_device);
|
||||
gtk_widget_set_visible (widget,
|
||||
state != NM_DEVICE_STATE_UNAVAILABLE
|
||||
&& state != NM_DEVICE_STATE_UNMANAGED);
|
||||
update_off_switch_from_device_state (GTK_SWITCH (widget), state, device_simple);
|
||||
|
||||
/* set device state, with status and optionally speed */
|
||||
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_status"));
|
||||
status = g_string_new (panel_device_state_to_localized_string (nm_device));
|
||||
if (state != NM_DEVICE_STATE_UNAVAILABLE)
|
||||
speed = net_device_simple_get_speed (device_simple);
|
||||
if (speed)
|
||||
g_string_append_printf (status, " - %s", speed);
|
||||
gtk_label_set_label (GTK_LABEL (widget), status->str);
|
||||
g_string_free (status, TRUE);
|
||||
gtk_widget_set_tooltip_text (widget,
|
||||
panel_device_state_reason_to_localized_string (nm_device));
|
||||
|
||||
/* device MAC */
|
||||
g_object_get (G_OBJECT (nm_device),
|
||||
"hw-address", &hwaddr,
|
||||
NULL);
|
||||
panel_set_device_widget_details (priv->builder, "mac", hwaddr);
|
||||
g_free (hwaddr);
|
||||
|
||||
/* set IP entries */
|
||||
panel_set_device_widgets (priv->builder, nm_device);
|
||||
}
|
||||
|
||||
static void
|
||||
device_simple_refresh (NetObject *object)
|
||||
{
|
||||
NetDeviceSimple *device_simple = NET_DEVICE_SIMPLE (object);
|
||||
nm_device_simple_refresh_ui (device_simple);
|
||||
}
|
||||
|
||||
static void
|
||||
device_off_toggled (GtkSwitch *sw,
|
||||
GParamSpec *pspec,
|
||||
NetDeviceSimple *device_simple)
|
||||
{
|
||||
const gchar *path;
|
||||
const GPtrArray *acs;
|
||||
gboolean active;
|
||||
gint i;
|
||||
NMActiveConnection *a;
|
||||
NMConnection *connection;
|
||||
NMClient *client;
|
||||
|
||||
if (device_simple->priv->updating_device)
|
||||
return;
|
||||
|
||||
active = gtk_switch_get_active (sw);
|
||||
if (active) {
|
||||
client = net_object_get_client (NET_OBJECT (device_simple));
|
||||
connection = net_device_get_find_connection (NET_DEVICE (device_simple));
|
||||
if (connection == NULL)
|
||||
return;
|
||||
nm_client_activate_connection (client,
|
||||
connection,
|
||||
net_device_get_nm_device (NET_DEVICE (device_simple)),
|
||||
NULL, NULL, NULL);
|
||||
} else {
|
||||
connection = net_device_get_find_connection (NET_DEVICE (device_simple));
|
||||
if (connection == NULL)
|
||||
return;
|
||||
path = nm_connection_get_path (connection);
|
||||
client = net_object_get_client (NET_OBJECT (device_simple));
|
||||
acs = nm_client_get_active_connections (client);
|
||||
for (i = 0; i < acs->len; i++) {
|
||||
a = (NMActiveConnection*)acs->pdata[i];
|
||||
if (strcmp (nm_active_connection_get_connection (a), path) == 0) {
|
||||
nm_client_deactivate_connection (client, a);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
edit_connection (GtkButton *button, NetDeviceSimple *device_simple)
|
||||
{
|
||||
net_object_edit (NET_OBJECT (device_simple));
|
||||
}
|
||||
|
||||
static void
|
||||
net_device_simple_constructed (GObject *object)
|
||||
{
|
||||
NetDeviceSimple *device_simple = NET_DEVICE_SIMPLE (object);
|
||||
|
||||
G_OBJECT_CLASS (net_device_simple_parent_class)->constructed (object);
|
||||
|
||||
nm_device_simple_refresh_ui (device_simple);
|
||||
}
|
||||
|
||||
static void
|
||||
net_device_simple_finalize (GObject *object)
|
||||
{
|
||||
NetDeviceSimple *device_simple = NET_DEVICE_SIMPLE (object);
|
||||
NetDeviceSimplePrivate *priv = device_simple->priv;
|
||||
|
||||
g_object_unref (priv->builder);
|
||||
|
||||
G_OBJECT_CLASS (net_device_simple_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
static char *
|
||||
device_simple_get_speed (NetDeviceSimple *simple)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
net_device_simple_class_init (NetDeviceSimpleClass *klass)
|
||||
{
|
||||
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
||||
NetObjectClass *parent_class = NET_OBJECT_CLASS (klass);
|
||||
NetDeviceSimpleClass *simple_class = NET_DEVICE_SIMPLE_CLASS (klass);
|
||||
|
||||
object_class->finalize = net_device_simple_finalize;
|
||||
object_class->constructed = net_device_simple_constructed;
|
||||
parent_class->add_to_notebook = device_simple_proxy_add_to_notebook;
|
||||
parent_class->refresh = device_simple_refresh;
|
||||
simple_class->get_speed = device_simple_get_speed;
|
||||
|
||||
g_type_class_add_private (klass, sizeof (NetDeviceSimplePrivate));
|
||||
}
|
||||
|
||||
static void
|
||||
net_device_simple_init (NetDeviceSimple *device_simple)
|
||||
{
|
||||
GError *error = NULL;
|
||||
GtkWidget *widget;
|
||||
|
||||
device_simple->priv = NET_DEVICE_SIMPLE_GET_PRIVATE (device_simple);
|
||||
|
||||
device_simple->priv->builder = gtk_builder_new ();
|
||||
gtk_builder_add_from_file (device_simple->priv->builder,
|
||||
GNOMECC_UI_DIR "/network-simple.ui",
|
||||
&error);
|
||||
if (error != NULL) {
|
||||
g_warning ("Could not load interface file: %s", error->message);
|
||||
g_error_free (error);
|
||||
return;
|
||||
}
|
||||
|
||||
/* setup simple combobox model */
|
||||
widget = GTK_WIDGET (gtk_builder_get_object (device_simple->priv->builder,
|
||||
"device_off_switch"));
|
||||
g_signal_connect (widget, "notify::active",
|
||||
G_CALLBACK (device_off_toggled), device_simple);
|
||||
|
||||
widget = GTK_WIDGET (gtk_builder_get_object (device_simple->priv->builder,
|
||||
"button_options"));
|
||||
g_signal_connect (widget, "clicked",
|
||||
G_CALLBACK (edit_connection), device_simple);
|
||||
}
|
||||
|
||||
char *
|
||||
net_device_simple_get_speed (NetDeviceSimple *device_simple)
|
||||
{
|
||||
NetDeviceSimpleClass *klass = NET_DEVICE_SIMPLE_GET_CLASS (device_simple);
|
||||
|
||||
return klass->get_speed (device_simple);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue