network: Rename UI files to match C files

This commit renames {network|wifi}.ui to cc-{network|wifi}-pane.ui,
in order to match the corresponding C files. This introduces no
functional changes.
This commit is contained in:
Georges Basile Stavracas Neto 2018-07-22 12:46:15 -03:00
parent bbc025d2ae
commit f9b9f105dd
7 changed files with 9 additions and 9 deletions

View file

@ -847,7 +847,7 @@ cc_network_panel_class_init (CcNetworkPanelClass *klass)
g_object_class_override_property (object_class, PROP_PARAMETERS, "parameters"); g_object_class_override_property (object_class, PROP_PARAMETERS, "parameters");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/network/network.ui"); gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/network/cc-network-panel.ui");
gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, box_proxy); gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, box_proxy);
gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, box_simple); gtk_widget_class_bind_template_child (widget_class, CcNetworkPanel, box_simple);

View file

@ -656,7 +656,7 @@ cc_wifi_panel_class_init (CcWifiPanelClass *klass)
object_class->get_property = cc_wifi_panel_get_property; object_class->get_property = cc_wifi_panel_get_property;
object_class->set_property = cc_wifi_panel_set_property; object_class->set_property = cc_wifi_panel_set_property;
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/network/wifi.ui"); gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/network/cc-wifi-panel.ui");
gtk_widget_class_bind_template_child (widget_class, CcWifiPanel, center_stack); gtk_widget_class_bind_template_child (widget_class, CcWifiPanel, center_stack);
gtk_widget_class_bind_template_child (widget_class, CcWifiPanel, header_stack); gtk_widget_class_bind_template_child (widget_class, CcWifiPanel, header_stack);

View file

@ -49,14 +49,14 @@ sources = files(
) )
resource_data = files( resource_data = files(
'cc-network-panel.ui',
'cc-wifi-panel.ui',
'network-ethernet.ui', 'network-ethernet.ui',
'network-mobile.ui', 'network-mobile.ui',
'network-proxy.ui', 'network-proxy.ui',
'network-simple.ui', 'network-simple.ui',
'network.ui',
'network-vpn.ui', 'network-vpn.ui',
'network-wifi.ui', 'network-wifi.ui',
'wifi.ui'
) )
sources += gnome.compile_resources( sources += gnome.compile_resources(
@ -77,4 +77,4 @@ network_panel_lib = static_library(
c_args: cflags, c_args: cflags,
link_with: libconnection_editor link_with: libconnection_editor
) )
panels_libs += network_panel_lib panels_libs += network_panel_lib

View file

@ -2,7 +2,7 @@
<gresources> <gresources>
<gresource prefix="/org/gnome/control-center/network"> <gresource prefix="/org/gnome/control-center/network">
<!-- Network panel --> <!-- Network panel -->
<file preprocess="xml-stripblanks">network.ui</file> <file preprocess="xml-stripblanks">cc-network-panel.ui</file>
<file preprocess="xml-stripblanks">network-proxy.ui</file> <file preprocess="xml-stripblanks">network-proxy.ui</file>
<file preprocess="xml-stripblanks">network-vpn.ui</file> <file preprocess="xml-stripblanks">network-vpn.ui</file>
<file preprocess="xml-stripblanks">network-wifi.ui</file> <file preprocess="xml-stripblanks">network-wifi.ui</file>
@ -11,6 +11,6 @@
<file preprocess="xml-stripblanks">network-ethernet.ui</file> <file preprocess="xml-stripblanks">network-ethernet.ui</file>
<!-- Wi-Fi panel --> <!-- Wi-Fi panel -->
<file preprocess="xml-stripblanks">wifi.ui</file> <file preprocess="xml-stripblanks">cc-wifi-panel.ui</file>
</gresource> </gresource>
</gresources> </gresources>

View file

@ -62,7 +62,9 @@ panels/mouse/gnome-mouse-properties.ui
panels/mouse/gnome-mouse-test.c panels/mouse/gnome-mouse-test.c
panels/mouse/gnome-mouse-test.ui panels/mouse/gnome-mouse-test.ui
panels/network/cc-network-panel.c panels/network/cc-network-panel.c
panels/network/cc-network-panel.ui
panels/network/cc-wifi-panel.c panels/network/cc-wifi-panel.c
panels/network/cc-wifi-panel.ui
panels/network/connection-editor/8021x-security-page.ui panels/network/connection-editor/8021x-security-page.ui
panels/network/connection-editor/ce-page-8021x-security.c panels/network/connection-editor/ce-page-8021x-security.c
panels/network/connection-editor/ce-page.c panels/network/connection-editor/ce-page.c
@ -94,10 +96,8 @@ panels/network/network-ethernet.ui
panels/network/network-mobile.ui panels/network/network-mobile.ui
panels/network/network-proxy.ui panels/network/network-proxy.ui
panels/network/network-simple.ui panels/network/network-simple.ui
panels/network/network.ui
panels/network/network-vpn.ui panels/network/network-vpn.ui
panels/network/network-wifi.ui panels/network/network-wifi.ui
panels/network/wifi.ui
panels/network/panel-common.c panels/network/panel-common.c
panels/network/wireless-security/eap-method.c panels/network/wireless-security/eap-method.c
panels/network/wireless-security/eap-method-fast.c panels/network/wireless-security/eap-method-fast.c