1282 lines
66 KiB
Diff
1282 lines
66 KiB
Diff
|
From 95f182df3f10ca2da78f9bd51db998185c1d913b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Julian Sparber <julian@sparber.net>
|
||
|
|
Date: Tue, 13 Oct 2020 17:44:32 +0200
|
||
|
|
Subject: [PATCH 6/8] account-editor: use HdyClamp and remove padding
|
||
|
|
|
||
|
|
---
|
||
|
|
ui/accounts_editor_add_pane.ui | 160 ++++++++-------
|
||
|
|
ui/accounts_editor_edit_pane.ui | 318 +++++++++++++++--------------
|
||
|
|
ui/accounts_editor_list_pane.ui | 204 +++++++++---------
|
||
|
|
ui/accounts_editor_remove_pane.ui | 157 +++++++-------
|
||
|
|
ui/accounts_editor_servers_pane.ui | 178 ++++++++--------
|
||
|
|
ui/geary.css | 4 -
|
||
|
|
6 files changed, 525 insertions(+), 496 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/ui/accounts_editor_add_pane.ui b/ui/accounts_editor_add_pane.ui
|
||
|
|
index 336b73ea..5ca519fb 100644
|
||
|
|
--- a/ui/accounts_editor_add_pane.ui
|
||
|
|
+++ b/ui/accounts_editor_add_pane.ui
|
||
|
|
@@ -95,51 +95,14 @@
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
<property name="shadow_type">none</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkGrid" id="pane_content">
|
||
|
|
+ <object class="HdyClamp">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
+ <property name="margin">24</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkFrame">
|
||
|
|
+ <object class="GtkGrid" id="pane_content">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
- <property name="label_xalign">0</property>
|
||
|
|
- <property name="shadow_type">in</property>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkListBox" id="details_list">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
- <property name="selection_mode">none</property>
|
||
|
|
- <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
|
||
|
|
- </object>
|
||
|
|
- </child>
|
||
|
|
- </object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">0</property>
|
||
|
|
- </packing>
|
||
|
|
- </child>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkGrid" id="receiving_panel">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkLabel">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
- <property name="halign">start</property>
|
||
|
|
- <property name="label" translatable="yes">Receiving</property>
|
||
|
|
- <attributes>
|
||
|
|
- <attribute name="weight" value="bold"/>
|
||
|
|
- </attributes>
|
||
|
|
- <style>
|
||
|
|
- <class name="geary-settings-heading"/>
|
||
|
|
- </style>
|
||
|
|
- </object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">0</property>
|
||
|
|
- </packing>
|
||
|
|
- </child>
|
||
|
|
<child>
|
||
|
|
<object class="GtkFrame">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
@@ -147,7 +110,7 @@
|
||
|
|
<property name="label_xalign">0</property>
|
||
|
|
<property name="shadow_type">in</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkListBox" id="receiving_list">
|
||
|
|
+ <object class="GtkListBox" id="details_list">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
<property name="selection_mode">none</property>
|
||
|
|
@@ -157,66 +120,111 @@
|
||
|
|
</object>
|
||
|
|
<packing>
|
||
|
|
<property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">1</property>
|
||
|
|
+ <property name="top_attach">0</property>
|
||
|
|
</packing>
|
||
|
|
</child>
|
||
|
|
- </object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">1</property>
|
||
|
|
- </packing>
|
||
|
|
- </child>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkGrid" id="sending_panel">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkLabel">
|
||
|
|
+ <object class="GtkGrid" id="receiving_panel">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
- <property name="halign">start</property>
|
||
|
|
- <property name="label" translatable="yes">Sending</property>
|
||
|
|
- <attributes>
|
||
|
|
- <attribute name="weight" value="bold"/>
|
||
|
|
- </attributes>
|
||
|
|
- <style>
|
||
|
|
- <class name="geary-settings-heading"/>
|
||
|
|
- </style>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkLabel">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="halign">start</property>
|
||
|
|
+ <property name="label" translatable="yes">Receiving</property>
|
||
|
|
+ <attributes>
|
||
|
|
+ <attribute name="weight" value="bold"/>
|
||
|
|
+ </attributes>
|
||
|
|
+ <style>
|
||
|
|
+ <class name="geary-settings-heading"/>
|
||
|
|
+ </style>
|
||
|
|
+ </object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">0</property>
|
||
|
|
+ </packing>
|
||
|
|
+ </child>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkFrame">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="label_xalign">0</property>
|
||
|
|
+ <property name="shadow_type">in</property>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkListBox" id="receiving_list">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="selection_mode">none</property>
|
||
|
|
+ <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
|
||
|
|
+ </object>
|
||
|
|
+ </child>
|
||
|
|
+ </object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">1</property>
|
||
|
|
+ </packing>
|
||
|
|
+ </child>
|
||
|
|
</object>
|
||
|
|
<packing>
|
||
|
|
<property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">0</property>
|
||
|
|
+ <property name="top_attach">1</property>
|
||
|
|
</packing>
|
||
|
|
</child>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkFrame">
|
||
|
|
+ <object class="GtkGrid" id="sending_panel">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
- <property name="label_xalign">0</property>
|
||
|
|
- <property name="shadow_type">in</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkListBox" id="sending_list">
|
||
|
|
+ <object class="GtkLabel">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
- <property name="selection_mode">none</property>
|
||
|
|
- <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
|
||
|
|
+ <property name="halign">start</property>
|
||
|
|
+ <property name="label" translatable="yes">Sending</property>
|
||
|
|
+ <attributes>
|
||
|
|
+ <attribute name="weight" value="bold"/>
|
||
|
|
+ </attributes>
|
||
|
|
+ <style>
|
||
|
|
+ <class name="geary-settings-heading"/>
|
||
|
|
+ </style>
|
||
|
|
</object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">0</property>
|
||
|
|
+ </packing>
|
||
|
|
+ </child>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkFrame">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="label_xalign">0</property>
|
||
|
|
+ <property name="shadow_type">in</property>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkListBox" id="sending_list">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="selection_mode">none</property>
|
||
|
|
+ <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
|
||
|
|
+ </object>
|
||
|
|
+ </child>
|
||
|
|
+ </object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">1</property>
|
||
|
|
+ </packing>
|
||
|
|
</child>
|
||
|
|
</object>
|
||
|
|
<packing>
|
||
|
|
<property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">1</property>
|
||
|
|
+ <property name="top_attach">2</property>
|
||
|
|
</packing>
|
||
|
|
</child>
|
||
|
|
+ <style>
|
||
|
|
+ <class name="geary-accounts-editor-pane-content"/>
|
||
|
|
+ </style>
|
||
|
|
+
|
||
|
|
</object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">2</property>
|
||
|
|
- </packing>
|
||
|
|
</child>
|
||
|
|
- <style>
|
||
|
|
- <class name="geary-accounts-editor-pane-content"/>
|
||
|
|
- </style>
|
||
|
|
</object>
|
||
|
|
</child>
|
||
|
|
</object>
|
||
|
|
diff --git a/ui/accounts_editor_edit_pane.ui b/ui/accounts_editor_edit_pane.ui
|
||
|
|
index 3516e5aa..33b4a9e8 100644
|
||
|
|
--- a/ui/accounts_editor_edit_pane.ui
|
||
|
|
+++ b/ui/accounts_editor_edit_pane.ui
|
||
|
|
@@ -88,203 +88,211 @@
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkGrid" id="pane_content">
|
||
|
|
+ <object class="HdyClamp">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
+ <property name="margin">24</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkFrame">
|
||
|
|
+ <object class="GtkGrid" id="pane_content">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
- <property name="hexpand">True</property>
|
||
|
|
- <property name="label_xalign">0</property>
|
||
|
|
- <property name="shadow_type">in</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkListBox" id="details_list">
|
||
|
|
+ <object class="GtkFrame">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
- <property name="selection_mode">none</property>
|
||
|
|
- <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
|
||
|
|
- <signal name="row-activated" handler="on_setting_activated" swapped="no"/>
|
||
|
|
+ <property name="hexpand">True</property>
|
||
|
|
+ <property name="label_xalign">0</property>
|
||
|
|
+ <property name="shadow_type">in</property>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkListBox" id="details_list">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="selection_mode">none</property>
|
||
|
|
+ <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
|
||
|
|
+ <signal name="row-activated" handler="on_setting_activated" swapped="no"/>
|
||
|
|
+ </object>
|
||
|
|
+ </child>
|
||
|
|
+ <child type="label_item">
|
||
|
|
+ <placeholder/>
|
||
|
|
+ </child>
|
||
|
|
</object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">0</property>
|
||
|
|
+ </packing>
|
||
|
|
</child>
|
||
|
|
- <child type="label_item">
|
||
|
|
- <placeholder/>
|
||
|
|
- </child>
|
||
|
|
- </object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">0</property>
|
||
|
|
- </packing>
|
||
|
|
- </child>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkLabel">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
- <property name="halign">start</property>
|
||
|
|
- <property name="label" translatable="yes">Email addresses</property>
|
||
|
|
- <style>
|
||
|
|
- <class name="geary-settings-heading"/>
|
||
|
|
- </style>
|
||
|
|
- </object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">1</property>
|
||
|
|
- </packing>
|
||
|
|
- </child>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkFrame">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
- <property name="hexpand">True</property>
|
||
|
|
- <property name="label_xalign">0</property>
|
||
|
|
- <property name="shadow_type">in</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkListBox" id="senders_list">
|
||
|
|
+ <object class="GtkLabel">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
- <property name="selection_mode">none</property>
|
||
|
|
- <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
|
||
|
|
- <signal name="row-activated" handler="on_setting_activated" swapped="no"/>
|
||
|
|
+ <property name="halign">start</property>
|
||
|
|
+ <property name="label" translatable="yes">Email addresses</property>
|
||
|
|
+ <style>
|
||
|
|
+ <class name="geary-settings-heading"/>
|
||
|
|
+ </style>
|
||
|
|
</object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">1</property>
|
||
|
|
+ </packing>
|
||
|
|
</child>
|
||
|
|
- <child type="label_item">
|
||
|
|
- <placeholder/>
|
||
|
|
- </child>
|
||
|
|
- </object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">2</property>
|
||
|
|
- </packing>
|
||
|
|
- </child>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkLabel">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
- <property name="halign">start</property>
|
||
|
|
- <property name="label" translatable="yes">Signature</property>
|
||
|
|
- <style>
|
||
|
|
- <class name="geary-settings-heading"/>
|
||
|
|
- </style>
|
||
|
|
- </object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">3</property>
|
||
|
|
- </packing>
|
||
|
|
- </child>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkFrame" id="signature_frame">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
- <property name="label_xalign">0</property>
|
||
|
|
- <property name="shadow_type">in</property>
|
||
|
|
<child>
|
||
|
|
- <placeholder/>
|
||
|
|
+ <object class="GtkFrame">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="hexpand">True</property>
|
||
|
|
+ <property name="label_xalign">0</property>
|
||
|
|
+ <property name="shadow_type">in</property>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkListBox" id="senders_list">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="selection_mode">none</property>
|
||
|
|
+ <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
|
||
|
|
+ <signal name="row-activated" handler="on_setting_activated" swapped="no"/>
|
||
|
|
+ </object>
|
||
|
|
+ </child>
|
||
|
|
+ <child type="label_item">
|
||
|
|
+ <placeholder/>
|
||
|
|
+ </child>
|
||
|
|
+ </object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">2</property>
|
||
|
|
+ </packing>
|
||
|
|
</child>
|
||
|
|
- <child type="label_item">
|
||
|
|
- <placeholder/>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkLabel">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="halign">start</property>
|
||
|
|
+ <property name="label" translatable="yes">Signature</property>
|
||
|
|
+ <style>
|
||
|
|
+ <class name="geary-settings-heading"/>
|
||
|
|
+ </style>
|
||
|
|
+ </object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">3</property>
|
||
|
|
+ </packing>
|
||
|
|
</child>
|
||
|
|
- <style>
|
||
|
|
- <class name="geary-settings"/>
|
||
|
|
- <class name="geary-signature"/>
|
||
|
|
- </style>
|
||
|
|
- </object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">4</property>
|
||
|
|
- </packing>
|
||
|
|
- </child>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkLabel">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
- <property name="halign">start</property>
|
||
|
|
- <property name="label" translatable="yes">Settings</property>
|
||
|
|
- <style>
|
||
|
|
- <class name="geary-settings-heading"/>
|
||
|
|
- </style>
|
||
|
|
- </object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">5</property>
|
||
|
|
- </packing>
|
||
|
|
- </child>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkFrame">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
- <property name="hexpand">True</property>
|
||
|
|
- <property name="label_xalign">0</property>
|
||
|
|
- <property name="shadow_type">in</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkListBox" id="settings_list">
|
||
|
|
+ <object class="GtkFrame" id="signature_frame">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
- <property name="selection_mode">none</property>
|
||
|
|
- <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
|
||
|
|
- <signal name="row-activated" handler="on_setting_activated" swapped="no"/>
|
||
|
|
+ <property name="label_xalign">0</property>
|
||
|
|
+ <property name="shadow_type">in</property>
|
||
|
|
+ <child>
|
||
|
|
+ <placeholder/>
|
||
|
|
+ </child>
|
||
|
|
+ <child type="label_item">
|
||
|
|
+ <placeholder/>
|
||
|
|
+ </child>
|
||
|
|
+ <style>
|
||
|
|
+ <class name="geary-settings"/>
|
||
|
|
+ <class name="geary-signature"/>
|
||
|
|
+ </style>
|
||
|
|
</object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">4</property>
|
||
|
|
+ </packing>
|
||
|
|
</child>
|
||
|
|
- <child type="label_item">
|
||
|
|
- <placeholder/>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkLabel">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="halign">start</property>
|
||
|
|
+ <property name="label" translatable="yes">Settings</property>
|
||
|
|
+ <style>
|
||
|
|
+ <class name="geary-settings-heading"/>
|
||
|
|
+ </style>
|
||
|
|
+ </object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">5</property>
|
||
|
|
+ </packing>
|
||
|
|
</child>
|
||
|
|
- </object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">6</property>
|
||
|
|
- </packing>
|
||
|
|
- </child>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkButtonBox">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
- <property name="layout_style">end</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkButton">
|
||
|
|
- <property name="label" translatable="yes" comments="This is a button in the account settings to show server settings.">Server Settings</property>
|
||
|
|
+ <object class="GtkFrame">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
- <property name="can_focus">True</property>
|
||
|
|
- <property name="receives_default">False</property>
|
||
|
|
- <signal name="clicked" handler="on_server_settings_clicked" swapped="no"/>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="hexpand">True</property>
|
||
|
|
+ <property name="label_xalign">0</property>
|
||
|
|
+ <property name="shadow_type">in</property>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkListBox" id="settings_list">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="selection_mode">none</property>
|
||
|
|
+ <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
|
||
|
|
+ <signal name="row-activated" handler="on_setting_activated" swapped="no"/>
|
||
|
|
+ </object>
|
||
|
|
+ </child>
|
||
|
|
+ <child type="label_item">
|
||
|
|
+ <placeholder/>
|
||
|
|
+ </child>
|
||
|
|
</object>
|
||
|
|
<packing>
|
||
|
|
- <property name="expand">True</property>
|
||
|
|
- <property name="fill">True</property>
|
||
|
|
- <property name="pack_type">end</property>
|
||
|
|
- <property name="position">0</property>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">6</property>
|
||
|
|
</packing>
|
||
|
|
</child>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkButton" id="remove_button">
|
||
|
|
- <property name="label" translatable="yes" comments="This is the remove account button in the account settings.">Remove Account</property>
|
||
|
|
+ <object class="GtkButtonBox">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
- <property name="can_focus">True</property>
|
||
|
|
- <property name="receives_default">False</property>
|
||
|
|
- <property name="tooltip_text" translatable="yes">Remove this account from Geary</property>
|
||
|
|
- <signal name="clicked" handler="on_remove_account_clicked" swapped="no"/>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="layout_style">end</property>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkButton">
|
||
|
|
+ <property name="label" translatable="yes" comments="This is a button in the account settings to show server settings.">Server Settings</property>
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">True</property>
|
||
|
|
+ <property name="receives_default">False</property>
|
||
|
|
+ <signal name="clicked" handler="on_server_settings_clicked" swapped="no"/>
|
||
|
|
+ </object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="expand">True</property>
|
||
|
|
+ <property name="fill">True</property>
|
||
|
|
+ <property name="pack_type">end</property>
|
||
|
|
+ <property name="position">0</property>
|
||
|
|
+ </packing>
|
||
|
|
+ </child>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkButton" id="remove_button">
|
||
|
|
+ <property name="label" translatable="yes" comments="This is the remove account button in the account settings.">Remove Account</property>
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">True</property>
|
||
|
|
+ <property name="receives_default">False</property>
|
||
|
|
+ <property name="tooltip_text" translatable="yes">Remove this account from Geary</property>
|
||
|
|
+ <signal name="clicked" handler="on_remove_account_clicked" swapped="no"/>
|
||
|
|
+ <style>
|
||
|
|
+ <class name="destructive-action"/>
|
||
|
|
+ </style>
|
||
|
|
+ </object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="expand">True</property>
|
||
|
|
+ <property name="fill">True</property>
|
||
|
|
+ <property name="pack_type">end</property>
|
||
|
|
+ <property name="position">1</property>
|
||
|
|
+ <property name="secondary">True</property>
|
||
|
|
+ </packing>
|
||
|
|
+ </child>
|
||
|
|
<style>
|
||
|
|
- <class name="destructive-action"/>
|
||
|
|
+ <class name="geary-settings"/>
|
||
|
|
</style>
|
||
|
|
</object>
|
||
|
|
<packing>
|
||
|
|
- <property name="expand">True</property>
|
||
|
|
- <property name="fill">True</property>
|
||
|
|
- <property name="pack_type">end</property>
|
||
|
|
- <property name="position">1</property>
|
||
|
|
- <property name="secondary">True</property>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">7</property>
|
||
|
|
</packing>
|
||
|
|
</child>
|
||
|
|
<style>
|
||
|
|
- <class name="geary-settings"/>
|
||
|
|
+ <class name="geary-accounts-editor-pane-content"/>
|
||
|
|
</style>
|
||
|
|
</object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">7</property>
|
||
|
|
- </packing>
|
||
|
|
+
|
||
|
|
</child>
|
||
|
|
- <style>
|
||
|
|
- <class name="geary-accounts-editor-pane-content"/>
|
||
|
|
- </style>
|
||
|
|
</object>
|
||
|
|
</child>
|
||
|
|
</object>
|
||
|
|
diff --git a/ui/accounts_editor_list_pane.ui b/ui/accounts_editor_list_pane.ui
|
||
|
|
index b3946196..53cc716f 100644
|
||
|
|
--- a/ui/accounts_editor_list_pane.ui
|
||
|
|
+++ b/ui/accounts_editor_list_pane.ui
|
||
|
|
@@ -31,148 +31,154 @@
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkGrid" id="pane_content">
|
||
|
|
+ <object class="HdyClamp">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
+ <property name="margin">24</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkGrid" id="welcome_panel">
|
||
|
|
+ <object class="GtkGrid" id="pane_content">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
- <property name="halign">center</property>
|
||
|
|
- <property name="column_spacing">12</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkImage" id="welcome_icon">
|
||
|
|
+ <object class="GtkGrid" id="welcome_panel">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
- <property name="pixel_size">64</property>
|
||
|
|
- <property name="use_fallback">True</property>
|
||
|
|
+ <property name="halign">center</property>
|
||
|
|
+ <property name="column_spacing">12</property>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkImage" id="welcome_icon">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="pixel_size">64</property>
|
||
|
|
+ <property name="use_fallback">True</property>
|
||
|
|
+ </object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">0</property>
|
||
|
|
+ <property name="height">2</property>
|
||
|
|
+ </packing>
|
||
|
|
+ </child>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkLabel">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="halign">start</property>
|
||
|
|
+ <property name="valign">start</property>
|
||
|
|
+ <property name="wrap">True</property>
|
||
|
|
+ <property name="label" translatable="yes">To get started, select an email provider below.</property>
|
||
|
|
+ <property name="xalign">0</property>
|
||
|
|
+ <property name="wrap">True</property>
|
||
|
|
+ </object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">1</property>
|
||
|
|
+ <property name="top_attach">1</property>
|
||
|
|
+ </packing>
|
||
|
|
+ </child>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkLabel">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="halign">start</property>
|
||
|
|
+ <property name="valign">end</property>
|
||
|
|
+ <property name="label" translatable="yes">Welcome to Geary</property>
|
||
|
|
+ <property name="xalign">0</property>
|
||
|
|
+ <property name="wrap">True</property>
|
||
|
|
+ <attributes>
|
||
|
|
+ <attribute name="weight" value="bold"/>
|
||
|
|
+ </attributes>
|
||
|
|
+ </object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">1</property>
|
||
|
|
+ <property name="top_attach">0</property>
|
||
|
|
+ </packing>
|
||
|
|
+ </child>
|
||
|
|
+ <style>
|
||
|
|
+ <class name="geary-welcome-panel"/>
|
||
|
|
+ </style>
|
||
|
|
</object>
|
||
|
|
<packing>
|
||
|
|
<property name="left_attach">0</property>
|
||
|
|
<property name="top_attach">0</property>
|
||
|
|
- <property name="height">2</property>
|
||
|
|
</packing>
|
||
|
|
</child>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkLabel">
|
||
|
|
+ <object class="GtkFrame" id="accounts_list_frame">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
- <property name="halign">start</property>
|
||
|
|
<property name="valign">start</property>
|
||
|
|
- <property name="wrap">True</property>
|
||
|
|
- <property name="label" translatable="yes">To get started, select an email provider below.</property>
|
||
|
|
- <property name="xalign">0</property>
|
||
|
|
- <property name="wrap">True</property>
|
||
|
|
+ <property name="hexpand">True</property>
|
||
|
|
+ <property name="vexpand">True</property>
|
||
|
|
+ <property name="label_xalign">0</property>
|
||
|
|
+ <property name="shadow_type">in</property>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkListBox" id="accounts_list">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="selection_mode">none</property>
|
||
|
|
+ <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
|
||
|
|
+ <signal name="row-activated" handler="on_row_activated" swapped="no"/>
|
||
|
|
+ </object>
|
||
|
|
+ </child>
|
||
|
|
+ <child type="label_item">
|
||
|
|
+ </child>
|
||
|
|
</object>
|
||
|
|
<packing>
|
||
|
|
- <property name="left_attach">1</property>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
<property name="top_attach">1</property>
|
||
|
|
</packing>
|
||
|
|
</child>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkLabel">
|
||
|
|
+ <object class="GtkLabel" id="add_service_label">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
<property name="halign">start</property>
|
||
|
|
- <property name="valign">end</property>
|
||
|
|
- <property name="label" translatable="yes">Welcome to Geary</property>
|
||
|
|
- <property name="xalign">0</property>
|
||
|
|
- <property name="wrap">True</property>
|
||
|
|
+ <property name="label" translatable="yes">Add an account</property>
|
||
|
|
<attributes>
|
||
|
|
<attribute name="weight" value="bold"/>
|
||
|
|
</attributes>
|
||
|
|
+ <style>
|
||
|
|
+ <class name="geary-settings-heading"/>
|
||
|
|
+ </style>
|
||
|
|
</object>
|
||
|
|
<packing>
|
||
|
|
- <property name="left_attach">1</property>
|
||
|
|
- <property name="top_attach">0</property>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">2</property>
|
||
|
|
</packing>
|
||
|
|
</child>
|
||
|
|
- <style>
|
||
|
|
- <class name="geary-welcome-panel"/>
|
||
|
|
- </style>
|
||
|
|
- </object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">0</property>
|
||
|
|
- </packing>
|
||
|
|
- </child>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkFrame" id="accounts_list_frame">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
- <property name="valign">start</property>
|
||
|
|
- <property name="hexpand">True</property>
|
||
|
|
- <property name="vexpand">True</property>
|
||
|
|
- <property name="label_xalign">0</property>
|
||
|
|
- <property name="shadow_type">in</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkListBox" id="accounts_list">
|
||
|
|
+ <object class="GtkFrame">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
- <property name="selection_mode">none</property>
|
||
|
|
- <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
|
||
|
|
- <signal name="row-activated" handler="on_row_activated" swapped="no"/>
|
||
|
|
+ <property name="valign">start</property>
|
||
|
|
+ <property name="hexpand">True</property>
|
||
|
|
+ <property name="vexpand">True</property>
|
||
|
|
+ <property name="label_xalign">0</property>
|
||
|
|
+ <property name="shadow_type">in</property>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkListBox" id="service_list">
|
||
|
|
+ <property name="width_request">0</property>
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="valign">start</property>
|
||
|
|
+ <property name="selection_mode">none</property>
|
||
|
|
+ <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
|
||
|
|
+ <signal name="row-activated" handler="on_row_activated" swapped="no"/>
|
||
|
|
+ </object>
|
||
|
|
+ </child>
|
||
|
|
+ <child type="label_item">
|
||
|
|
+ </child>
|
||
|
|
</object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">3</property>
|
||
|
|
+ </packing>
|
||
|
|
</child>
|
||
|
|
- <child type="label_item">
|
||
|
|
- <placeholder/>
|
||
|
|
- </child>
|
||
|
|
- </object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">1</property>
|
||
|
|
- </packing>
|
||
|
|
- </child>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkLabel" id="add_service_label">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
- <property name="halign">start</property>
|
||
|
|
- <property name="label" translatable="yes">Add an account</property>
|
||
|
|
- <attributes>
|
||
|
|
- <attribute name="weight" value="bold"/>
|
||
|
|
- </attributes>
|
||
|
|
<style>
|
||
|
|
- <class name="geary-settings-heading"/>
|
||
|
|
+ <class name="geary-accounts-editor-pane-content"/>
|
||
|
|
</style>
|
||
|
|
+
|
||
|
|
</object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">2</property>
|
||
|
|
- </packing>
|
||
|
|
- </child>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkFrame">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
- <property name="valign">start</property>
|
||
|
|
- <property name="hexpand">True</property>
|
||
|
|
- <property name="vexpand">True</property>
|
||
|
|
- <property name="label_xalign">0</property>
|
||
|
|
- <property name="shadow_type">in</property>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkListBox" id="service_list">
|
||
|
|
- <property name="width_request">0</property>
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
- <property name="valign">start</property>
|
||
|
|
- <property name="selection_mode">none</property>
|
||
|
|
- <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
|
||
|
|
- <signal name="row-activated" handler="on_row_activated" swapped="no"/>
|
||
|
|
- </object>
|
||
|
|
- </child>
|
||
|
|
- <child type="label_item">
|
||
|
|
- <placeholder/>
|
||
|
|
- </child>
|
||
|
|
- </object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">3</property>
|
||
|
|
- </packing>
|
||
|
|
</child>
|
||
|
|
- <style>
|
||
|
|
- <class name="geary-accounts-editor-pane-content"/>
|
||
|
|
- </style>
|
||
|
|
</object>
|
||
|
|
</child>
|
||
|
|
</object>
|
||
|
|
diff --git a/ui/accounts_editor_remove_pane.ui b/ui/accounts_editor_remove_pane.ui
|
||
|
|
index 22798248..7edf4c13 100644
|
||
|
|
--- a/ui/accounts_editor_remove_pane.ui
|
||
|
|
+++ b/ui/accounts_editor_remove_pane.ui
|
||
|
|
@@ -7,105 +7,112 @@
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
<property name="valign">center</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkGrid">
|
||
|
|
+ <object class="HdyClamp">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
- <property name="valign">start</property>
|
||
|
|
- <property name="vexpand">True</property>
|
||
|
|
- <property name="row_spacing">32</property>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkButtonBox">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
- <property name="layout_style">end</property>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkButton" id="remove_button">
|
||
|
|
- <property name="label" translatable="yes" comments="This is the remove account button in the account settings.">Remove Account</property>
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">True</property>
|
||
|
|
- <property name="receives_default">True</property>
|
||
|
|
- <property name="tooltip_text" translatable="yes">Remove this account from Geary</property>
|
||
|
|
- <signal name="clicked" handler="on_remove_button_clicked" swapped="no"/>
|
||
|
|
- <style>
|
||
|
|
- <class name="destructive-action"/>
|
||
|
|
- </style>
|
||
|
|
- </object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="expand">True</property>
|
||
|
|
- <property name="fill">True</property>
|
||
|
|
- <property name="position">1</property>
|
||
|
|
- </packing>
|
||
|
|
- </child>
|
||
|
|
- <style>
|
||
|
|
- <class name="geary-settings"/>
|
||
|
|
- </style>
|
||
|
|
- </object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">1</property>
|
||
|
|
- </packing>
|
||
|
|
- </child>
|
||
|
|
+ <property name="margin">24</property>
|
||
|
|
<child>
|
||
|
|
<object class="GtkGrid">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
- <property name="row_spacing">6</property>
|
||
|
|
- <property name="column_spacing">18</property>
|
||
|
|
+ <property name="valign">start</property>
|
||
|
|
+ <property name="vexpand">True</property>
|
||
|
|
+ <property name="row_spacing">32</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkImage">
|
||
|
|
+ <object class="GtkButtonBox">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
- <property name="icon_name">dialog-warning-symbolic</property>
|
||
|
|
- <property name="icon_size">6</property>
|
||
|
|
- </object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">0</property>
|
||
|
|
- <property name="height">2</property>
|
||
|
|
- </packing>
|
||
|
|
- </child>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkLabel" id="warning_label">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
- <property name="halign">start</property>
|
||
|
|
- <property name="vexpand">True</property>
|
||
|
|
- <property name="label" translatable="yes" comments="This title is shown to users when confirming if they want to remove an account. The string substitution is replaced with the account's name.">Confirm removing: %s</property>
|
||
|
|
- <attributes>
|
||
|
|
- <attribute name="weight" value="bold"/>
|
||
|
|
- </attributes>
|
||
|
|
+ <property name="layout_style">end</property>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkButton" id="remove_button">
|
||
|
|
+ <property name="label" translatable="yes" comments="This is the remove account button in the account settings.">Remove Account</property>
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">True</property>
|
||
|
|
+ <property name="receives_default">True</property>
|
||
|
|
+ <property name="tooltip_text" translatable="yes">Remove this account from Geary</property>
|
||
|
|
+ <signal name="clicked" handler="on_remove_button_clicked" swapped="no"/>
|
||
|
|
+ <style>
|
||
|
|
+ <class name="destructive-action"/>
|
||
|
|
+ </style>
|
||
|
|
+ </object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="expand">True</property>
|
||
|
|
+ <property name="fill">True</property>
|
||
|
|
+ <property name="position">1</property>
|
||
|
|
+ </packing>
|
||
|
|
+ </child>
|
||
|
|
<style>
|
||
|
|
- <class name="title"/>
|
||
|
|
+ <class name="geary-settings"/>
|
||
|
|
</style>
|
||
|
|
</object>
|
||
|
|
<packing>
|
||
|
|
- <property name="left_attach">1</property>
|
||
|
|
- <property name="top_attach">0</property>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">1</property>
|
||
|
|
</packing>
|
||
|
|
</child>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkLabel">
|
||
|
|
+ <object class="GtkGrid">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
- <property name="halign">start</property>
|
||
|
|
- <property name="label" translatable="yes">Removing an account will remove it from Geary and delete locally cached email data from your computer, but not from your service provider.</property>
|
||
|
|
- <property name="wrap">True</property>
|
||
|
|
- <property name="xalign">0</property>
|
||
|
|
+ <property name="row_spacing">6</property>
|
||
|
|
+ <property name="column_spacing">18</property>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkImage">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="icon_name">dialog-warning-symbolic</property>
|
||
|
|
+ <property name="icon_size">6</property>
|
||
|
|
+ </object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">0</property>
|
||
|
|
+ <property name="height">2</property>
|
||
|
|
+ </packing>
|
||
|
|
+ </child>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkLabel" id="warning_label">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="halign">start</property>
|
||
|
|
+ <property name="vexpand">True</property>
|
||
|
|
+ <property name="label" translatable="yes" comments="This title is shown to users when confirming if they want to remove an account. The string substitution is replaced with the account's name.">Confirm removing: %s</property>
|
||
|
|
+ <attributes>
|
||
|
|
+ <attribute name="weight" value="bold"/>
|
||
|
|
+ </attributes>
|
||
|
|
+ <style>
|
||
|
|
+ <class name="title"/>
|
||
|
|
+ </style>
|
||
|
|
+ </object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">1</property>
|
||
|
|
+ <property name="top_attach">0</property>
|
||
|
|
+ </packing>
|
||
|
|
+ </child>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkLabel">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="halign">start</property>
|
||
|
|
+ <property name="label" translatable="yes">Removing an account will remove it from Geary and delete locally cached email data from your computer, but not from your service provider.</property>
|
||
|
|
+ <property name="wrap">True</property>
|
||
|
|
+ <property name="xalign">0</property>
|
||
|
|
+ </object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">1</property>
|
||
|
|
+ <property name="top_attach">1</property>
|
||
|
|
+ </packing>
|
||
|
|
+ </child>
|
||
|
|
</object>
|
||
|
|
<packing>
|
||
|
|
- <property name="left_attach">1</property>
|
||
|
|
- <property name="top_attach">1</property>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">0</property>
|
||
|
|
</packing>
|
||
|
|
</child>
|
||
|
|
+ <style>
|
||
|
|
+ <class name="geary-accounts-editor-pane-content"/>
|
||
|
|
+ </style>
|
||
|
|
</object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">0</property>
|
||
|
|
- </packing>
|
||
|
|
</child>
|
||
|
|
- <style>
|
||
|
|
- <class name="geary-accounts-editor-pane-content"/>
|
||
|
|
- </style>
|
||
|
|
</object>
|
||
|
|
<packing>
|
||
|
|
<property name="left_attach">0</property>
|
||
|
|
diff --git a/ui/accounts_editor_servers_pane.ui b/ui/accounts_editor_servers_pane.ui
|
||
|
|
index 1a1234a3..a01eba5b 100644
|
||
|
|
--- a/ui/accounts_editor_servers_pane.ui
|
||
|
|
+++ b/ui/accounts_editor_servers_pane.ui
|
||
|
|
@@ -89,117 +89,121 @@
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkGrid" id="pane_content">
|
||
|
|
+ <object class="HdyClamp">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
+ <property name="margin">24</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkFrame">
|
||
|
|
+ <object class="GtkGrid" id="pane_content">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
- <property name="hexpand">True</property>
|
||
|
|
- <property name="label_xalign">0</property>
|
||
|
|
- <property name="shadow_type">in</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkListBox" id="receiving_list">
|
||
|
|
+ <object class="GtkFrame">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
- <property name="selection_mode">none</property>
|
||
|
|
- <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
|
||
|
|
- <signal name="row-activated" handler="on_activate" swapped="no"/>
|
||
|
|
+ <property name="hexpand">True</property>
|
||
|
|
+ <property name="label_xalign">0</property>
|
||
|
|
+ <property name="shadow_type">in</property>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkListBox" id="receiving_list">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="selection_mode">none</property>
|
||
|
|
+ <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
|
||
|
|
+ <signal name="row-activated" handler="on_activate" swapped="no"/>
|
||
|
|
+ </object>
|
||
|
|
+ </child>
|
||
|
|
+ <child type="label_item">
|
||
|
|
+ </child>
|
||
|
|
</object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">2</property>
|
||
|
|
+ </packing>
|
||
|
|
</child>
|
||
|
|
- <child type="label_item">
|
||
|
|
- <placeholder/>
|
||
|
|
- </child>
|
||
|
|
- </object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">2</property>
|
||
|
|
- </packing>
|
||
|
|
- </child>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkLabel">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
- <property name="halign">start</property>
|
||
|
|
- <property name="label" translatable="yes">Receiving</property>
|
||
|
|
- <style>
|
||
|
|
- <class name="geary-settings-heading"/>
|
||
|
|
- </style>
|
||
|
|
- </object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">1</property>
|
||
|
|
- </packing>
|
||
|
|
- </child>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkFrame">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
- <property name="hexpand">True</property>
|
||
|
|
- <property name="label_xalign">0</property>
|
||
|
|
- <property name="shadow_type">in</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkListBox" id="sending_list">
|
||
|
|
+ <object class="GtkLabel">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
- <property name="selection_mode">none</property>
|
||
|
|
- <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
|
||
|
|
- <signal name="row-activated" handler="on_activate" swapped="no"/>
|
||
|
|
+ <property name="halign">start</property>
|
||
|
|
+ <property name="label" translatable="yes">Receiving</property>
|
||
|
|
+ <style>
|
||
|
|
+ <class name="geary-settings-heading"/>
|
||
|
|
+ </style>
|
||
|
|
</object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">1</property>
|
||
|
|
+ </packing>
|
||
|
|
</child>
|
||
|
|
- <child type="label_item">
|
||
|
|
- <placeholder/>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkFrame">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="hexpand">True</property>
|
||
|
|
+ <property name="label_xalign">0</property>
|
||
|
|
+ <property name="shadow_type">in</property>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkListBox" id="sending_list">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="selection_mode">none</property>
|
||
|
|
+ <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
|
||
|
|
+ <signal name="row-activated" handler="on_activate" swapped="no"/>
|
||
|
|
+ </object>
|
||
|
|
+ </child>
|
||
|
|
+ <child type="label_item">
|
||
|
|
+ </child>
|
||
|
|
+ </object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">4</property>
|
||
|
|
+ </packing>
|
||
|
|
</child>
|
||
|
|
- </object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">4</property>
|
||
|
|
- </packing>
|
||
|
|
- </child>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkLabel">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
- <property name="halign">start</property>
|
||
|
|
- <property name="label" translatable="yes">Sending</property>
|
||
|
|
- <style>
|
||
|
|
- <class name="geary-settings-heading"/>
|
||
|
|
- </style>
|
||
|
|
- </object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">3</property>
|
||
|
|
- </packing>
|
||
|
|
- </child>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkFrame">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="can_focus">False</property>
|
||
|
|
- <property name="hexpand">True</property>
|
||
|
|
- <property name="label_xalign">0</property>
|
||
|
|
- <property name="shadow_type">in</property>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkListBox" id="details_list">
|
||
|
|
+ <object class="GtkLabel">
|
||
|
|
<property name="visible">True</property>
|
||
|
|
<property name="can_focus">False</property>
|
||
|
|
- <property name="selection_mode">none</property>
|
||
|
|
- <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
|
||
|
|
- <signal name="row-activated" handler="on_activate" swapped="no"/>
|
||
|
|
+ <property name="halign">start</property>
|
||
|
|
+ <property name="label" translatable="yes">Sending</property>
|
||
|
|
+ <style>
|
||
|
|
+ <class name="geary-settings-heading"/>
|
||
|
|
+ </style>
|
||
|
|
</object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">3</property>
|
||
|
|
+ </packing>
|
||
|
|
</child>
|
||
|
|
- <child type="label_item">
|
||
|
|
- <placeholder/>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkFrame">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="hexpand">True</property>
|
||
|
|
+ <property name="label_xalign">0</property>
|
||
|
|
+ <property name="shadow_type">in</property>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkListBox" id="details_list">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="can_focus">False</property>
|
||
|
|
+ <property name="selection_mode">none</property>
|
||
|
|
+ <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
|
||
|
|
+ <signal name="row-activated" handler="on_activate" swapped="no"/>
|
||
|
|
+ </object>
|
||
|
|
+ </child>
|
||
|
|
+ <child type="label_item">
|
||
|
|
+ </child>
|
||
|
|
+ </object>
|
||
|
|
+ <packing>
|
||
|
|
+ <property name="left_attach">0</property>
|
||
|
|
+ <property name="top_attach">0</property>
|
||
|
|
+ </packing>
|
||
|
|
</child>
|
||
|
|
+ <style>
|
||
|
|
+ <class name="geary-accounts-editor-pane-content"/>
|
||
|
|
+ </style>
|
||
|
|
</object>
|
||
|
|
- <packing>
|
||
|
|
- <property name="left_attach">0</property>
|
||
|
|
- <property name="top_attach">0</property>
|
||
|
|
- </packing>
|
||
|
|
</child>
|
||
|
|
- <style>
|
||
|
|
- <class name="geary-accounts-editor-pane-content"/>
|
||
|
|
- </style>
|
||
|
|
</object>
|
||
|
|
</child>
|
||
|
|
</object>
|
||
|
|
diff --git a/ui/geary.css b/ui/geary.css
|
||
|
|
index 2d1d48c3..ca3cf640 100644
|
||
|
|
--- a/ui/geary.css
|
||
|
|
+++ b/ui/geary.css
|
||
|
|
@@ -270,10 +270,6 @@ row.geary-labelled-row > grid > switch {
|
||
|
|
|
||
|
|
/* Accounts.Editor */
|
||
|
|
|
||
|
|
-grid.geary-accounts-editor-pane-content {
|
||
|
|
- padding: 32px 128px;
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
grid.geary-account-view image:dir(ltr) {
|
||
|
|
margin-right: 6px;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.29.2
|
||
|
|
|