Commit 44fc72f5 authored by Dan Winship's avatar Dan Winship
Browse files

connection-editor: rename "wired" and "wireless" in files/classes/functions

Update internal names to match the UI.
parent 3a18b5a9
......@@ -26,14 +26,14 @@ nm_connection_editor_SOURCES = \
main.c \
ce-page.h \
ce-page.c \
page-wired.h \
page-wired.c \
page-wired-security.h \
page-wired-security.c \
page-wireless.h \
page-wireless.c \
page-wireless-security.h \
page-wireless-security.c \
page-ethernet.h \
page-ethernet.c \
page-8021x-security.h \
page-8021x-security.c \
page-wifi.h \
page-wifi.c \
page-wifi-security.h \
page-wifi-security.c \
page-wimax.h \
page-wimax.c \
page-infiniband.h \
......@@ -79,9 +79,9 @@ uidir = $(datadir)/nm-applet
ui_DATA = \
nm-connection-editor.ui \
ce-new-connection.ui \
ce-page-wired.ui \
ce-page-wireless.ui \
ce-page-wireless-security.ui \
ce-page-ethernet.ui \
ce-page-wifi.ui \
ce-page-wifi-security.ui \
ce-page-wimax.ui \
ce-page-infiniband.ui \
ce-page-ip4.ui \
......
......@@ -54,7 +54,7 @@
</row>
</data>
</object>
<object class="GtkTable" id="WiredPage">
<object class="GtkTable" id="EthernetPage">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="n_rows">6</property>
......@@ -62,12 +62,12 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
<object class="GtkLabel" id="wired_port_label">
<object class="GtkLabel" id="ethernet_port_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Port:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">wired_port</property>
<property name="mnemonic_widget">ethernet_port</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
......@@ -75,7 +75,7 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="wired_port">
<object class="GtkComboBox" id="ethernet_port">
<property name="visible">True</property>
<property name="model">model1</property>
<child>
......@@ -92,12 +92,12 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="wired_speed_label">
<object class="GtkLabel" id="ethernet_speed_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Speed:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">wired_speed</property>
<property name="mnemonic_widget">ethernet_speed</property>
</object>
<packing>
<property name="top_attach">1</property>
......@@ -107,7 +107,7 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="wired_speed">
<object class="GtkComboBox" id="ethernet_speed">
<property name="visible">True</property>
<property name="model">model2</property>
<child>
......@@ -126,7 +126,7 @@
</packing>
</child>
<child>
<object class="GtkCheckButton" id="wired_duplex">
<object class="GtkCheckButton" id="ethernet_duplex">
<property name="label" translatable="yes">Full duple_x</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
......@@ -143,7 +143,7 @@
</packing>
</child>
<child>
<object class="GtkCheckButton" id="wired_autonegotiate">
<object class="GtkCheckButton" id="ethernet_autonegotiate">
<property name="label" translatable="yes">Aut_onegotiate</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
......@@ -160,7 +160,7 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="wired_device_mac_label">
<object class="GtkLabel" id="ethernet_device_mac_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Device MAC address:</property>
......@@ -174,7 +174,7 @@
</packing>
</child>
<child>
<object class="GtkAlignment" id="wired_device_mac_alignment">
<object class="GtkAlignment" id="ethernet_device_mac_alignment">
<property name="visible">True</property>
<property name="xalign">0</property>
<child>
......@@ -195,7 +195,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">C_loned MAC address:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">wired_cloned_mac</property>
<property name="mnemonic_widget">ethernet_cloned_mac</property>
</object>
<packing>
<property name="top_attach">5</property>
......@@ -205,7 +205,7 @@
</packing>
</child>
<child>
<object class="GtkEntry" id="wired_cloned_mac">
<object class="GtkEntry" id="ethernet_cloned_mac">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">The MAC address entered here will be used as hardware address for the network device this connection is activated on. This feature is known as MAC cloning or spoofing. Example: 00:11:22:33:44:55</property>
......@@ -224,7 +224,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">_MTU:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">wired_mtu</property>
<property name="mnemonic_widget">ethernet_mtu</property>
</object>
<packing>
<property name="top_attach">6</property>
......@@ -238,7 +238,7 @@
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkSpinButton" id="wired_mtu">
<object class="GtkSpinButton" id="ethernet_mtu">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">adjustment1</property>
......
......@@ -13,7 +13,7 @@
</row>
</data>
</object>
<object class="GtkTable" id="WirelessSecurityPage">
<object class="GtkTable" id="WifiSecurityPage">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="n_rows">2</property>
......@@ -21,12 +21,12 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
<object class="GtkLabel" id="wireless_security_combo_label">
<object class="GtkLabel" id="wifi_security_combo_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">S_ecurity:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">wireless_security_combo</property>
<property name="mnemonic_widget">wifi_security_combo</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
......@@ -34,7 +34,7 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="wireless_security_combo">
<object class="GtkComboBox" id="wifi_security_combo">
<property name="visible">True</property>
<property name="model">model1</property>
<child>
......@@ -51,7 +51,7 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="wireless_security_vbox">
<object class="GtkVBox" id="wifi_security_vbox">
<property name="visible">True</property>
<child>
<placeholder/>
......
......@@ -57,7 +57,7 @@
</row>
</data>
</object>
<object class="GtkTable" id="WirelessPage">
<object class="GtkTable" id="WifiPage">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="n_rows">9</property>
......@@ -65,11 +65,11 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
<object class="GtkHBox" id="wireless_mtu_hbox">
<object class="GtkHBox" id="wifi_mtu_hbox">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkSpinButton" id="wireless_mtu">
<object class="GtkSpinButton" id="wifi_mtu">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">adjustment1</property>
......@@ -102,12 +102,12 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="wireless_mtu_label">
<object class="GtkLabel" id="wifi_mtu_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_MTU:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">wireless_mtu</property>
<property name="mnemonic_widget">wifi_mtu</property>
</object>
<packing>
<property name="top_attach">9</property>
......@@ -117,7 +117,7 @@
</packing>
</child>
<child>
<object class="GtkAlignment" id="wireless_device_mac_alignment">
<object class="GtkAlignment" id="wifi_device_mac_alignment">
<property name="visible">True</property>
<property name="xalign">0</property>
<child>
......@@ -133,7 +133,7 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="wireless_device_mac_label">
<object class="GtkLabel" id="wifi_device_mac_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Device MAC address:</property>
......@@ -147,7 +147,7 @@
</packing>
</child>
<child>
<object class="GtkEntry" id="wireless_cloned_mac">
<object class="GtkEntry" id="wifi_cloned_mac">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">The MAC address entered here will be used as hardware address for the network device this connection is activated on. This feature is known as MAC cloning or spoofing. Example: 00:11:22:33:44:55</property>
......@@ -161,12 +161,12 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="wireless_cloned_mac_label">
<object class="GtkLabel" id="wifi_cloned_mac_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">C_loned MAC address:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">wireless_cloned_mac</property>
<property name="mnemonic_widget">wifi_cloned_mac</property>
</object>
<packing>
<property name="top_attach">8</property>
......@@ -176,11 +176,11 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="wireless_tx_power_hbox">
<object class="GtkHBox" id="wifi_tx_power_hbox">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkSpinButton" id="wireless_tx_power">
<object class="GtkSpinButton" id="wifi_tx_power">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">adjustment2</property>
......@@ -213,12 +213,12 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="wireless_tx_power_label">
<object class="GtkLabel" id="wifi_tx_power_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Transmission po_wer:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">wireless_tx_power</property>
<property name="mnemonic_widget">wifi_tx_power</property>
</object>
<packing>
<property name="top_attach">6</property>
......@@ -228,11 +228,11 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="wireless_rate_hbox">
<object class="GtkHBox" id="wifi_rate_hbox">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkSpinButton" id="wireless_rate">
<object class="GtkSpinButton" id="wifi_rate">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">adjustment3</property>
......@@ -265,12 +265,12 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="wireless_rate_label">
<object class="GtkLabel" id="wifi_rate_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Rate:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">wireless_rate</property>
<property name="mnemonic_widget">wifi_rate</property>
</object>
<packing>
<property name="top_attach">5</property>
......@@ -280,7 +280,7 @@
</packing>
</child>
<child>
<object class="GtkEntry" id="wireless_bssid">
<object class="GtkEntry" id="wifi_bssid">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">This option locks this connection to the Wi-Fi access point (AP) specified by the BSSID entered here. Example: 00:11:22:33:44:55</property>
......@@ -294,7 +294,7 @@
</packing>
</child>
<child>
<object class="GtkEntry" id="wireless_ssid">
<object class="GtkEntry" id="wifi_ssid">
<property name="visible">True</property>
<property name="can_focus">True</property>
</object>
......@@ -305,12 +305,12 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="wireless_bssid_label">
<object class="GtkLabel" id="wifi_bssid_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_BSSID:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">wireless_bssid</property>
<property name="mnemonic_widget">wifi_bssid</property>
</object>
<packing>
<property name="top_attach">4</property>
......@@ -320,7 +320,7 @@
</packing>
</child>
<child>
<object class="GtkSpinButton" id="wireless_channel">
<object class="GtkSpinButton" id="wifi_channel">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">adjustment4</property>
......@@ -335,12 +335,12 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="wireless_channel_label">
<object class="GtkLabel" id="wifi_channel_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">C_hannel:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">wireless_channel</property>
<property name="mnemonic_widget">wifi_channel</property>
</object>
<packing>
<property name="top_attach">3</property>
......@@ -350,7 +350,7 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="wireless_band">
<object class="GtkComboBox" id="wifi_band">
<property name="visible">True</property>
<property name="model">model1</property>
<child>
......@@ -370,12 +370,12 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="wireless_band_label">
<object class="GtkLabel" id="wifi_band_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Ban_d:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">wireless_band</property>
<property name="mnemonic_widget">wifi_band</property>
</object>
<packing>
<property name="top_attach">2</property>
......@@ -385,7 +385,7 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="wireless_mode">
<object class="GtkComboBox" id="wifi_mode">
<property name="visible">True</property>
<property name="model">model2</property>
<child>
......@@ -405,12 +405,12 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="wireless_mode_label">
<object class="GtkLabel" id="wifi_mode_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">M_ode:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">wireless_mode</property>
<property name="mnemonic_widget">wifi_mode</property>
</object>
<packing>
<property name="top_attach">1</property>
......@@ -420,12 +420,12 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="wireless_ssid_label">
<object class="GtkLabel" id="wifi_ssid_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">SS_ID:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">wireless_ssid</property>
<property name="mnemonic_widget">wifi_ssid</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
......
......@@ -41,7 +41,6 @@
#include <nm-setting-cdma.h>
#include "nm-connection-list.h"
#include "nm-connection-editor.h"
#include "page-wired.h"
static GMainLoop *loop = NULL;
......
......@@ -24,8 +24,8 @@
#include "new-connection.h"
#include "nm-connection-list.h"
#include "page-wired.h"
#include "page-wireless.h"
#include "page-ethernet.h"
#include "page-wifi.h"
#include "page-mobile.h"
#include "page-wimax.h"
#include "page-dsl.h"
......@@ -87,7 +87,7 @@ get_connection_type_list (void)
data.name = _("Ethernet");
ICON_LOAD (data.icon, "nm-device-wired");
data.new_connection_func = wired_connection_new;
data.new_connection_func = ethernet_connection_new;
data.setting_type = NM_TYPE_SETTING_WIRED;
g_array_append_val (array, data);
......
......@@ -55,10 +55,10 @@
#include "nma-marshal.h"
#include "ce-page.h"
#include "page-wired.h"
#include "page-wired-security.h"
#include "page-wireless.h"
#include "page-wireless-security.h"
#include "page-ethernet.h"
#include "page-8021x-security.h"
#include "page-wifi.h"
#include "page-wifi-security.h"
#include "page-ip4.h"
#include "page-ip6.h"
#include "page-dsl.h"
......@@ -742,18 +742,18 @@ nm_connection_editor_set_connection (NMConnectionEditor *editor,
connection_type = nm_setting_connection_get_connection_type (s_con);
if (!strcmp (connection_type, NM_SETTING_WIRED_SETTING_NAME)) {
if (!add_page (editor, ce_page_wired_new, editor->connection, error))
if (!add_page (editor, ce_page_ethernet_new, editor->connection, error))
goto out;
if (!add_page (editor, ce_page_wired_security_new, editor->connection, error))
if (!add_page (editor, ce_page_8021x_security_new, editor->connection, error))
goto out;
if (!add_page (editor, ce_page_ip4_new, editor->connection, error))
goto out;
if (!add_page (editor, ce_page_ip6_new, editor->connection, error))
goto out;
} else if (!strcmp (connection_type, NM_SETTING_WIRELESS_SETTING_NAME)) {
if (!add_page (editor, ce_page_wireless_new, editor->connection, error))
if (!add_page (editor, ce_page_wifi_new, editor->connection, error))
goto out;
if (!add_page (editor, ce_page_wireless_security_new, editor->connection, error))
if (!add_page (editor, ce_page_wifi_security_new, editor->connection, error))
goto out;
if (!add_page (editor, ce_page_ip4_new, editor->connection, error))
goto out;
......@@ -770,7 +770,7 @@ nm_connection_editor_set_connection (NMConnectionEditor *editor,
} else if (!strcmp (connection_type, NM_SETTING_PPPOE_SETTING_NAME)) {
if (!add_page (editor, ce_page_dsl_new, editor->connection, error))
goto out;
if (!add_page (editor, ce_page_wired_new, editor->connection, error))
if (!add_page (editor, ce_page_ethernet_new, editor->connection, error))
goto out;
if (!add_page (editor, ce_page_ppp_new, editor->connection, error))
goto out;
......
......@@ -48,13 +48,6 @@
#include <nm-remote-settings.h>
#include "ce-page.h"
#include "page-wired.h"
#include "page-wireless.h"
#include "page-mobile.h"
#include "page-dsl.h"
#include "page-vpn.h"
#include "page-wimax.h"
#include "page-infiniband.h"
#include "nm-connection-editor.h"
#include "nm-connection-list.h"
#include "vpn-helpers.h"
......
......@@ -35,13 +35,13 @@
#include <nm-utils.h>
#include "wireless-security.h"
#include "page-wired.h"
#include "page-wired-security.h"
#include "page-ethernet.h"
#include "page-8021x-security.h"
#include "nm-connection-editor.h"
G_DEFINE_TYPE (CEPageWiredSecurity, ce_page_wired_security, CE_TYPE_PAGE)
G_DEFINE_TYPE (CEPage8021xSecurity, ce_page_8021x_security, CE_TYPE_PAGE)
#define CE_PAGE_WIRED_SECURITY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CE_TYPE_PAGE_WIRED_SECURITY, CEPageWiredSecurityPrivate))
#define CE_PAGE_8021X_SECURITY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CE_TYPE_PAGE_8021X_SECURITY, CEPage8021xSecurityPrivate))
typedef struct {
GtkToggleButton *enabled;
......@@ -51,7 +51,7 @@ typedef struct {
gboolean initial_have_8021x;
gboolean disposed;
} CEPageWiredSecurityPrivate;
} CEPage8021xSecurityPrivate;
static void
stuff_changed (WirelessSecurity *sec, gpointer user_data)
......@@ -62,17 +62,17 @@ stuff_changed (WirelessSecurity *sec, gpointer user_data)
static void
enable_toggled (GtkToggleButton *button, gpointer user_data)
{
CEPageWiredSecurityPrivate *priv = CE_PAGE_WIRED_SECURITY_GET_PRIVATE (user_data);
CEPage8021xSecurityPrivate *priv = CE_PAGE_8021X_SECURITY_GET_PRIVATE (user_data);
gtk_widget_set_sensitive (priv->security_widget, gtk_toggle_button_get_active (priv->enabled));
ce_page_changed (CE_PAGE (user_data));
}
static void
finish_setup (CEPageWiredSecurity *self, gpointer unused, GError *error, gpointer user_data)
finish_setup (CEPage8021xSecurity *self, gpointer unused, GError *error, gpointer user_data)
{
CEPage *parent = CE_PAGE (self);
CEPageWiredSecurityPrivate *priv = CE_PAGE_WIRED_SECURITY_GET_PRIVATE (self);
CEPage8021xSecurityPrivate *priv = CE_PAGE_8021X_SECURITY_GET_PRIVATE (self);
GtkWidget *parent_container;
if (error)
......@@ -100,17 +100,17 @@ finish_setup (CEPageWiredSecurity *self, gpointer unused, GError *error, gpointe
}
CEPage *
ce_page_wired_security_new (NMConnection *connection,
ce_page_8021x_security_new (NMConnection *connection,
GtkWindow *parent_window,
NMClient *client,
const char **out_secrets_setting_name,
GError **error)
{
CEPageWiredSecurity *self;
CEPageWiredSecurityPrivate *priv;
CEPage8021xSecurity *self;
CEPage8021xSecurityPrivate *priv;
CEPage *parent;
self = CE_PAGE_WIRED_SECURITY (ce_page_new (CE_TYPE_PAGE_WIRED_SECURITY,
self = CE_PAGE_8021X_SECURITY (ce_page_new (CE_TYPE_PAGE_8021X_SECURITY,
connection,
parent_window,
client,
......@@ -123,7 +123,7 @@ ce_page_wired_security_new (NMConnection *connection,
}