cui/source/dialogs/QrCodeGenDialog.cxx | 2 +-
cui/uiconfig/ui/qrcodegen.ui | 18 +++++++++---------
sc/qa/uitest/calc_tests3/insertQrCodeGen.py | 4 ++--
sw/qa/uitest/writer_tests3/insertQrCodeGen.py | 4 ++--
4 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit a20c9604f1f53e01850fb753e7f932e7648d2459
Author: homeboy445 <akshitsa...@gmail.com>
AuthorDate: Sun Mar 21 14:38:33 2021 +0530
Commit: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
CommitDate: Wed Mar 24 08:36:44 2021 +0100
QR Code Dialog: Change term 'border' to 'margin'
This adds a margin around the qr code (white space), not a border.
Change-Id: If3e74dfe19dd7f9c063eaa6439810d617a99cb45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112831
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx
b/cui/source/dialogs/QrCodeGenDialog.cxx
index d4ac05e965f0..9e4d1df1d96d 100644
--- a/cui/source/dialogs/QrCodeGenDialog.cxx
+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
@@ -155,7 +155,7 @@ QrCodeGenDialog::QrCodeGenDialog(weld::Widget* pParent,
Reference<XModel> xModel
m_xBuilder->weld_radio_button("button_medium"),
m_xBuilder->weld_radio_button("button_quartile"),
m_xBuilder->weld_radio_button("button_high") }
- , m_xSpinBorder(m_xBuilder->weld_spin_button("edit_border"))
+ , m_xSpinBorder(m_xBuilder->weld_spin_button("edit_margin"))
#if ENABLE_ZXING
, mpParent(pParent)
#endif
diff --git a/cui/uiconfig/ui/qrcodegen.ui b/cui/uiconfig/ui/qrcodegen.ui
index a66daa6aed6a..aa9064f6e0dc 100644
--- a/cui/uiconfig/ui/qrcodegen.ui
+++ b/cui/uiconfig/ui/qrcodegen.ui
@@ -2,7 +2,7 @@
<!-- Generated with glade 3.36.0 -->
<interface domain="cui">
<requires lib="gtk+" version="3.20"/>
- <object class="GtkAdjustment" id="border_value">
+ <object class="GtkAdjustment" id="margin_value">
<property name="upper">75</property>
<property name="value">1</property>
<property name="step_increment">1</property>
@@ -129,7 +129,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes"
context="qrcodegen|label_text" comments="Text to be stored in the QR">URL/Text
:</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>
@@ -140,13 +140,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_border">
+ <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_border" comments="Set Border around QR">Border
:</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_border</property>
+ <property name="mnemonic_widget">edit_margin</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -187,17 +187,17 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="edit_border">
+ <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="adjustment">border_value</property>
+ <property name="adjustment">margin_value</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
<property name="truncate-multiline">True</property>
<child internal-child="accessible">
- <object class="AtkObject" id="edit_border-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="edit border">The width in dots of the border
surrounding the QR code.</property>
+ <object class="AtkObject" id="edit_margin-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="edit margin">The margin surrounding the QR
code.</property>
</object>
</child>
</object>
diff --git a/sc/qa/uitest/calc_tests3/insertQrCodeGen.py
b/sc/qa/uitest/calc_tests3/insertQrCodeGen.py
index 831fe40eef8d..3dfd396e3fd5 100644
--- a/sc/qa/uitest/calc_tests3/insertQrCodeGen.py
+++ b/sc/qa/uitest/calc_tests3/insertQrCodeGen.py
@@ -36,7 +36,7 @@ class insertQrCode(UITestCase):
# Get elements in the Dialog Box
xURL = xDialog.getChild("edit_text")
xECC_Low = xDialog.getChild("button_low") #How radio button input is
written in text.
- xBorder = xDialog.getChild("edit_border")
+ xBorder = xDialog.getChild("edit_margin")
type_text(xURL, "www.libreoffice.org") #set the QR code
xECC_Low.executeAction("CLICK", tuple())
@@ -63,7 +63,7 @@ class insertQrCode(UITestCase):
xURL = xDialog.getChild("edit_text")
xECC_Low = xDialog.getChild("button_low")
- xBorder = xDialog.getChild("edit_border")
+ xBorder = xDialog.getChild("edit_margin")
type_text(xURL, "www.libreoffice.org") #set the QR code
xECC_Low.executeAction("CLICK", tuple())
diff --git a/sw/qa/uitest/writer_tests3/insertQrCodeGen.py
b/sw/qa/uitest/writer_tests3/insertQrCodeGen.py
index 3124022e0f01..c346932dd5a1 100644
--- a/sw/qa/uitest/writer_tests3/insertQrCodeGen.py
+++ b/sw/qa/uitest/writer_tests3/insertQrCodeGen.py
@@ -35,7 +35,7 @@ class insertQrCode(UITestCase):
# Get elements in the Dialog Box
xURL = xDialog.getChild("edit_text")
xECC_Low = xDialog.getChild("button_low") #How radio button input is
written in text.
- xBorder = xDialog.getChild("edit_border")
+ xBorder = xDialog.getChild("edit_margin")
type_text(xURL, "www.libreoffice.org") #set the QR code
xECC_Low.executeAction("CLICK", tuple())
@@ -61,7 +61,7 @@ class insertQrCode(UITestCase):
xURL = xDialog.getChild("edit_text")
xECC_Low = xDialog.getChild("button_low")
- xBorder = xDialog.getChild("edit_border")
+ xBorder = xDialog.getChild("edit_margin")
type_text(xURL, "www.libreoffice.org") #set the QR code
xECC_Low.executeAction("CLICK", tuple())
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
