cui/uiconfig/ui/langtoolconfigpage.ui | 1
cui/uiconfig/ui/optdeeplpage.ui | 165 +++++++++++++++++-----------------
2 files changed, 84 insertions(+), 82 deletions(-)
New commits:
commit 7b0606b6c0449c5f3f266295f7a5521fe6a05493
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Feb 2 09:30:32 2023 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Feb 2 12:09:05 2023 +0000
Related: tdf#152642 match spacing and layout of other option pages
Change-Id: I289303ec071e4bc48388ab34f5327b7648121338
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146491
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/uiconfig/ui/langtoolconfigpage.ui
b/cui/uiconfig/ui/langtoolconfigpage.ui
index 726b5d864056..03da9968b0e1 100644
--- a/cui/uiconfig/ui/langtoolconfigpage.ui
+++ b/cui/uiconfig/ui/langtoolconfigpage.ui
@@ -50,7 +50,6 @@
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="halign">start</property>
- <property name="valign">start</property>
<property name="relief">none</property>
<property
name="uri">https://languagetool.org/legal/privacy</property>
</object>
diff --git a/cui/uiconfig/ui/optdeeplpage.ui b/cui/uiconfig/ui/optdeeplpage.ui
index 1324c60c4f7b..f7508eb146e8 100644
--- a/cui/uiconfig/ui/optdeeplpage.ui
+++ b/cui/uiconfig/ui/optdeeplpage.ui
@@ -5,66 +5,34 @@
<object class="GtkBox" id="OptDeeplPage">
<property name="visible">True</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="orientation">vertical</property>
<child>
- <!-- n-columns=1 n-rows=3 -->
- <object class="GtkGrid" id="grid1">
+ <object class="GtkFrame">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="column-homogeneous">True</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <object class="GtkLabel" id="label1">
+ <!-- n-columns=1 n-rows=2 -->
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="halign">start</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="label" translatable="yes"
context="optdeeplpage|label1">DeepL API Options</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">grid1</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLinkButton" id="privacy">
- <property name="label" translatable="yes"
context="optdeeplpage|privacy">Please read the privacy policy</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="relief">none</property>
- <property name="uri">https://www.deepl.com/privacy/</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- <child>
- <!-- n-columns=2 n-rows=2 -->
- <object class="GtkGrid" id="grid2">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="margin-start">6</property>
- <property name="margin-end">6</property>
+ <property name="margin-start">12</property>
<property name="margin-top">6</property>
- <property name="margin-bottom">6</property>
<property name="row-spacing">6</property>
<property name="column-spacing">12</property>
<child>
- <object class="GtkLabel" id="label2">
+ <object class="GtkLinkButton" id="privacy">
+ <property name="label" translatable="yes"
context="optdeeplpage|privacy">Please read the privacy policy</property>
<property name="visible">True</property>
- <property name="can-focus">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="halign">start</property>
- <property name="label" translatable="yes"
context="optdeeplpage|privacy">API URL:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">apiurl</property>
+ <property name="relief">none</property>
+ <property name="uri">https://www.deepl.com/privacy/</property>
</object>
<packing>
<property name="left-attach">0</property>
@@ -72,54 +40,89 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label3">
+ <!-- n-columns=2 n-rows=2 -->
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes"
context="optdeeplpage|label3">Authentication key:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">authkey</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"
context="optdeeplpage|privacy">API URL:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">apiurl</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"
context="optdeeplpage|label3">Authentication key:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">authkey</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="apiurl">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="truncate-multiline">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="authkey">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="truncate-multiline">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child>
- <child>
- <object class="GtkEntry" id="apiurl">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="hexpand">True</property>
- <property name="truncate-multiline">True</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="authkey">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="hexpand">True</property>
- <property name="truncate-multiline">True</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
</object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">2</property>
- </packing>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="optdeeplpage|label1">DeepL API Options</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">grid1</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
