[shotwell] i18n: Fix Builder file extraction
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell] i18n: Fix Builder file extraction
- Date: Mon, 4 Jul 2016 19:42:28 +0000 (UTC)
commit e2ff74c3403f77164704532dec554a88224f03a5
Author: Jens Georg <mail jensge org>
Date: Mon Jul 4 21:15:45 2016 +0200
i18n: Fix Builder file extraction
Signed-off-by: Jens Georg <mail jensge org>
.../GalleryConnector.vala | 4 +-
.../RajcePublishing.vala | 4 +-
.../TumblrPublishing.vala | 4 +-
.../YandexPublishing.vala | 2 +-
..._pane.glade => gallery3_authentication_pane.ui} | 2 +-
...e.glade => gallery3_publishing_options_pane.ui} | 2 +-
...ion_pane.glade => rajce_authentication_pane.ui} | 2 +-
...pane.glade => rajce_publishing_options_pane.ui} | 4 +-
...on_pane.glade => tumblr_authentication_pane.ui} | 2 +-
...ane.glade => tumblr_publishing_options_pane.ui} | 2 +-
...publish_model.glade => yandex_publish_model.ui} | 0
.../shotwell-publishing/FacebookPublishing.vala | 2 +-
plugins/shotwell-publishing/FlickrPublishing.vala | 4 +-
plugins/shotwell-publishing/PicasaPublishing.vala | 2 +-
plugins/shotwell-publishing/PiwigoPublishing.vala | 4 +-
plugins/shotwell-publishing/YouTubePublishing.vala | 2 +-
...e.glade => facebook_publishing_options_pane.ui} | 2 +-
...n_entry_pane.glade => flickr_pin_entry_pane.ui} | 0
...ane.glade => flickr_publishing_options_pane.ui} | 2 +-
...ane.glade => picasa_publishing_options_pane.ui} | 0
...on_pane.glade => piwigo_authentication_pane.ui} | 2 +-
...ane.glade => piwigo_publishing_options_pane.ui} | 0
...ne.glade => youtube_publishing_options_pane.ui} | 0
po/POTFILES.in | 34 ++++++++++----------
publish-extra.am | 14 ++++----
publish.am | 14 ++++----
src/AppWindow.vala | 2 +-
src/Dialogs.vala | 4 +-
ui/Makefile.am | 6 ++--
...round_dialog.glade => set_background_dialog.ui} | 0
...og.glade => set_background_slideshow_dialog.ui} | 0
ui/{shotwell.glade => shotwell.ui} | 0
32 files changed, 61 insertions(+), 61 deletions(-)
---
diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.vala
b/plugins/shotwell-publishing-extras/GalleryConnector.vala
index 6eb5a3a..2642b3a 100644
--- a/plugins/shotwell-publishing-extras/GalleryConnector.vala
+++ b/plugins/shotwell-publishing-extras/GalleryConnector.vala
@@ -1013,7 +1013,7 @@ public class GalleryPublisher : Spit.Publishing.Publisher, GLib.Object {
try {
builder.add_from_file(
host.get_module_file().get_parent().get_child(
- "gallery3_publishing_options_pane.glade").get_path());
+ "gallery3_publishing_options_pane.ui").get_path());
}
catch (Error e) {
warning("Could not parse UI file! Error: %s.", e.message);
@@ -1766,7 +1766,7 @@ internal class CredentialsPane : Spit.Publishing.DialogPane, GLib.Object {
try {
builder.add_from_file(
host.get_module_file().get_parent().get_child(
- "gallery3_authentication_pane.glade").get_path());
+ "gallery3_authentication_pane.ui").get_path());
}
catch (Error e) {
warning("Could not parse UI file! Error: %s.", e.message);
diff --git a/plugins/shotwell-publishing-extras/RajcePublishing.vala
b/plugins/shotwell-publishing-extras/RajcePublishing.vala
index d282ed5..20038aa 100644
--- a/plugins/shotwell-publishing-extras/RajcePublishing.vala
+++ b/plugins/shotwell-publishing-extras/RajcePublishing.vala
@@ -844,7 +844,7 @@ internal class AuthenticationPane : Spit.Publishing.DialogPane, Object
public AuthenticationPane( RajcePublisher publisher, Mode mode = Mode.INTRO )
{
this.pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
- File ui_file =
publisher.get_host().get_module_file().get_parent().get_child("rajce_authentication_pane.glade");
+ File ui_file =
publisher.get_host().get_module_file().get_parent().get_child("rajce_authentication_pane.ui");
try
{
builder = new Gtk.Builder();
@@ -986,7 +986,7 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object
this.publisher = publisher;
this.pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
- File ui_file =
publisher.get_host().get_module_file().get_parent().get_child("rajce_publishing_options_pane.glade");
+ File ui_file =
publisher.get_host().get_module_file().get_parent().get_child("rajce_publishing_options_pane.ui");
try
{
this.builder = new Gtk.Builder();
diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.vala
b/plugins/shotwell-publishing-extras/TumblrPublishing.vala
index 9e17b4e..97c6adb 100644
--- a/plugins/shotwell-publishing-extras/TumblrPublishing.vala
+++ b/plugins/shotwell-publishing-extras/TumblrPublishing.vala
@@ -597,7 +597,7 @@ internal class AuthenticationPane : Spit.Publishing.DialogPane, Object {
this.pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
File ui_file = publisher.get_host().get_module_file().get_parent().
- get_child("tumblr_authentication_pane.glade");
+ get_child("tumblr_authentication_pane.ui");
try {
builder = new Gtk.Builder();
@@ -715,7 +715,7 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
this.sizes = sizes;
this.blogs=blogs;
File ui_file = publisher.get_host().get_module_file().get_parent().
- get_child("tumblr_publishing_options_pane.glade");
+ get_child("tumblr_publishing_options_pane.ui");
try {
builder = new Gtk.Builder();
diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.vala
b/plugins/shotwell-publishing-extras/YandexPublishing.vala
index 6504572..99e980d 100644
--- a/plugins/shotwell-publishing-extras/YandexPublishing.vala
+++ b/plugins/shotwell-publishing-extras/YandexPublishing.vala
@@ -238,7 +238,7 @@ internal class PublishingOptionsPane: Spit.Publishing.DialogPane, GLib.Object {
box = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
- File ui_file = host.get_module_file().get_parent().get_child("yandex_publish_model.glade");
+ File ui_file = host.get_module_file().get_parent().get_child("yandex_publish_model.ui");
try {
builder = new Gtk.Builder();
diff --git a/plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade
b/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
similarity index 98%
rename from plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade
rename to plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
index 43eb422..dc8b373 100644
--- a/plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade
+++ b/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
@@ -15,7 +15,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="ypad">15</property>
- <property name="label" translatable="yes">Intro message replaced at runtime</property>
+ <property name="label">Intro message replaced at runtime</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</object>
diff --git a/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade
b/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
similarity index 98%
rename from plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade
rename to plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
index 17e3569..fc2824f 100644
--- a/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade
+++ b/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
@@ -30,7 +30,7 @@
<property name="can_focus">False</property>
<property name="xalign">0.30000001192092896</property>
<property name="ypad">16</property>
- <property name="label" translatable="yes">'Publishing to $url as $username' (populated in
application code)</property>
+ <property name="label">'Publishing to $url as $username' (populated in application code)</property>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/plugins/shotwell-publishing-extras/rajce_authentication_pane.glade
b/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
similarity index 98%
rename from plugins/shotwell-publishing-extras/rajce_authentication_pane.glade
rename to plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
index 61f6c69..72ac53c 100644
--- a/plugins/shotwell-publishing-extras/rajce_authentication_pane.glade
+++ b/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
@@ -24,7 +24,7 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">label</property>
+ <property name="label">label</property>
<property name="wrap">True</property>
</object>
<packing>
diff --git a/plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade
b/plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui
similarity index 98%
rename from plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade
rename to plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui
index c6b992c..374ca65 100644
--- a/plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade
+++ b/plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui
@@ -24,7 +24,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="label" translatable="yes">you are logged in rajce as $name</property>
+ <property name="label">you are logged in rajce as $name</property>
</object>
<packing>
<property name="expand">False</property>
@@ -199,7 +199,7 @@
<property name="margin_top">4</property>
<property name="margin_bottom">8</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">$mediatype will appear in</property>
+ <property name="label">$mediatype will appear in</property>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade
b/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
similarity index 98%
rename from plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade
rename to plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
index 9b43309..131a547 100644
--- a/plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade
+++ b/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
@@ -24,7 +24,7 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">label</property>
+ <property name="label">label</property>
<property name="wrap">True</property>
</object>
<packing>
diff --git a/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade
b/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui
similarity index 99%
rename from plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade
rename to plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui
index 102e260..ac201da 100644
--- a/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade
+++ b/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui
@@ -18,7 +18,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="no">You are logged into Tumblr as (name).
-(this label's string is populated and set inside the code,
+(this label's string is populated and set inside the code,
so changes made here will not display)</property>
</object>
<packing>
diff --git a/plugins/shotwell-publishing-extras/yandex_publish_model.glade
b/plugins/shotwell-publishing-extras/yandex_publish_model.ui
similarity index 100%
rename from plugins/shotwell-publishing-extras/yandex_publish_model.glade
rename to plugins/shotwell-publishing-extras/yandex_publish_model.ui
diff --git a/plugins/shotwell-publishing/FacebookPublishing.vala
b/plugins/shotwell-publishing/FacebookPublishing.vala
index f6cccb6..729b2da 100644
--- a/plugins/shotwell-publishing/FacebookPublishing.vala
+++ b/plugins/shotwell-publishing/FacebookPublishing.vala
@@ -366,7 +366,7 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
// with File objects directly and expects a pathname instead.
builder.add_from_file(
host.get_module_file().get_parent().
- get_child("facebook_publishing_options_pane.glade").get_path());
+ get_child("facebook_publishing_options_pane.ui").get_path());
} catch (Error e) {
warning("Could not parse UI file! Error: %s.", e.message);
host.post_error(
diff --git a/plugins/shotwell-publishing/FlickrPublishing.vala
b/plugins/shotwell-publishing/FlickrPublishing.vala
index e6c1104..0eea485 100644
--- a/plugins/shotwell-publishing/FlickrPublishing.vala
+++ b/plugins/shotwell-publishing/FlickrPublishing.vala
@@ -436,7 +436,7 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
Gtk.Builder builder = new Gtk.Builder();
try {
-
builder.add_from_file(host.get_module_file().get_parent().get_child("flickr_pin_entry_pane.glade").get_path());
+
builder.add_from_file(host.get_module_file().get_parent().get_child("flickr_pin_entry_pane.ui").get_path());
} catch (Error e) {
warning("Could not parse UI file! Error: %s.", e.message);
host.post_error(
@@ -587,7 +587,7 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
// with File objects directly and expects a pathname instead.
builder.add_from_file(
host.get_module_file().get_parent().
- get_child("flickr_publishing_options_pane.glade").get_path());
+ get_child("flickr_publishing_options_pane.ui").get_path());
} catch (Error e) {
warning("Could not parse UI file! Error: %s.", e.message);
host.post_error(
diff --git a/plugins/shotwell-publishing/PicasaPublishing.vala
b/plugins/shotwell-publishing/PicasaPublishing.vala
index cb6352c..03a34c6 100644
--- a/plugins/shotwell-publishing/PicasaPublishing.vala
+++ b/plugins/shotwell-publishing/PicasaPublishing.vala
@@ -353,7 +353,7 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
// with File objects directly and expects a pathname instead.
builder.add_from_file(
get_host().get_module_file().get_parent().
- get_child("picasa_publishing_options_pane.glade").get_path());
+ get_child("picasa_publishing_options_pane.ui").get_path());
} catch (Error e) {
warning("Could not parse UI file! Error: %s.", e.message);
get_host().post_error(
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.vala
b/plugins/shotwell-publishing/PiwigoPublishing.vala
index 7dd9090..a5a1323 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.vala
+++ b/plugins/shotwell-publishing/PiwigoPublishing.vala
@@ -1002,7 +1002,7 @@ internal class AuthenticationPane : Spit.Publishing.DialogPane, Object {
this.pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
File ui_file = publisher.get_host().get_module_file().get_parent().
- get_child("piwigo_authentication_pane.glade");
+ get_child("piwigo_authentication_pane.ui");
try {
builder = new Gtk.Builder();
@@ -1157,7 +1157,7 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object {
this.last_no_upload_tags = last_no_upload_tags;
File ui_file = publisher.get_host().get_module_file().get_parent().
- get_child("piwigo_publishing_options_pane.glade");
+ get_child("piwigo_publishing_options_pane.ui");
try {
builder = new Gtk.Builder();
diff --git a/plugins/shotwell-publishing/YouTubePublishing.vala
b/plugins/shotwell-publishing/YouTubePublishing.vala
index 15f283f..78dc52f 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.vala
+++ b/plugins/shotwell-publishing/YouTubePublishing.vala
@@ -354,7 +354,7 @@ public class YouTubePublisher : Publishing.RESTSupport.GooglePublisher {
try {
builder.add_from_file(
-
get_host().get_module_file().get_parent().get_child("youtube_publishing_options_pane.glade").get_path());
+
get_host().get_module_file().get_parent().get_child("youtube_publishing_options_pane.ui").get_path());
} catch (Error e) {
warning("Could not parse UI file! Error: %s.", e.message);
get_host().post_error(
diff --git a/plugins/shotwell-publishing/facebook_publishing_options_pane.glade
b/plugins/shotwell-publishing/facebook_publishing_options_pane.ui
similarity index 99%
rename from plugins/shotwell-publishing/facebook_publishing_options_pane.glade
rename to plugins/shotwell-publishing/facebook_publishing_options_pane.ui
index 7eb30f6..674b078 100644
--- a/plugins/shotwell-publishing/facebook_publishing_options_pane.glade
+++ b/plugins/shotwell-publishing/facebook_publishing_options_pane.ui
@@ -18,7 +18,7 @@
<property name="can_focus">False</property>
<property name="xalign">0.30000001192092896</property>
<property name="ypad">16</property>
- <property name="label" translatable="no"> (text depends on fb username and is modified in the
app -
+ <property name="label" translatable="no"> (text depends on fb username and is modified in the
app -
anything put into this field won't display)</property>
</object>
<packing>
diff --git a/plugins/shotwell-publishing/flickr_pin_entry_pane.glade
b/plugins/shotwell-publishing/flickr_pin_entry_pane.ui
similarity index 100%
rename from plugins/shotwell-publishing/flickr_pin_entry_pane.glade
rename to plugins/shotwell-publishing/flickr_pin_entry_pane.ui
diff --git a/plugins/shotwell-publishing/flickr_publishing_options_pane.glade
b/plugins/shotwell-publishing/flickr_publishing_options_pane.ui
similarity index 99%
rename from plugins/shotwell-publishing/flickr_publishing_options_pane.glade
rename to plugins/shotwell-publishing/flickr_publishing_options_pane.ui
index 995f2c2..7f67438 100644
--- a/plugins/shotwell-publishing/flickr_publishing_options_pane.glade
+++ b/plugins/shotwell-publishing/flickr_publishing_options_pane.ui
@@ -18,7 +18,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="no">You are logged into Flickr as (name).
-(this label's string is populated and set inside the code,
+(this label's string is populated and set inside the code,
so changes made here will not display)</property>
</object>
<packing>
diff --git a/plugins/shotwell-publishing/picasa_publishing_options_pane.glade
b/plugins/shotwell-publishing/picasa_publishing_options_pane.ui
similarity index 100%
rename from plugins/shotwell-publishing/picasa_publishing_options_pane.glade
rename to plugins/shotwell-publishing/picasa_publishing_options_pane.ui
diff --git a/plugins/shotwell-publishing/piwigo_authentication_pane.glade
b/plugins/shotwell-publishing/piwigo_authentication_pane.ui
similarity index 99%
rename from plugins/shotwell-publishing/piwigo_authentication_pane.glade
rename to plugins/shotwell-publishing/piwigo_authentication_pane.ui
index 367f957..bd32141 100644
--- a/plugins/shotwell-publishing/piwigo_authentication_pane.glade
+++ b/plugins/shotwell-publishing/piwigo_authentication_pane.ui
@@ -24,7 +24,7 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">label</property>
+ <property name="label" translatable="no">label</property>
<property name="wrap">True</property>
</object>
<packing>
diff --git a/plugins/shotwell-publishing/piwigo_publishing_options_pane.glade
b/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui
similarity index 100%
rename from plugins/shotwell-publishing/piwigo_publishing_options_pane.glade
rename to plugins/shotwell-publishing/piwigo_publishing_options_pane.ui
diff --git a/plugins/shotwell-publishing/youtube_publishing_options_pane.glade
b/plugins/shotwell-publishing/youtube_publishing_options_pane.ui
similarity index 100%
rename from plugins/shotwell-publishing/youtube_publishing_options_pane.glade
rename to plugins/shotwell-publishing/youtube_publishing_options_pane.ui
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0a9ce20..5f96f0a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -21,30 +21,30 @@ plugins/shotwell-data-imports/FSpotTagsTable.vala
plugins/shotwell-data-imports/shotwell-data-imports.vala
plugins/shotwell-data-imports/SqliteSupport.vala
plugins/shotwell-data-imports/VersionNumber.vala
-plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade
-plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade
+plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
+plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
plugins/shotwell-publishing-extras/GalleryConnector.vala
-plugins/shotwell-publishing-extras/rajce_authentication_pane.glade
-plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade
+plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
+plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui
plugins/shotwell-publishing-extras/RajcePublishing.vala
plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
-plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade
-plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade
+plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
+plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui
plugins/shotwell-publishing-extras/TumblrPublishing.vala
plugins/shotwell-publishing-extras/YandexPublishing.vala
-plugins/shotwell-publishing-extras/yandex_publish_model.glade
-plugins/shotwell-publishing/facebook_publishing_options_pane.glade
+plugins/shotwell-publishing-extras/yandex_publish_model.ui
+plugins/shotwell-publishing/facebook_publishing_options_pane.ui
plugins/shotwell-publishing/FacebookPublishing.vala
-plugins/shotwell-publishing/flickr_pin_entry_pane.glade
-plugins/shotwell-publishing/flickr_publishing_options_pane.glade
+plugins/shotwell-publishing/flickr_pin_entry_pane.ui
+plugins/shotwell-publishing/flickr_publishing_options_pane.ui
plugins/shotwell-publishing/FlickrPublishing.vala
-plugins/shotwell-publishing/picasa_publishing_options_pane.glade
+plugins/shotwell-publishing/picasa_publishing_options_pane.ui
plugins/shotwell-publishing/PicasaPublishing.vala
-plugins/shotwell-publishing/piwigo_authentication_pane.glade
-plugins/shotwell-publishing/piwigo_publishing_options_pane.glade
+plugins/shotwell-publishing/piwigo_authentication_pane.ui
+plugins/shotwell-publishing/piwigo_publishing_options_pane.ui
plugins/shotwell-publishing/PiwigoPublishing.vala
plugins/shotwell-publishing/shotwell-publishing.vala
-plugins/shotwell-publishing/youtube_publishing_options_pane.glade
+plugins/shotwell-publishing/youtube_publishing_options_pane.ui
plugins/shotwell-publishing/YouTubePublishing.vala
plugins/shotwell-transitions/BlindsEffect.vala
plugins/shotwell-transitions/ChessEffect.vala
@@ -230,6 +230,6 @@ src/util/Util.vala
src/VideoMetadata.vala
src/VideoMonitor.vala
src/VideoSupport.vala
-ui/set_background_dialog.glade
-ui/set_background_slideshow_dialog.glade
-ui/shotwell.glade
+ui/set_background_dialog.ui
+ui/set_background_slideshow_dialog.ui
+ui/shotwell.ui
diff --git a/publish-extra.am b/publish-extra.am
index dee877f..7de4d24 100644
--- a/publish-extra.am
+++ b/publish-extra.am
@@ -3,13 +3,13 @@ dist_plugin_DATA += \
plugins/shotwell-publishing-extras/gallery3.png \
plugins/shotwell-publishing-extras/rajce.png \
plugins/shotwell-publishing-extras/tumblr.png \
- plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade \
- plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade \
- plugins/shotwell-publishing-extras/rajce_authentication_pane.glade \
- plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade \
- plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade \
- plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade \
- plugins/shotwell-publishing-extras/yandex_publish_model.glade
+ plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui \
+ plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui \
+ plugins/shotwell-publishing-extras/rajce_authentication_pane.ui \
+ plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui \
+ plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui \
+ plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui \
+ plugins/shotwell-publishing-extras/yandex_publish_model.ui
plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES = \
plugins/shotwell-publishing-extras/GalleryConnector.vala \
diff --git a/publish.am b/publish.am
index 8564a0a..ba40278 100644
--- a/publish.am
+++ b/publish.am
@@ -6,13 +6,13 @@ dist_plugin_DATA += \
plugins/shotwell-publishing/picasa.png \
plugins/shotwell-publishing/piwigo.png \
plugins/shotwell-publishing/youtube.png \
- plugins/shotwell-publishing/facebook_publishing_options_pane.glade \
- plugins/shotwell-publishing/flickr_pin_entry_pane.glade \
- plugins/shotwell-publishing/flickr_publishing_options_pane.glade \
- plugins/shotwell-publishing/picasa_publishing_options_pane.glade \
- plugins/shotwell-publishing/piwigo_authentication_pane.glade \
- plugins/shotwell-publishing/piwigo_publishing_options_pane.glade \
- plugins/shotwell-publishing/youtube_publishing_options_pane.glade
+ plugins/shotwell-publishing/facebook_publishing_options_pane.ui \
+ plugins/shotwell-publishing/flickr_pin_entry_pane.ui \
+ plugins/shotwell-publishing/flickr_publishing_options_pane.ui \
+ plugins/shotwell-publishing/picasa_publishing_options_pane.ui \
+ plugins/shotwell-publishing/piwigo_authentication_pane.ui \
+ plugins/shotwell-publishing/piwigo_publishing_options_pane.ui \
+ plugins/shotwell-publishing/youtube_publishing_options_pane.ui
plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \
plugins/shotwell-publishing/shotwell-publishing.vala \
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index dcb88fd..b70a20c 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -547,7 +547,7 @@ public abstract class AppWindow : PageWindow {
return fullscreen_window;
}
- public static Gtk.Builder create_builder(string glade_filename = "shotwell.glade", void *user = null) {
+ public static Gtk.Builder create_builder(string glade_filename = "shotwell.ui", void *user = null) {
Gtk.Builder builder = new Gtk.Builder();
try {
builder.add_from_file(AppDirs.get_resources_dir().get_child("ui").get_child(
diff --git a/src/Dialogs.vala b/src/Dialogs.vala
index f9da886..791329f 100644
--- a/src/Dialogs.vala
+++ b/src/Dialogs.vala
@@ -1113,7 +1113,7 @@ public abstract class SetBackgroundDialog {
public class SetBackgroundPhotoDialog : SetBackgroundDialog {
public SetBackgroundPhotoDialog() {
- Gtk.Builder builder = AppWindow.create_builder("set_background_dialog.glade", this);
+ Gtk.Builder builder = AppWindow.create_builder("set_background_dialog.ui", this);
base(builder);
}
@@ -1133,7 +1133,7 @@ public class SetBackgroundSlideshowDialog : SetBackgroundDialog {
private int delay_value = 0;
public SetBackgroundSlideshowDialog() {
- Gtk.Builder builder = AppWindow.create_builder("set_background_slideshow_dialog.glade", this);
+ Gtk.Builder builder = AppWindow.create_builder("set_background_slideshow_dialog.ui", this);
base(builder);
delay_value_label = builder.get_object("delay_value_label") as Gtk.Label;
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 8f1312c..3240db0 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -15,9 +15,9 @@ dist_ui_DATA = \
savedsearch.ui \
search_bar.ui \
search_sidebar_context.ui \
- set_background_dialog.glade \
- set_background_slideshow_dialog.glade \
- shotwell.glade \
+ set_background_dialog.ui \
+ set_background_slideshow_dialog.ui \
+ shotwell.ui \
shotwell.xml \
sidebar_default_context.ui \
tag_sidebar_context.ui \
diff --git a/ui/set_background_dialog.glade b/ui/set_background_dialog.ui
similarity index 100%
rename from ui/set_background_dialog.glade
rename to ui/set_background_dialog.ui
diff --git a/ui/set_background_slideshow_dialog.glade b/ui/set_background_slideshow_dialog.ui
similarity index 100%
rename from ui/set_background_slideshow_dialog.glade
rename to ui/set_background_slideshow_dialog.ui
diff --git a/ui/shotwell.glade b/ui/shotwell.ui
similarity index 100%
rename from ui/shotwell.glade
rename to ui/shotwell.ui
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
