[Libreoffice-commits] core.git: 2 commits - cui/uiconfig sw/uiconfig
andreas kainz (via logerrit)
logerrit at kemper.freedesktop.org
Tue Nov 12 20:54:20 UTC 2019
cui/uiconfig/ui/optproxypage.ui | 1
sw/uiconfig/swriter/ui/mailconfigpage.ui | 181 +++++++++++++++----------------
2 files changed, 89 insertions(+), 93 deletions(-)
New commits:
commit 51b3252cc43c302de2307da15e9398912d044796
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Tue Nov 12 01:19:41 2019 +0100
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Tue Nov 12 21:52:35 2019 +0100
Options Proxy Dialog update
Change-Id: I6ec7b5588b9a5ba0120c8e81a248594b755426f1
Reviewed-on: https://gerrit.libreoffice.org/82478
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
diff --git a/cui/uiconfig/ui/optproxypage.ui b/cui/uiconfig/ui/optproxypage.ui
index 1b2d0c75af45..0deb53f684d8 100644
--- a/cui/uiconfig/ui/optproxypage.ui
+++ b/cui/uiconfig/ui/optproxypage.ui
@@ -138,7 +138,6 @@
<object class="GtkComboBoxText" id="proxymode">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
<items>
<item translatable="yes" context="optproxypage|proxymode">None</item>
<item translatable="yes" context="optproxypage|proxymode">System</item>
commit 8705bde3b7d5c7c62b9b9235eb002adb5be7d4f9
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Tue Nov 12 01:27:59 2019 +0100
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Tue Nov 12 21:52:08 2019 +0100
Options Mailmerge Dialog update
Change-Id: I160fb9e5afdf10f64bcd7422e5c4198fe8bb538d
Reviewed-on: https://gerrit.libreoffice.org/82480
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
diff --git a/sw/uiconfig/swriter/ui/mailconfigpage.ui b/sw/uiconfig/swriter/ui/mailconfigpage.ui
index 587850675492..41d9788e92b6 100644
--- a/sw/uiconfig/swriter/ui/mailconfigpage.ui
+++ b/sw/uiconfig/swriter/ui/mailconfigpage.ui
@@ -112,9 +112,8 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
+ <property name="left_attach">1</property>
<property name="top_attach">2</property>
- <property name="width">2</property>
</packing>
</child>
<child>
@@ -131,6 +130,9 @@
<property name="top_attach">3</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -174,96 +176,113 @@
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <object class="GtkCheckButton" id="secure">
- <property name="label" translatable="yes" context="mailconfigpage|secure">_Use secure connection (SSL)</property>
+ <object class="GtkEntry" id="server">
<property name="visible">True</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="xalign">0</property>
- <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkGrid" id="grid3">
+ <object class="GtkButtonBox" id="buttonbox1">
<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>
- <child>
- <object class="GtkEntry" id="server">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</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="label" translatable="yes" context="mailconfigpage|server_label">_Server name:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">server</property>
- </object>
- <packing>
- <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="label" translatable="yes" context="mailconfigpage|port_label">_Port:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">port</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
+ <property name="halign">start</property>
+ <property name="margin_right">12</property>
+ <property name="orientation">vertical</property>
+ <property name="layout_style">center</property>
<child>
- <object class="GtkSpinButton" id="port">
+ <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="halign">start</property>
- <property name="adjustment">adjustment1</property>
+ <property name="use_underline">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
+ <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>
+ </object>
+ <packing>
+ <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="label" translatable="yes" context="mailconfigpage|server_label">_Server name:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">server</property>
+ </object>
+ <packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkButtonBox" id="buttonbox1">
+ <object class="GtkLabel" id="port_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="margin_right">12</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes" context="mailconfigpage|port_label">_Port:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">port</property>
+ </object>
+ <packing>
+ <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 (SSL)</property>
+ <property name="visible">True</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <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="halign">end</property>
<property name="orientation">vertical</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>
+ <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>
@@ -277,10 +296,16 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="top_attach">3</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -302,33 +327,5 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkButtonBox" id="buttonbox2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="orientation">vertical</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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
</object>
</interface>
More information about the Libreoffice-commits
mailing list