cui/uiconfig/ui/langtoolconfigpage.ui | 480 +++++++++++++++++-----------------
cui/uiconfig/ui/qrcodegen.ui | 1
2 files changed, 249 insertions(+), 232 deletions(-)
New commits:
commit debd4cfa377f6895ecfe337216240bb7c581e84a
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Feb 2 09:24:37 2023 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Feb 2 11:03:25 2023 +0000
add missing mnemonic-widget
Change-Id: Ib0b53fe8fed8ca1d53b7691a8609ce1e14bcce89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146490
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/uiconfig/ui/qrcodegen.ui b/cui/uiconfig/ui/qrcodegen.ui
index 2a55eaa01901..a3d25996e16c 100644
--- a/cui/uiconfig/ui/qrcodegen.ui
+++ b/cui/uiconfig/ui/qrcodegen.ui
@@ -116,6 +116,7 @@
<property name="valign">start</property>
<property name="label" translatable="yes"
context="qrcodegen|label_text" comments="Text to be stored in the
QR">URL/Text:</property>
<property name="use-underline">True</property>
+ <property name="mnemonic-widget">edit_text</property>
<property name="xalign">0</property>
</object>
<packing>
commit 48cd8c6ba8ea5bae7f5fce481f9c01bc4aa92dce
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Feb 2 09:13:46 2023 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Feb 2 11:03:17 2023 +0000
match spacing and layout of other option pages
Change-Id: I18c398762f92a28d72dae3ae76991553e9ebb04c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146489
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 402b30c96701..726b5d864056 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">static</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left-attach">0</property>
@@ -58,8 +66,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,247 +73,257 @@
<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=9 -->
+ <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="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="GtkFrame" id="apisettings">
+ <object class="GtkLabel" id="urldesc">
+ <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=1 n-rows=2 -->
- <object class="GtkGrid" id="grid1">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <child>
- <!-- n-columns=2 n-rows=8 -->
- <object class="GtkGrid" id="grid2">
- <property name="visible">True</property>
- <property name="can-focus">False</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="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.9"/>
- </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.9"/>
- </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.9"/>
- </attributes>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="restlbl">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes"
context="langtoolconfigpage|restlbl">REST protocol:</property>
- <property name="use-underline">True</property>
- <property
name="mnemonic-widget">restprotocol</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="restprotocol">
- <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">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="restdesc">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes"
context="langtoolconfigpage|restdesc">Your LanguageTool REST API protocol for
usage.</property>
- <attributes>
- <attribute name="scale" value="0.9"/>
- </attributes>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">7</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="verifyssl">
- <property name="label" translatable="yes"
context="langtoolconfigpage|verifyssl">Disable SSL certificate
verification</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="halign">start</property>
- <property name="margin-top">5</property>
- <property name="draw-indicator">True</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
+ <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">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">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">static</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="restlbl">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"
context="langtoolconfigpage|restlbl">REST protocol:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">restprotocol</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="restprotocol">
+ <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">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="restdesc">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"
context="langtoolconfigpage|restdesc">Your LanguageTool REST API protocol for
usage.</property>
+ <attributes>
+ <attribute name="scale" value="0.90000000000000002"/>
+ </attributes>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="restdesc-atkobject">
+ <property
name="AtkObject::accessible-role">static</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="verifyssl">
+ <property name="label" translatable="yes"
context="langtoolconfigpage|verifyssl">Disable SSL certificate
verification</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">8</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </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>
@@ -316,7 +332,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>
