applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

network: Implement the new design for wired

Browse source 
This expands the connection editor to cover ethernet,
and adds support for multiple wired profiles.
This commit is contained in:
Matthias Clasen 2012-12-17 14:17:42 -05:00 • committed by Dan Winship
parent e5cc7d8011
commit 8b593e6ac8
22 changed files with 2356 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

82
panels/network/connection-editor/net-connection-editor.c
View file

@ -35,6 +35,8 @@
#include "ce-page-ip6.h"
#include "ce-page-security.h"
#include "ce-page-reset.h"
#include "ce-page-ethernet.h"
#include "ce-page-8021x-security.h"
#include "egg-list-box/egg-list-box.h"
@ -88,7 +90,9 @@ update_complete (NetConnectionEditor *editor, GError *error)
}
static void
updated_connection_cb (NMRemoteConnection *connection, GError *error, gpointer data)
updated_connection_cb (NMRemoteConnection *connection,
GError *error,
gpointer data)
{
NetConnectionEditor *editor = data;
@ -97,12 +101,37 @@ updated_connection_cb (NMRemoteConnection *connection, GError *error, gpointer d
update_complete (editor, error);
}
static void
added_connection_cb (NMRemoteSettings *settings,
NMRemoteConnection *connection,
GError *error,
gpointer data)
{
NetConnectionEditor *editor = data;
if (error) {
g_warning ("Failed to add connection: %s", error->message);
/* Leave the editor open */
return;
}
update_complete (editor, error);
}
static void
apply_edits (NetConnectionEditor *editor)
{
update_connection (editor);
nm_remote_connection_commit_changes (NM_REMOTE_CONNECTION (editor->orig_connection),
updated_connection_cb, editor);
if (editor->is_new_connection) {
nm_remote_settings_add_connection (editor->settings,
editor->orig_connection,
added_connection_cb,
editor);
} else {
nm_remote_connection_commit_changes (NM_REMOTE_CONNECTION (editor->orig_connection),
updated_connection_cb, editor);
}
}
static void
@ -189,13 +218,21 @@ net_connection_editor_class_init (NetConnectionEditorClass *class)
static void
net_connection_editor_update_title (NetConnectionEditor *editor)
{
NMSettingWireless *sw;
const GByteArray *ssid;
gchar *id;
sw = nm_connection_get_setting_wireless (editor->connection);
ssid = nm_setting_wireless_get_ssid (sw);
id = nm_utils_ssid_to_utf8 (ssid);
if (editor->is_new_connection)
id = g_strdup (_("New Profile"));
else {
NMSettingWireless *sw;
sw = nm_connection_get_setting_wireless (editor->connection);
if (sw) {
const GByteArray *ssid;
ssid = nm_setting_wireless_get_ssid (sw);
id = nm_utils_ssid_to_utf8 (ssid);
} else {
id = g_strdup (nm_connection_get_id (editor->connection));
}
}
gtk_window_set_title (GTK_WINDOW (editor->window), id);
g_free (id);
}
@ -388,17 +425,42 @@ net_connection_editor_set_connection (NetConnectionEditor *editor,
NMConnection *connection)
{
GSList *pages, *l;
NMSettingConnection *sc;
const gchar *type;
editor->is_new_connection = !nm_remote_settings_get_connection_by_uuid (editor->settings,
nm_connection_get_uuid (connection));
if (editor->is_new_connection) {
GtkWidget *button;
button = GTK_WIDGET (gtk_builder_get_object (editor->builder, "details_apply_button"));
gtk_button_set_label (GTK_BUTTON (button), _("_Add"));
}
editor->connection = nm_connection_duplicate (connection);
editor->orig_connection = g_object_ref (connection);
net_connection_editor_update_title (editor);
sc = nm_connection_get_setting_connection (connection);
type = nm_setting_connection_get_connection_type (sc);
add_page (editor, ce_page_details_new (editor->connection, editor->client, editor->settings, editor->device, editor->ap));
add_page (editor, ce_page_security_new (editor->connection, editor->client, editor->settings));
add_page (editor, ce_page_wifi_new (editor->connection, editor->client, editor->settings));
if (strcmp (type, NM_SETTING_WIRELESS_SETTING_NAME) == 0)
add_page (editor, ce_page_security_new (editor->connection, editor->client, editor->settings));
else if (strcmp (type, NM_SETTING_WIRED_SETTING_NAME) == 0)
add_page (editor, ce_page_8021x_security_new (editor->connection, editor->client, editor->settings));
if (strcmp (type, NM_SETTING_WIRELESS_SETTING_NAME) == 0)
add_page (editor, ce_page_wifi_new (editor->connection, editor->client, editor->settings));
else if (strcmp (type, NM_SETTING_WIRED_SETTING_NAME) == 0)
add_page (editor, ce_page_ethernet_new (editor->connection, editor->client, editor->settings));
add_page (editor, ce_page_ip4_new (editor->connection, editor->client, editor->settings));
add_page (editor, ce_page_ip6_new (editor->connection, editor->client, editor->settings));
add_page (editor, ce_page_reset_new (editor->connection, editor->client, editor->settings, editor));
pages = g_slist_copy (editor->initializing_pages);