[gnome-contacts] Rename AvatarDialog to AvatarSelector.



commit add49248bc8fc753c03c9b3357ef2eb21043413b
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Fri Jan 19 09:31:57 2018 +0100

    Rename AvatarDialog to AvatarSelector.
    
    This is in preparation for transforming it to a popover.

 data/contacts.gresource.xml                        |    2 +-
 ...vatar-dialog.ui => contacts-avatar-selector.ui} |    2 +-
 po/POTFILES.in                                     |    2 +-
 ...r-dialog.vala => contacts-avatar-selector.vala} |    8 ++++----
 src/contacts-contact-editor.vala                   |    2 +-
 src/meson.build                                    |    2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/data/contacts.gresource.xml b/data/contacts.gresource.xml
index 2e4f79c..f652c91 100644
--- a/data/contacts.gresource.xml
+++ b/data/contacts.gresource.xml
@@ -6,7 +6,7 @@
     <file compressed="true" preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/contacts-accounts-list.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/contacts-address-map.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">ui/contacts-avatar-dialog.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">ui/contacts-avatar-selector.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/contacts-contact-editor.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/contacts-contact-pane.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/contacts-in-app-notification.ui</file>
diff --git a/data/ui/contacts-avatar-dialog.ui b/data/ui/contacts-avatar-selector.ui
similarity index 99%
rename from data/ui/contacts-avatar-dialog.ui
rename to data/ui/contacts-avatar-selector.ui
index b9c0819..e117827 100644
--- a/data/ui/contacts-avatar-dialog.ui
+++ b/data/ui/contacts-avatar-selector.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.20"/>
-  <template class="ContactsAvatarDialog" parent="GtkDialog">
+  <template class="ContactsAvatarSelector" parent="GtkDialog">
     <property name="visible">True</property>
     <property name="title" translatable="yes">Select Picture</property>
     <property name="modal">True</property>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1ac14a4..cb99c76 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,7 +5,7 @@ data/org.gnome.Contacts.desktop.in
 data/gtk/help-overlay.ui
 data/gtk/menus.ui
 data/ui/contacts-accounts-list.ui
-data/ui/contacts-avatar-dialog.ui
+data/ui/contacts-avatar-selector.ui
 data/ui/contacts-contact-editor.ui
 data/ui/contacts-contact-pane.ui
 data/ui/contacts-link-suggestion-grid.ui
diff --git a/src/contacts-avatar-dialog.vala b/src/contacts-avatar-selector.vala
similarity index 97%
rename from src/contacts-avatar-dialog.vala
rename to src/contacts-avatar-selector.vala
index d8990a1..8967ce9 100644
--- a/src/contacts-avatar-dialog.vala
+++ b/src/contacts-avatar-selector.vala
@@ -20,14 +20,14 @@ using Gtk;
 using Folks;
 
 /**
- * The AvatarDialog can be used to choose the avatar for a contact.
+ * The AvatarSelector can be used to choose the avatar for a contact.
  * This can be done by either choosing a stock thumbnail, an image file
  * provided by the user, or -if cheese is enabled- by using a webcam.
  *
  * After a user has initially chosen an avatar, we provide a cropping tool.
  */
-[GtkTemplate (ui = "/org/gnome/Contacts/ui/contacts-avatar-dialog.ui")]
-public class Contacts.AvatarDialog : Dialog {
+[GtkTemplate (ui = "/org/gnome/Contacts/ui/contacts-avatar-selector.ui")]
+public class Contacts.AvatarSelector : Dialog {
   const int MAIN_SIZE = 128;
   const int ICONS_SIZE = 64;
 
@@ -72,7 +72,7 @@ public class Contacts.AvatarDialog : Dialog {
    */
   public signal void set_avatar (GLib.Icon avatar_icon);
 
-  public AvatarDialog (Window main_window, Contact? contact) {
+  public AvatarSelector (Window main_window, Contact? contact) {
     Object (
       transient_for: main_window,
       use_header_bar: 1
diff --git a/src/contacts-contact-editor.vala b/src/contacts-contact-editor.vala
index 922ee7e..78bf5fc 100644
--- a/src/contacts-contact-editor.vala
+++ b/src/contacts-contact-editor.vala
@@ -962,7 +962,7 @@ public class Contacts.ContactEditor : Grid {
 
   // Show the avatar dialog when the avatar is clicked
   private void on_avatar_button_clicked (Button avatar_button) {
-    var dialog = new AvatarDialog ((Window) get_toplevel (), this.contact);
+    var dialog = new AvatarSelector ((Window) get_toplevel (), this.contact);
     dialog.set_avatar.connect ( (icon) =>  {
         this.avatar.set_data ("value", icon);
         this.avatar.set_data ("changed", true);
diff --git a/src/meson.build b/src/meson.build
index 14f2604..2917686 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -9,7 +9,7 @@ contacts_vala_sources = [
   'contacts-accounts-list.vala',
   'contacts-app.vala',
   'contacts-avatar.vala',
-  'contacts-avatar-dialog.vala',
+  'contacts-avatar-selector.vala',
   'contacts-contact-editor.vala',
   'contacts-contact-list.vala',
   'contacts-contact-pane.vala',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]