cui/uiconfig/ui/qrcodegen.ui | 155 +++++++++++++++++++++---------------------- 1 file changed, 78 insertions(+), 77 deletions(-)
New commits: commit 113ce1e5029d07224a2bbe7a5b253799fb420228 Author: Michael Weghorn <[email protected]> AuthorDate: Sat Dec 14 21:02:57 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sun Dec 15 01:19:12 2024 +0100 a11y: Leave URL/text field in QR dialog on simple tab See similar commit for another dialog commit faa6749592b7777773a51cb6f350a39aeb67b052 Author: Michael Weghorn <[email protected]> Date: Mon Oct 7 08:10:56 2024 +0200 a11y: Leave accessible description text view on simple tab key for reasoning. Change-Id: Iac05e219f852918c4f0861541fd15cbffb6c9eaa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178487 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/cui/uiconfig/ui/qrcodegen.ui b/cui/uiconfig/ui/qrcodegen.ui index 005795a6422d..d1c5d9c97aee 100644 --- a/cui/uiconfig/ui/qrcodegen.ui +++ b/cui/uiconfig/ui/qrcodegen.ui @@ -138,6 +138,7 @@ <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="accepts-tab">False</property> <child internal-child="accessible"> <object class="AtkObject" id="edit_text-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="qr text">The text from which to generate the code.</property> commit 21d137ba6905872e5c8d46081756c3fef15b937f Author: Michael Weghorn <[email protected]> AuthorDate: Sat Dec 14 20:59:50 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sun Dec 15 01:19:03 2024 +0100 tdf#130857 qrcodegen.ui: Define grid children in order Switch the order in which the children of the grid in the .ui file are defined so that the order matches the visual appearance, which makes sure that tab focus order with the Qt-based VCL plugins is correct as well in that dialog when using native Qt widgets, where focus order is (by default) based on widget creation order. See commit 02692566ad9fc7c3484f8581ffa0004cd4e43987 Author: Michael Weghorn <[email protected]> Date: Thu Oct 24 17:43:35 2024 +0200 tdf#130857 optnewdictionarydialog.ui: Define focusable widgets in order for more background. Change-Id: I3995a50a34b2fc1515c5d64f5f1b6ff0dd83dbeb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178486 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/cui/uiconfig/ui/qrcodegen.ui b/cui/uiconfig/ui/qrcodegen.ui index a3d25996e16c..005795a6422d 100644 --- a/cui/uiconfig/ui/qrcodegen.ui +++ b/cui/uiconfig/ui/qrcodegen.ui @@ -125,54 +125,30 @@ </packing> </child> <child> - <object class="GtkLabel" id="label_margin"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="qrcodegen|label_margin" comments="Set Margin around QR">Margin:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">edit_margin</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label_type"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="qrcodegen|label_type" comments="Select type">Type:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">choose_type</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">3</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="choose_type"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> - <property name="active">0</property> - <items> - <item translatable="yes" context="qrcodegen|QrCode">QR Code</item> - <item translatable="yes" context="qrcodegen|BarCode">Barcode</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="choose_type-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="type">The type of code to generate.</property> + <property name="vexpand">True</property> + <property name="hscrollbar-policy">always</property> + <property name="shadow-type">in</property> + <child> + <object class="GtkTextView" id="edit_text"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="edit_text-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="qr text">The text from which to generate the code.</property> + </object> + </child> </object> </child> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">3</property> + <property name="top-attach">0</property> </packing> </child> <child> @@ -207,26 +183,6 @@ <property name="top-attach">1</property> </packing> </child> - <child> - <object class="GtkSpinButton" id="edit_margin"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="activates-default">True</property> - <property name="truncate-multiline">True</property> - <property name="adjustment">margin_value</property> - <property name="snap-to-ticks">True</property> - <property name="numeric">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="edit_margin-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="edit margin">The margin surrounding the code.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">2</property> - </packing> - </child> <child> <!-- n-columns=1 n-rows=4 --> <object class="GtkGrid"> @@ -332,30 +288,74 @@ </packing> </child> <child> - <object class="GtkScrolledWindow"> + <object class="GtkLabel" id="label_margin"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="qrcodegen|label_margin" comments="Set Margin around QR">Margin:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">edit_margin</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="edit_margin"> <property name="visible">True</property> <property name="can-focus">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> + <property name="adjustment">margin_value</property> + <property name="snap-to-ticks">True</property> + <property name="numeric">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="edit_margin-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="edit margin">The margin surrounding the code.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label_type"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="qrcodegen|label_type" comments="Select type">Type:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">choose_type</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="choose_type"> + <property name="visible">True</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="hscrollbar-policy">always</property> - <property name="shadow-type">in</property> - <child> - <object class="GtkTextView" id="edit_text"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="edit_text-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="qr text">The text from which to generate the code.</property> - </object> - </child> + <property name="active">0</property> + <items> + <item translatable="yes" context="qrcodegen|QrCode">QR Code</item> + <item translatable="yes" context="qrcodegen|BarCode">Barcode</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="choose_type-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="type">The type of code to generate.</property> </object> </child> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">0</property> + <property name="top-attach">3</property> </packing> </child> </object>
