diff options
author | kramo <contact@kramo.hu> | 2023-02-24 14:04:04 +0000 |
---|---|---|
committer | Niels De Graef <nielsdegraef@gmail.com> | 2023-02-24 14:04:04 +0000 |
commit | 0ba314a3b4383bd1210aba0a13d5684c3d162c39 (patch) | |
tree | fbd54e4bb0a9cf84d1427433fd0b493d93d7813c | |
parent | 976897f6b81ec6757709f34e5cbfc870586925e4 (diff) | |
download | gnome-contacts-0ba314a3b4383bd1210aba0a13d5684c3d162c39.tar.gz |
Make QR code dialog consistent with Settings
-rw-r--r-- | data/ui/contacts-qr-code-dialog.ui | 67 | ||||
-rw-r--r-- | src/contacts-qr-code-dialog.vala | 2 |
2 files changed, 44 insertions, 25 deletions
diff --git a/data/ui/contacts-qr-code-dialog.ui b/data/ui/contacts-qr-code-dialog.ui index 51d4929..b55cdc7 100644 --- a/data/ui/contacts-qr-code-dialog.ui +++ b/data/ui/contacts-qr-code-dialog.ui @@ -1,59 +1,78 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> - <template class="ContactsQrCodeDialog" parent="AdwPreferencesWindow"> - <property name="modal">True</property> + <template class="ContactsQrCodeDialog" parent="GtkWindow"> <property name="default-width">400</property> - <property name="default-height">600</property> - <property name="height-request">600</property> + <property name="default-height">550</property> + <property name="height-request">550</property> + <property name="modal">True</property> <property name="destroy-with-parent">True</property> - <property name="search-enabled">False</property> - <property name="can-navigate-back">False</property> <property name="title" translatable="yes">Share Contact</property> + <child type="titlebar"> + <object class="GtkHeaderBar"> + <property name="show-title-buttons">True</property> + <style> + <class name="flat" /> + </style> + </object> + </child> + <child> - <object class="AdwPreferencesPage"> - <property name="margin-top">18</property> - <property name="margin-bottom">18</property> - <property name="margin-start">18</property> - <property name="margin-end">18</property> + <object class="AdwClamp"> <child> - <object class="AdwPreferencesGroup"> + <object class="GtkBox"> + <property name="spacing">24</property> + <property name="orientation">vertical</property> + <property name="margin-top">32</property> + <property name="margin-bottom">32</property> + <property name="margin-start">32</property> + <property name="margin-end">32</property> + <child> <object class="GtkPicture" id="qr_image"> - <property name="alternative-text">QR Code</property> <property name="halign">center</property> - <property name="width-request">300</property> - <property name="height-request">300</property> + <property name="can-shrink">True</property> + <property name="alternative-text" translatable="yes">QR Code</property> <style> - <class name="frame"/> + <class name="card"/> <class name="contacts-qr-code-dialog-qr-image"/> </style> </object> </child> - </object> - </child> - <child> - <object class="AdwPreferencesGroup"> <child> <object class="GtkLabel" id="qr_title"> <property name="label" translatable="yes">Scan to Save</property> <property name="css-classes">title-1</property> </object> </child> + + <child> + <object class="GtkLabel" id="qr_subtitle"> + <property name="wrap">True</property> + <property name="halign">center</property> + <property name="justify">center</property> + <property name="natural-wrap-mode">none</property> + </object> + </child> + </object> </child> + <child> - <object class="AdwPreferencesGroup"> + <object class='GtkShortcutController'> + <property name='scope'>global</property> <child> - <object class="GtkLabel" id="qr_subtitle"> - <property name="halign">center</property> - <property name="wrap">true</property> + <object class='GtkShortcut'> + <property name='trigger'>Escape</property> + <property name='action'>action(window.close)</property> </object> </child> + </object> </child> + </object> </child> </template> diff --git a/src/contacts-qr-code-dialog.vala b/src/contacts-qr-code-dialog.vala index 02c0539..aca6c2b 100644 --- a/src/contacts-qr-code-dialog.vala +++ b/src/contacts-qr-code-dialog.vala @@ -19,7 +19,7 @@ using Folks; using GLib; [GtkTemplate (ui = "/org/gnome/Contacts/ui/contacts-qr-code-dialog.ui")] -public class Contacts.QrCodeDialog : Adw.PreferencesWindow { +public class Contacts.QrCodeDialog : Gtk.Window { [GtkChild] private unowned Gtk.Picture qr_image; |