[gnome-control-center/panel-ui-filenames: 4/7] datetime: Make .ui filename match the .c filename
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/panel-ui-filenames: 4/7] datetime: Make .ui filename match the .c filename
- Date: Fri, 9 Nov 2018 00:46:48 +0000 (UTC)
commit 7feb4354fe90b78989298b5e975a9b1f444f76e1
Author: Robert Ancell <robert ancell canonical com>
Date: Thu Nov 8 14:37:55 2018 +1300
datetime: Make .ui filename match the .c filename
panels/color/cc-color-panel.c | 2 +-
panels/color/{color.ui => cc-color-panel.ui} | 0
panels/color/color.gresource.xml | 2 +-
panels/color/meson.build | 2 +-
panels/datetime/cc-datetime-panel.c | 2 +-
panels/datetime/{datetime.ui => cc-datetime-panel.ui} | 0
panels/datetime/datetime.gresource.xml | 2 +-
panels/datetime/meson.build | 2 +-
po/POTFILES.in | 4 ++--
9 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c
index ee26cfed9..49ca35220 100644
--- a/panels/color/cc-color-panel.c
+++ b/panels/color/cc-color-panel.c
@@ -1990,7 +1990,7 @@ cc_color_panel_class_init (CcColorPanelClass *klass)
object_class->dispose = cc_color_panel_dispose;
object_class->finalize = cc_color_panel_finalize;
- gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/color/color.ui");
+ gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/control-center/color/cc-color-panel.ui");
gtk_widget_class_bind_template_child (widget_class, CcColorPanel, assistant_calib);
gtk_widget_class_bind_template_child (widget_class, CcColorPanel, box_calib_brightness);
diff --git a/panels/color/color.ui b/panels/color/cc-color-panel.ui
similarity index 100%
rename from panels/color/color.ui
rename to panels/color/cc-color-panel.ui
diff --git a/panels/color/color.gresource.xml b/panels/color/color.gresource.xml
index 49527861c..9f1f84671 100644
--- a/panels/color/color.gresource.xml
+++ b/panels/color/color.gresource.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/control-center/color">
- <file preprocess="xml-stripblanks">color.ui</file>
+ <file preprocess="xml-stripblanks">cc-color-panel.ui</file>
</gresource>
<gresource prefix="/org/gnome/control-center/color">
<file preprocess="xml-stripblanks">color-calibrate.ui</file>
diff --git a/panels/color/meson.build b/panels/color/meson.build
index 54766a807..2a9b8e903 100644
--- a/panels/color/meson.build
+++ b/panels/color/meson.build
@@ -27,8 +27,8 @@ sources = files(
)
resource_data = files(
+ 'cc-color-panel.ui',
'color-calibrate.ui',
- 'color.ui'
)
sources += gnome.compile_resources(
diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c
index d19af225e..c452b89c2 100644
--- a/panels/datetime/cc-datetime-panel.c
+++ b/panels/datetime/cc-datetime-panel.c
@@ -1109,7 +1109,7 @@ cc_date_time_panel_class_init (CcDateTimePanelClass *klass)
panel_class->get_help_uri = cc_date_time_panel_get_help_uri;
- gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/control-center/datetime/datetime.ui");
+ gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/control-center/datetime/cc-datetime-panel.ui");
gtk_widget_class_bind_template_child (widget_class, CcDateTimePanel, am_pm_button);
gtk_widget_class_bind_template_child (widget_class, CcDateTimePanel, am_pm_stack);
diff --git a/panels/datetime/datetime.ui b/panels/datetime/cc-datetime-panel.ui
similarity index 100%
rename from panels/datetime/datetime.ui
rename to panels/datetime/cc-datetime-panel.ui
diff --git a/panels/datetime/datetime.gresource.xml b/panels/datetime/datetime.gresource.xml
index ccbf955e9..f45270e2d 100644
--- a/panels/datetime/datetime.gresource.xml
+++ b/panels/datetime/datetime.gresource.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/control-center/datetime">
- <file preprocess="xml-stripblanks">datetime.ui</file>
+ <file preprocess="xml-stripblanks">cc-datetime-panel.ui</file>
<file preprocess="xml-stripblanks">little.ui</file>
<file preprocess="xml-stripblanks">big.ui</file>
<file preprocess="xml-stripblanks">middle.ui</file>
diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build
index 5073f263d..64af3422e 100644
--- a/panels/datetime/meson.build
+++ b/panels/datetime/meson.build
@@ -117,7 +117,7 @@ resource_data = files(
'data/timezone_9.png',
'backward',
'big.ui',
- 'datetime.ui',
+ 'cc-datetime-panel.ui',
'little.ui',
'middle.ui',
'ydm.ui'
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1e7b8ba2e..78906a4e1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -13,9 +13,9 @@ panels/color/cc-color-calibrate.c
panels/color/cc-color-common.c
panels/color/cc-color-device.c
panels/color/cc-color-panel.c
+panels/color/cc-color-panel.ui
panels/color/cc-color-profile.c
panels/color/color-calibrate.ui
-panels/color/color.ui
panels/color/gnome-color-panel.desktop.in.in
panels/common/cc-common-language.c
panels/common/cc-language-chooser.c
@@ -24,7 +24,7 @@ panels/common/cc-util.c
panels/common/hostname-helper.c
panels/datetime/big.ui
panels/datetime/cc-datetime-panel.c
-panels/datetime/datetime.ui
+panels/datetime/cc-datetime-panel.ui
panels/datetime/gnome-datetime-panel.desktop.in.in
panels/datetime/little.ui
panels/datetime/middle.ui
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]