summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/contacts.gresource.xml2
-rw-r--r--data/flatpak/org.gnome.Contacts.json1
-rw-r--r--data/icons/hicolor/16x16/apps/org.gnome.Contacts.png (renamed from data/icons/hicolor/16x16/apps/gnome-contacts.png)bin878 -> 878 bytes
-rw-r--r--data/icons/hicolor/22x22/apps/org.gnome.Contacts.png (renamed from data/icons/hicolor/22x22/apps/gnome-contacts.png)bin1264 -> 1264 bytes
-rw-r--r--data/icons/hicolor/24x24/apps/org.gnome.Contacts.png (renamed from data/icons/hicolor/24x24/apps/gnome-contacts.png)bin1317 -> 1317 bytes
-rw-r--r--data/icons/hicolor/32x32/apps/org.gnome.Contacts.png (renamed from data/icons/hicolor/32x32/apps/gnome-contacts.png)bin2119 -> 2119 bytes
-rw-r--r--data/icons/hicolor/48x48/apps/org.gnome.Contacts.png (renamed from data/icons/hicolor/48x48/apps/gnome-contacts.png)bin3402 -> 3402 bytes
-rw-r--r--data/icons/hicolor/512x512/apps/org.gnome.Contacts.png (renamed from data/icons/hicolor/512x512/apps/gnome-contacts.png)bin84688 -> 84688 bytes
-rw-r--r--data/icons/hicolor/org.gnome.Contacts.svg (renamed from data/icons/hicolor/gnome-contacts.svg)0
-rw-r--r--data/icons/hicolor/symbolic/apps/org.gnome.Contacts.svg (renamed from data/icons/hicolor/symbolic/apps/gnome-contacts-symbolic.svg)0
-rw-r--r--data/org.gnome.Contacts.desktop.in2
-rw-r--r--data/ui/contacts-contact-editor.ui26
-rw-r--r--data/ui/contacts-contact-form.ui35
-rw-r--r--data/ui/contacts-contact-pane.ui17
-rw-r--r--data/ui/contacts-contact-sheet.ui34
-rw-r--r--data/ui/style.css4
16 files changed, 42 insertions, 79 deletions
diff --git a/data/contacts.gresource.xml b/data/contacts.gresource.xml
index 6564cfd..30c7fc3 100644
--- a/data/contacts.gresource.xml
+++ b/data/contacts.gresource.xml
@@ -7,8 +7,8 @@
<file compressed="true" preprocess="xml-stripblanks">ui/contacts-accounts-list.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-form.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/contacts-contact-pane.ui</file>
- <file compressed="true" preprocess="xml-stripblanks">ui/contacts-contact-sheet.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/contacts-crop-cheese-dialog.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/contacts-in-app-notification.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/contacts-link-suggestion-grid.ui</file>
diff --git a/data/flatpak/org.gnome.Contacts.json b/data/flatpak/org.gnome.Contacts.json
index dd20042..65d6299 100644
--- a/data/flatpak/org.gnome.Contacts.json
+++ b/data/flatpak/org.gnome.Contacts.json
@@ -5,7 +5,6 @@
"sdk": "org.gnome.Sdk",
"command": "gnome-contacts",
"desktop-file-name-prefix": "(Development) ",
- "rename-icon": "gnome-contacts",
"copy-icon": true,
"finish-args": [
/* X11 + XShm access */
diff --git a/data/icons/hicolor/16x16/apps/gnome-contacts.png b/data/icons/hicolor/16x16/apps/org.gnome.Contacts.png
index 7b3121f..7b3121f 100644
--- a/data/icons/hicolor/16x16/apps/gnome-contacts.png
+++ b/data/icons/hicolor/16x16/apps/org.gnome.Contacts.png
Binary files differ
diff --git a/data/icons/hicolor/22x22/apps/gnome-contacts.png b/data/icons/hicolor/22x22/apps/org.gnome.Contacts.png
index d1d1584..d1d1584 100644
--- a/data/icons/hicolor/22x22/apps/gnome-contacts.png
+++ b/data/icons/hicolor/22x22/apps/org.gnome.Contacts.png
Binary files differ
diff --git a/data/icons/hicolor/24x24/apps/gnome-contacts.png b/data/icons/hicolor/24x24/apps/org.gnome.Contacts.png
index 2f56f41..2f56f41 100644
--- a/data/icons/hicolor/24x24/apps/gnome-contacts.png
+++ b/data/icons/hicolor/24x24/apps/org.gnome.Contacts.png
Binary files differ
diff --git a/data/icons/hicolor/32x32/apps/gnome-contacts.png b/data/icons/hicolor/32x32/apps/org.gnome.Contacts.png
index cfadd37..cfadd37 100644
--- a/data/icons/hicolor/32x32/apps/gnome-contacts.png
+++ b/data/icons/hicolor/32x32/apps/org.gnome.Contacts.png
Binary files differ
diff --git a/data/icons/hicolor/48x48/apps/gnome-contacts.png b/data/icons/hicolor/48x48/apps/org.gnome.Contacts.png
index 2fbf4ce..2fbf4ce 100644
--- a/data/icons/hicolor/48x48/apps/gnome-contacts.png
+++ b/data/icons/hicolor/48x48/apps/org.gnome.Contacts.png
Binary files differ
diff --git a/data/icons/hicolor/512x512/apps/gnome-contacts.png b/data/icons/hicolor/512x512/apps/org.gnome.Contacts.png
index 000f08f..000f08f 100644
--- a/data/icons/hicolor/512x512/apps/gnome-contacts.png
+++ b/data/icons/hicolor/512x512/apps/org.gnome.Contacts.png
Binary files differ
diff --git a/data/icons/hicolor/gnome-contacts.svg b/data/icons/hicolor/org.gnome.Contacts.svg
index 031a067..031a067 100644
--- a/data/icons/hicolor/gnome-contacts.svg
+++ b/data/icons/hicolor/org.gnome.Contacts.svg
diff --git a/data/icons/hicolor/symbolic/apps/gnome-contacts-symbolic.svg b/data/icons/hicolor/symbolic/apps/org.gnome.Contacts.svg
index f58d16d..f58d16d 100644
--- a/data/icons/hicolor/symbolic/apps/gnome-contacts-symbolic.svg
+++ b/data/icons/hicolor/symbolic/apps/org.gnome.Contacts.svg
diff --git a/data/org.gnome.Contacts.desktop.in b/data/org.gnome.Contacts.desktop.in
index 9afe1ef..63945b4 100644
--- a/data/org.gnome.Contacts.desktop.in
+++ b/data/org.gnome.Contacts.desktop.in
@@ -4,7 +4,7 @@ Comment=A contacts manager for GNOME
# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
Keywords=friends;address book;
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=gnome-contacts
+Icon=org.gnome.Contacts
Exec=gnome-contacts
Terminal=false
Type=Application
diff --git a/data/ui/contacts-contact-editor.ui b/data/ui/contacts-contact-editor.ui
index 57a862f..a601209 100644
--- a/data/ui/contacts-contact-editor.ui
+++ b/data/ui/contacts-contact-editor.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="3.20"/>
+ <requires lib="gtk+" version="3.22"/>
<menu id="edit-contact-menu">
<item>
@@ -49,32 +49,10 @@
</item>
</menu>
- <template class="ContactsContactEditor" parent="GtkGrid">
+ <template class="ContactsContactEditor" parent="ContactsContactForm">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkScrolledWindow" id="main_sw">
- <property name="visible">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="shadow_type">none</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <object class="GtkGrid" id="container_grid">
- <property name="visible">True</property>
- <property name="margin">36</property>
- <property name="margin_bottom">24</property>
- <property name="row_spacing">12</property>
- <property name="column_spacing">12</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <signal name="size-allocate" handler="on_container_grid_size_allocate" after="true" />
- </object>
- </child>
- </object>
- </child>
- <child>
<object class="GtkActionBar">
<property name="visible">True</property>
<child>
diff --git a/data/ui/contacts-contact-form.ui b/data/ui/contacts-contact-form.ui
new file mode 100644
index 0000000..b0c1fd1
--- /dev/null
+++ b/data/ui/contacts-contact-form.ui
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.22 -->
+ <template class="ContactsContactForm" parent="GtkGrid">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkScrolledWindow" id="main_sw">
+ <property name="visible">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">none</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <object class="ContactsMaxWidthBin">
+ <property name="visible">True</property>
+ <property name="max_width">600</property>
+ <child>
+ <object class="GtkGrid" id="container_grid">
+ <property name="visible">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="row_spacing">12</property>
+ <property name="column_spacing">16</property>
+ <property name="margin">36</property>
+ <property name="margin_bottom">24</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </template>
+</interface>
diff --git a/data/ui/contacts-contact-pane.ui b/data/ui/contacts-contact-pane.ui
index d76e65e..a999b66 100644
--- a/data/ui/contacts-contact-pane.ui
+++ b/data/ui/contacts-contact-pane.ui
@@ -43,23 +43,8 @@
</packing>
</child>
<child>
- <object class="GtkScrolledWindow" id="contact_sheet_page">
+ <object class="GtkBox" id="contact_sheet_page">
<property name="visible">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="shadow_type">none</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <object class="ContactsMaxWidthBin" id="contact_sheet_container">
- <property name="visible">True</property>
- <property name="max-width">600</property>
- </object>
- </child>
- <style>
- <class name="contacts-main-view"/>
- <class name="view"/>
- </style>
</object>
<packing>
<property name="name">contact-sheet-page</property>
diff --git a/data/ui/contacts-contact-sheet.ui b/data/ui/contacts-contact-sheet.ui
deleted file mode 100644
index a65ece5..0000000
--- a/data/ui/contacts-contact-sheet.ui
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <!-- interface-requires gtk+ 3.22 -->
- <template class="ContactsContactSheet" parent="GtkGrid">
- <property name="visible">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="orientation">vertical</property>
- <property name="row_spacing">12</property>
- <property name="column_spacing">16</property>
- <property name="margin">36</property>
- <property name="margin_bottom">24</property>
- <child>
- <object class="GtkLabel" id="name_label">
- <property name="visible">True</property>
- <property name="selectable">True</property>
- <property name="hexpand">True</property>
- <property name="halign">start</property>
- <property name="valign">center</property>
- <property name="margin_start">6</property>
- <property name="xalign">0</property>
- <property name="ellipsize">end</property>
- <style>
- <class name="contacts-contact-sheet"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="height">3</property>
- </packing>
- </child>
- </template>
-</interface>
diff --git a/data/ui/style.css b/data/ui/style.css
index 455dd65..848f849 100644
--- a/data/ui/style.css
+++ b/data/ui/style.css
@@ -23,8 +23,8 @@ ContactsListPane.frame:dir(rtl) {
row.contact-data-row {
}
-/* Background color in contacts pane, similar to .documents-main-view.view */
-.contacts-main-view.view {
+/* Styles for a ContactsContactForm */
+.contacts-contact-form {
background-color: mix(@theme_bg_color, @theme_base_color, 0.4);
}
View Lorry Controller Status