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 = \ ...@@ -26,14 +26,14 @@ nm_connection_editor_SOURCES = \
main.c \ main.c \
ce-page.h \ ce-page.h \
ce-page.c \ ce-page.c \
page-wired.h \ page-ethernet.h \
page-wired.c \ page-ethernet.c \
page-wired-security.h \ page-8021x-security.h \
page-wired-security.c \ page-8021x-security.c \
page-wireless.h \ page-wifi.h \
page-wireless.c \ page-wifi.c \
page-wireless-security.h \ page-wifi-security.h \
page-wireless-security.c \ page-wifi-security.c \
page-wimax.h \ page-wimax.h \
page-wimax.c \ page-wimax.c \
page-infiniband.h \ page-infiniband.h \
...@@ -79,9 +79,9 @@ uidir = $(datadir)/nm-applet ...@@ -79,9 +79,9 @@ uidir = $(datadir)/nm-applet
ui_DATA = \ ui_DATA = \
nm-connection-editor.ui \ nm-connection-editor.ui \
ce-new-connection.ui \ ce-new-connection.ui \
ce-page-wired.ui \ ce-page-ethernet.ui \
ce-page-wireless.ui \ ce-page-wifi.ui \
ce-page-wireless-security.ui \ ce-page-wifi-security.ui \
ce-page-wimax.ui \ ce-page-wimax.ui \
ce-page-infiniband.ui \ ce-page-infiniband.ui \
ce-page-ip4.ui \ ce-page-ip4.ui \
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</row> </row>
</data> </data>
</object> </object>
<object class="GtkTable" id="WiredPage"> <object class="GtkTable" id="EthernetPage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="border_width">12</property> <property name="border_width">12</property>
<property name="n_rows">6</property> <property name="n_rows">6</property>
...@@ -62,12 +62,12 @@ ...@@ -62,12 +62,12 @@
<property name="column_spacing">12</property> <property name="column_spacing">12</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<child> <child>
<object class="GtkLabel" id="wired_port_label"> <object class="GtkLabel" id="ethernet_port_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">_Port:</property> <property name="label" translatable="yes">_Port:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">wired_port</property> <property name="mnemonic_widget">ethernet_port</property>
</object> </object>
<packing> <packing>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkComboBox" id="wired_port"> <object class="GtkComboBox" id="ethernet_port">
<property name="visible">True</property> <property name="visible">True</property>
<property name="model">model1</property> <property name="model">model1</property>
<child> <child>
...@@ -92,12 +92,12 @@ ...@@ -92,12 +92,12 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="wired_speed_label"> <object class="GtkLabel" id="ethernet_speed_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">_Speed:</property> <property name="label" translatable="yes">_Speed:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">wired_speed</property> <property name="mnemonic_widget">ethernet_speed</property>
</object> </object>
<packing> <packing>
<property name="top_attach">1</property> <property name="top_attach">1</property>
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkComboBox" id="wired_speed"> <object class="GtkComboBox" id="ethernet_speed">
<property name="visible">True</property> <property name="visible">True</property>
<property name="model">model2</property> <property name="model">model2</property>
<child> <child>
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
</packing> </packing>
</child> </child>
<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="label" translatable="yes">Full duple_x</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="wired_autonegotiate"> <object class="GtkCheckButton" id="ethernet_autonegotiate">
<property name="label" translatable="yes">Aut_onegotiate</property> <property name="label" translatable="yes">Aut_onegotiate</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
</packing> </packing>
</child> </child>
<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="visible">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">_Device MAC address:</property> <property name="label" translatable="yes">_Device MAC address:</property>
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
</packing> </packing>
</child> </child>
<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="visible">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<child> <child>
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">C_loned MAC address:</property> <property name="label" translatable="yes">C_loned MAC address:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">wired_cloned_mac</property> <property name="mnemonic_widget">ethernet_cloned_mac</property>
</object> </object>
<packing> <packing>
<property name="top_attach">5</property> <property name="top_attach">5</property>
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkEntry" id="wired_cloned_mac"> <object class="GtkEntry" id="ethernet_cloned_mac">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">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> <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 @@ ...@@ -224,7 +224,7 @@
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">_MTU:</property> <property name="label" translatable="yes">_MTU:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">wired_mtu</property> <property name="mnemonic_widget">ethernet_mtu</property>
</object> </object>
<packing> <packing>
<property name="top_attach">6</property> <property name="top_attach">6</property>
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkSpinButton" id="wired_mtu"> <object class="GtkSpinButton" id="ethernet_mtu">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="adjustment">adjustment1</property> <property name="adjustment">adjustment1</property>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</row> </row>
</data> </data>
</object> </object>
<object class="GtkTable" id="WirelessSecurityPage"> <object class="GtkTable" id="WifiSecurityPage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="border_width">12</property> <property name="border_width">12</property>
<property name="n_rows">2</property> <property name="n_rows">2</property>
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
<property name="column_spacing">12</property> <property name="column_spacing">12</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<child> <child>
<object class="GtkLabel" id="wireless_security_combo_label"> <object class="GtkLabel" id="wifi_security_combo_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">S_ecurity:</property> <property name="label" translatable="yes">S_ecurity:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">wireless_security_combo</property> <property name="mnemonic_widget">wifi_security_combo</property>
</object> </object>
<packing> <packing>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkComboBox" id="wireless_security_combo"> <object class="GtkComboBox" id="wifi_security_combo">
<property name="visible">True</property> <property name="visible">True</property>
<property name="model">model1</property> <property name="model">model1</property>
<child> <child>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkVBox" id="wireless_security_vbox"> <object class="GtkVBox" id="wifi_security_vbox">
<property name="visible">True</property> <property name="visible">True</property>
<child> <child>
<placeholder/> <placeholder/>
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</row> </row>
</data> </data>
</object> </object>
<object class="GtkTable" id="WirelessPage"> <object class="GtkTable" id="WifiPage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="border_width">12</property> <property name="border_width">12</property>
<property name="n_rows">9</property> <property name="n_rows">9</property>
...@@ -65,11 +65,11 @@ ...@@ -65,11 +65,11 @@
<property name="column_spacing">12</property> <property name="column_spacing">12</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<child> <child>
<object class="GtkHBox" id="wireless_mtu_hbox"> <object class="GtkHBox" id="wifi_mtu_hbox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkSpinButton" id="wireless_mtu"> <object class="GtkSpinButton" id="wifi_mtu">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="adjustment">adjustment1</property> <property name="adjustment">adjustment1</property>
...@@ -102,12 +102,12 @@ ...@@ -102,12 +102,12 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="wireless_mtu_label"> <object class="GtkLabel" id="wifi_mtu_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">_MTU:</property> <property name="label" translatable="yes">_MTU:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">wireless_mtu</property> <property name="mnemonic_widget">wifi_mtu</property>
</object> </object>
<packing> <packing>
<property name="top_attach">9</property> <property name="top_attach">9</property>
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
</packing> </packing>
</child> </child>
<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="visible">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<child> <child>
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
</packing> </packing>
</child> </child>
<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="visible">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">_Device MAC address:</property> <property name="label" translatable="yes">_Device MAC address:</property>
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkEntry" id="wireless_cloned_mac"> <object class="GtkEntry" id="wifi_cloned_mac">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">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> <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 @@ ...@@ -161,12 +161,12 @@
</packing> </packing>
</child> </child>
<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="visible">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">C_loned MAC address:</property> <property name="label" translatable="yes">C_loned MAC address:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">wireless_cloned_mac</property> <property name="mnemonic_widget">wifi_cloned_mac</property>
</object> </object>
<packing> <packing>
<property name="top_attach">8</property> <property name="top_attach">8</property>
...@@ -176,11 +176,11 @@ ...@@ -176,11 +176,11 @@
</packing> </packing>
</child> </child>
<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="visible">True</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkSpinButton" id="wireless_tx_power"> <object class="GtkSpinButton" id="wifi_tx_power">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="adjustment">adjustment2</property> <property name="adjustment">adjustment2</property>
...@@ -213,12 +213,12 @@ ...@@ -213,12 +213,12 @@
</packing> </packing>
</child> </child>
<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="visible">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">Transmission po_wer:</property> <property name="label" translatable="yes">Transmission po_wer:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">wireless_tx_power</property> <property name="mnemonic_widget">wifi_tx_power</property>
</object> </object>
<packing> <packing>
<property name="top_attach">6</property> <property name="top_attach">6</property>
...@@ -228,11 +228,11 @@ ...@@ -228,11 +228,11 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkHBox" id="wireless_rate_hbox"> <object class="GtkHBox" id="wifi_rate_hbox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkSpinButton" id="wireless_rate"> <object class="GtkSpinButton" id="wifi_rate">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="adjustment">adjustment3</property> <property name="adjustment">adjustment3</property>
...@@ -265,12 +265,12 @@ ...@@ -265,12 +265,12 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="wireless_rate_label"> <object class="GtkLabel" id="wifi_rate_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">_Rate:</property> <property name="label" translatable="yes">_Rate:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">wireless_rate</property> <property name="mnemonic_widget">wifi_rate</property>
</object> </object>
<packing> <packing>
<property name="top_attach">5</property> <property name="top_attach">5</property>
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkEntry" id="wireless_bssid"> <object class="GtkEntry" id="wifi_bssid">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">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> <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 @@ ...@@ -294,7 +294,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkEntry" id="wireless_ssid"> <object class="GtkEntry" id="wifi_ssid">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
</object> </object>
...@@ -305,12 +305,12 @@ ...@@ -305,12 +305,12 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="wireless_bssid_label"> <object class="GtkLabel" id="wifi_bssid_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">_BSSID:</property> <property name="label" translatable="yes">_BSSID:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">wireless_bssid</property> <property name="mnemonic_widget">wifi_bssid</property>
</object> </object>
<packing> <packing>
<property name="top_attach">4</property> <property name="top_attach">4</property>
...@@ -320,7 +320,7 @@ ...@@ -320,7 +320,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkSpinButton" id="wireless_channel"> <object class="GtkSpinButton" id="wifi_channel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="adjustment">adjustment4</property> <property name="adjustment">adjustment4</property>
...@@ -335,12 +335,12 @@ ...@@ -335,12 +335,12 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="wireless_channel_label"> <object class="GtkLabel" id="wifi_channel_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">C_hannel:</property> <property name="label" translatable="yes">C_hannel:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">wireless_channel</property> <property name="mnemonic_widget">wifi_channel</property>
</object> </object>
<packing> <packing>
<property name="top_attach">3</property> <property name="top_attach">3</property>
...@@ -350,7 +350,7 @@ ...@@ -350,7 +350,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkComboBox" id="wireless_band"> <object class="GtkComboBox" id="wifi_band">
<property name="visible">True</property> <property name="visible">True</property>
<property name="model">model1</property> <property name="model">model1</property>
<child> <child>
...@@ -370,12 +370,12 @@ ...@@ -370,12 +370,12 @@
</packing> </packing>
</child> </child>
<child>