cui/uiconfig/ui/langtoolconfigpage.ui | 349 ++++++++++++++++++---------------- cui/uiconfig/ui/optdeeplpage.ui | 170 ++++++++-------- 2 files changed, 271 insertions(+), 248 deletions(-)
New commits: commit 1191c565ea55bdce98a4426f9729786d1b012c75 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Feb 2 09:13:46 2023 +0000 Commit: Adolfo Jayme Barrientos <[email protected]> CommitDate: Sat Feb 4 20:40:05 2023 +0000 Resolves: tdf#152642 match spacing and layout of other option pages Change-Id: I18c398762f92a28d72dae3ae76991553e9ebb04c (cherry picked from commit 21e35521a8155856cfeb0b86aeafd8af6ab988ae) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146499 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/cui/uiconfig/ui/langtoolconfigpage.ui b/cui/uiconfig/ui/langtoolconfigpage.ui index 8be8c1c2359a..e7809cd91fd7 100644 --- a/cui/uiconfig/ui/langtoolconfigpage.ui +++ b/cui/uiconfig/ui/langtoolconfigpage.ui @@ -5,7 +5,10 @@ <object class="GtkBox" id="OptLangToolPage"> <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> <property name="spacing">12</property> <child> <object class="GtkFrame"> @@ -14,21 +17,26 @@ <property name="label-xalign">0</property> <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=4 --> + <!-- n-columns=1 n-rows=3 --> <object class="GtkGrid" id="grid0"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkLabel" id="disclaimer"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin-top">6</property> - <property name="margin-bottom">4</property> <property name="label" translatable="yes" context="langtoolconfigpage|disclaimer">If you enable this, the data will be sent to an external server.</property> <property name="wrap">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="disclaimer-atkobject"> + <property name="AtkObject::accessible-role" translatable="no">static</property> + </object> + </child> </object> <packing> <property name="left-attach">0</property> @@ -42,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> @@ -58,8 +65,6 @@ <property name="can-focus">True</property> <property name="receives-default">False</property> <property name="halign">start</property> - <property name="margin-top">6</property> - <property name="margin-bottom">9</property> <property name="draw-indicator">True</property> </object> <packing> @@ -67,178 +72,194 @@ <property name="top-attach">2</property> </packing> </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="langtoolsettings"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="langtoolconfigpage|langtoolsettings">LanguageTool API Options</property> + <attributes> + <attribute name="style" value="normal"/> + <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> + </packing> + </child> + <child> + <object class="GtkFrame" id="apisettings"> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> + <child> + <!-- n-columns=2 n-rows=6 --> + <object class="GtkGrid" id="grid1"> + <property name="visible">True</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="GtkLabel" id="base"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="langtoolconfigpage|base">Base URL:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">baseurl</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> <child> - <object class="GtkFrame" id="apisettings"> + <object class="GtkEntry" id="baseurl"> + <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="GtkLabel" id="usernamelbl"> + <property name="visible">True</property> <property name="can-focus">False</property> - <property name="margin-top">10</property> - <property name="label-xalign">0</property> - <property name="shadow-type">none</property> - <child> - <!-- n-columns=2 n-rows=6 --> - <object class="GtkGrid" id="grid1"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="row-spacing">5</property> - <property name="column-spacing">12</property> - <child> - <object class="GtkLabel" id="base"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="langtoolconfigpage|base">Base URL:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">baseurl</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="baseurl"> - <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="GtkLabel" id="usernamelbl"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="langtoolconfigpage|usernamelbl">Username:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">username</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="apikeylbl"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="langtoolconfigpage|apikeylbl">API key:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">apikey</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">4</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="username"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="truncate-multiline">True</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="apikey"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="truncate-multiline">True</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">4</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="urldesc"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="langtoolconfigpage|urldesc">Please use the base URL, i.e., without “/check”, at the end.</property> - <attributes> - <attribute name="scale" value="0.90000000000000002"/> - </attributes> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="usernamedesc"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="langtoolconfigpage|usernamedesc">Your LanguageTool account’s username for premium usage.</property> - <attributes> - <attribute name="scale" value="0.90000000000000002"/> - </attributes> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="apikeydesc"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="langtoolconfigpage|apikeydesc">Your LanguageTool account’s API key for premium usage.</property> - <attributes> - <attribute name="scale" value="0.90000000000000002"/> - </attributes> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">5</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> + <property name="halign">start</property> + <property name="label" translatable="yes" context="langtoolconfigpage|usernamelbl">Username:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">username</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="apikeylbl"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="langtoolconfigpage|apikeylbl">API key:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">apikey</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">4</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="username"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="truncate-multiline">True</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="apikey"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="truncate-multiline">True</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="urldesc"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="langtoolconfigpage|urldesc">Please use the base URL, i.e., without “/check” at the end.</property> + <attributes> + <attribute name="scale" value="0.90000000000000002"/> + </attributes> + <child internal-child="accessible"> + <object class="AtkObject" id="urldesc-atkobject"> + <property name="AtkObject::accessible-role" translatable="no">static</property> </object> </child> - <child type="label"> - <object class="GtkLabel" id="apisettingsheader"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-bottom">10</property> - <property name="label" translatable="yes" context="langtoolconfigpage|apisettingsheader">API Settings</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="usernamedesc"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="langtoolconfigpage|usernamedesc">Your LanguageTool account’s username for premium usage.</property> + <attributes> + <attribute name="scale" value="0.90000000000000002"/> + </attributes> + <child internal-child="accessible"> + <object class="AtkObject" id="usernamedesc-atkobject"> + <property name="AtkObject::accessible-role" translatable="no">static</property> </object> </child> </object> <packing> - <property name="left-attach">0</property> + <property name="left-attach">1</property> <property name="top-attach">3</property> </packing> </child> + <child> + <object class="GtkLabel" id="apikeydesc"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="langtoolconfigpage|apikeydesc">Your LanguageTool account’s API key for premium usage.</property> + <attributes> + <attribute name="scale" value="0.90000000000000002"/> + </attributes> + <child internal-child="accessible"> + <object class="AtkObject" id="apikeydesc-atkobject"> + <property name="AtkObject::accessible-role" translatable="no">static</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">5</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> </child> <child type="label"> - <object class="GtkLabel" id="langtoolsettings"> + <object class="GtkLabel" id="apisettingsheader"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="margin-top">4</property> - <property name="label" translatable="yes" context="langtoolconfigpage|langtoolsettings">LanguageTool API Options</property> + <property name="label" translatable="yes" context="langtoolconfigpage|apisettingsheader">API Settings</property> <attributes> - <attribute name="style" value="normal"/> <attribute name="weight" value="bold"/> </attributes> </object> @@ -247,7 +268,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> </object> diff --git a/cui/uiconfig/ui/optdeeplpage.ui b/cui/uiconfig/ui/optdeeplpage.ui index 652ef6c6405c..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">5</property> - <property name="margin-end">5</property> - <property name="margin-top">5</property> - <property name="margin-bottom">5</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <property name="row-spacing">6</property> - <property name="column-spacing">5</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,55 +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="margin-end">5</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>
