sw/uiconfig/swriter/ui/mailconfigpage.ui | 217 ++++++++++++++++---------------
1 file changed, 115 insertions(+), 102 deletions(-)
New commits:
commit c45d38dc996eedddbd26b15df7642ac71b19d59a
Author: Adolfo Jayme Barrientos <fit...@ubuntu.com>
AuthorDate: Mon Nov 28 14:26:37 2022 -0600
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Tue Nov 29 05:25:28 2022 +0100
tdf#152136 Improve SMTP settings page
Improve layout and section title so that there is a clear implication
that we only support email servers of the SMTP kind.
Change-Id: I28ba1dad6b00728b8a5af8c0b7c679558cb6d240
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143418
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/sw/uiconfig/swriter/ui/mailconfigpage.ui
b/sw/uiconfig/swriter/ui/mailconfigpage.ui
index f36b6e873bff..1b3650dace7e 100644
--- a/sw/uiconfig/swriter/ui/mailconfigpage.ui
+++ b/sw/uiconfig/swriter/ui/mailconfigpage.ui
@@ -1,45 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="sw">
<requires lib="gtk+" version="3.20"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
<property name="upper">65535</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">10</property>
</object>
<object class="GtkBox" id="MailConfigPage">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="border_width">6</property>
+ <property name="border-width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=4 -->
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
+ <property name="hexpand">True</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
<child>
<object class="GtkEntry" id="displayname">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
<property name="hexpand">True</property>
- <property name="input_purpose">name</property>
<property name="truncate-multiline">True</property>
+ <property name="input-purpose">name</property>
<child internal-child="accessible">
<object class="AtkObject" id="displayname-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|displayname">Enter your
name.</property>
@@ -47,17 +47,17 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="address">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
<property name="hexpand">True</property>
- <property name="input_purpose">email</property>
<property name="truncate-multiline">True</property>
+ <property name="input-purpose">email</property>
<child internal-child="accessible">
<object class="AtkObject" id="address-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|address">Enter your email address for
replies.</property>
@@ -65,17 +65,17 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="replyto">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
<property name="hexpand">True</property>
- <property name="input_purpose">email</property>
<property name="truncate-multiline">True</property>
+ <property name="input-purpose">email</property>
<child internal-child="accessible">
<object class="AtkObject" id="replyto-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|replyto">Enter the address to use for
email replies.</property>
@@ -83,46 +83,48 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="displayname_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes"
context="mailconfigpage|displayname_label">_Your name:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">displayname</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">displayname</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="address_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes"
context="mailconfigpage|address_label">_Email address:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">address</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">address</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="replytocb">
<property name="label" translatable="yes"
context="mailconfigpage|replytocb">Send replies to _different email
address</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="replytocb-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|replytocb">Uses the email address that
you enter in the Reply address text box as the reply-to email
address.</property>
@@ -130,33 +132,33 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="replyto_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin-start">12</property>
<property name="label" translatable="yes"
context="mailconfigpage|replyto_label">_Reply address:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">replyto</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">replyto</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="mailconfigpage|label1">User Information</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -173,24 +175,24 @@
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=3 n-rows=4 -->
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
+ <property name="hexpand">True</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
<child>
<object class="GtkEntry" id="server">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="truncate-multiline">True</property>
<child internal-child="accessible">
@@ -200,27 +202,27 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkButtonBox" id="buttonbox1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="halign">start</property>
<property name="margin-end">12</property>
<property name="orientation">vertical</property>
- <property name="layout_style">center</property>
+ <property name="layout-style">center</property>
<child>
<object class="GtkButton" id="serverauthentication">
<property name="label" translatable="yes"
context="mailconfigpage|serverauthentication">Ser_ver Authentication…</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="halign">start</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
<child internal-child="accessible">
<object class="AtkObject"
id="serverauthentication-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|serverauthentication">Opens the Server
Authentication dialog where you can specify the server authentication settings
for secure email.</property>
@@ -235,16 +237,16 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="port">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustment1</property>
+ <property name="can-focus">True</property>
<property name="truncate-multiline">True</property>
+ <property name="adjustment">adjustment1</property>
<child internal-child="accessible">
<object class="AtkObject" id="port-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|port">Enter the SMTP port.</property>
@@ -252,48 +254,50 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="server_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes"
context="mailconfigpage|server_label">_Server name:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">server</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">server</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="port_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes"
context="mailconfigpage|port_label">_Port:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">port</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">port</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="secure">
<property name="label" translatable="yes"
context="mailconfigpage|secure">_Use secure connection (TLS/SSL)</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
<property name="hexpand">True</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="secure-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|secure">When available, uses a secure
connection to send emails.</property>
@@ -301,25 +305,25 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkButtonBox" id="buttonbox2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="halign">end</property>
<property name="orientation">vertical</property>
- <property name="layout_style">center</property>
+ <property name="layout-style">center</property>
<child>
<object class="GtkButton" id="test">
<property name="label" translatable="yes"
context="mailconfigpage|test">_Test Settings</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="use-underline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="test-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|test">Opens the Test Account Settings
dialog to test the current settings.</property>
@@ -334,8 +338,8 @@
</child>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
@@ -349,8 +353,8 @@
<child type="label">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="mailconfigpage|label2">Outgoing Server (SMTP) Settings</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="mailconfigpage|label2">Outgoing Email Server (SMTP Only)</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -369,4 +373,13 @@
</object>
</child>
</object>
+ <object class="GtkSizeGroup">
+ <widgets>
+ <widget name="displayname_label"/>
+ <widget name="address_label"/>
+ <widget name="replyto_label"/>
+ <widget name="server_label"/>
+ <widget name="port_label"/>
+ </widgets>
+ </object>
</interface>
