sc/inc/strings.hrc | 2 ++
sc/source/ui/inc/duplicaterecordsdlg.hxx | 2 ++
sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx | 26 +++++++++++++++++---------
sc/uiconfig/scalc/ui/duplicaterecordsdlg.ui | 6 +++---
4 files changed, 24 insertions(+), 12 deletions(-)
New commits:
commit 965287a9edb982b4f1857e7a57a73f0bdfd7e330
Author: Sahil Gautam <sa...@libreoffice.org>
AuthorDate: Mon Oct 28 01:33:32 2024 +0530
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Thu Oct 31 10:09:26 2024 +0100
tdf#85976 Make labels more intuitive in "Duplicate Records Dialog"
Records is not a very intuitive label for the the treeview section of
the dialog. Change to "Rows: " and "Columns: " based on what's being
displayed in the dialog
Change "Compare: " to "Compare by: "
Change-Id: Idff5f4a6935856f2c5a16f5b45bf8ce0ba169ca4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175704
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index faaa5e64998b..7ae3d47b5f43 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -443,6 +443,8 @@
#define STR_DUPLICATERECORDSDLG_NODATAFOUND
NC_("STR_DUPLICATERECORDS_NODATAFOUND", "No data found to operate on.")
#define STR_DUPLICATERECORDS_DATACONATINSROWHEADERS
NC_("STR_DUPLICATERECORDS_DATACONATINSROWHEADERS", "Data contains row headers")
#define STR_DUPLICATERECORDS_DATACONATINSCOLUMNHEADERS
NC_("STR_DUPLICATERECORDS_DATACONATINSCOLUMNHEADERS", "Data contains column
headers")
+#define STR_DUPLICATERECORDS_RECORDSROWS
NC_("STR_DUPLICATERECORDS_RECORDSROWS", "Rows:")
+#define STR_DUPLICATERECORDS_RECORDSCOLUMNS
NC_("STR_DUPLICATERECORDS_RECORDSCOLUMNS", "Columns:")
#define STR_CONTENT_WITH_UNKNOWN_ENCRYPTION
NC_("STR_CONTENT_WITH_UNKNOWN_ENCRYPTION", "Document contains DRM content that
is encrypted with an unknown encryption method. Only the un-encrypted content
will be shown.")
diff --git a/sc/source/ui/inc/duplicaterecordsdlg.hxx
b/sc/source/ui/inc/duplicaterecordsdlg.hxx
index 5bf726708b20..706ef3b18d00 100644
--- a/sc/source/ui/inc/duplicaterecordsdlg.hxx
+++ b/sc/source/ui/inc/duplicaterecordsdlg.hxx
@@ -52,6 +52,7 @@ public:
private:
void Init();
void SetDialogData(bool bToggle);
+ void SetDialogLabels();
std::unique_ptr<weld::CheckButton> m_xIncludesHeaders;
std::unique_ptr<weld::RadioButton> m_xRadioRow;
std::unique_ptr<weld::RadioButton> m_xRadioColumn;
@@ -59,6 +60,7 @@ private:
std::unique_ptr<weld::RadioButton> m_xRadioRemove;
std::unique_ptr<weld::TreeView> m_xCheckList;
std::unique_ptr<weld::CheckButton> m_xAllChkBtn;
+ std::unique_ptr<weld::Label> m_xRecordsLabel;
std::unique_ptr<weld::Button> m_xOkBtn;
std::unique_ptr<weld::Button> m_xHelpBtn;
diff --git a/sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx
b/sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx
index a3dfbf4f175b..dbe3c050c370 100644
--- a/sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx
+++ b/sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx
@@ -40,6 +40,7 @@ ScDuplicateRecordsDlg::ScDuplicateRecordsDlg(weld::Window*
pParent,
, m_xRadioRemove(m_xBuilder->weld_radio_button("remove"))
, m_xCheckList(m_xBuilder->weld_tree_view("checklist"))
, m_xAllChkBtn(m_xBuilder->weld_check_button("allcheckbtn"))
+ , m_xRecordsLabel(m_xBuilder->weld_label("records"))
, m_xOkBtn(m_xBuilder->weld_button("okbtn"))
, m_xHelpBtn(m_xBuilder->weld_button("helpbutton"))
, mrCellData(rData)
@@ -120,6 +121,20 @@ void ScDuplicateRecordsDlg::SetDialogData(bool bToggle)
m_xCheckList->thaw();
}
+void ScDuplicateRecordsDlg::SetDialogLabels()
+{
+ if (m_xRadioRow->get_active())
+ {
+
m_xIncludesHeaders->set_label(ScResId(STR_DUPLICATERECORDS_DATACONATINSROWHEADERS));
+
m_xRecordsLabel->set_label(ScResId(STR_DUPLICATERECORDS_RECORDSCOLUMNS));
+ }
+ else
+ {
+
m_xIncludesHeaders->set_label(ScResId(STR_DUPLICATERECORDS_DATACONATINSCOLUMNHEADERS));
+ m_xRecordsLabel->set_label(ScResId(STR_DUPLICATERECORDS_RECORDSROWS));
+ }
+}
+
void ScDuplicateRecordsDlg::InsertEntry(const OUString& rTxt, bool bToggle)
{
m_xCheckList->append();
@@ -149,21 +164,14 @@ void ScDuplicateRecordsDlg::Init()
m_xRadioSelect->set_active(
!officecfg::Office::Calc::Misc::HandleDuplicateRecords::RemoveRecords::get());
- const OUString aHeaderLabel = m_xRadioRow->get_active()
- ?
ScResId(STR_DUPLICATERECORDS_DATACONATINSROWHEADERS)
- :
ScResId(STR_DUPLICATERECORDS_DATACONATINSCOLUMNHEADERS);
- m_xIncludesHeaders->set_label(aHeaderLabel);
-
+ SetDialogLabels();
m_xAllChkBtn->set_state(TRISTATE_FALSE);
SetDialogData(true);
}
IMPL_LINK_NOARG(ScDuplicateRecordsDlg, OrientationHdl, weld::Toggleable&, void)
{
- const OUString aHeaderLabel = m_xRadioRow->get_active()
- ?
ScResId(STR_DUPLICATERECORDS_DATACONATINSROWHEADERS)
- :
ScResId(STR_DUPLICATERECORDS_DATACONATINSCOLUMNHEADERS);
- m_xIncludesHeaders->set_label(aHeaderLabel);
+ SetDialogLabels();
SetDialogData(true);
}
diff --git a/sc/uiconfig/scalc/ui/duplicaterecordsdlg.ui
b/sc/uiconfig/scalc/ui/duplicaterecordsdlg.ui
index 6a371f8d5428..3e8f0c88865e 100644
--- a/sc/uiconfig/scalc/ui/duplicaterecordsdlg.ui
+++ b/sc/uiconfig/scalc/ui/duplicaterecordsdlg.ui
@@ -94,7 +94,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="valign">start</property>
- <property name="label" translatable="yes"
context="duplicaterecordsdialog|compare">Compare:</property>
+ <property name="label" translatable="yes"
context="duplicaterecordsdialog|compare">Compare by:</property>
<property name="mnemonic-widget">row</property>
</object>
<packing>
@@ -282,7 +282,7 @@
</child>
<child>
<object class="GtkCheckButton" id="includesheaders">
- <property name="label" translatable="yes"
context="duplicaterecordsdialog|includesheaders">Data contains row/col
headers</property>
+ <property name="label" translatable="no"
context="duplicaterecordsdialog|includesheaders">Data contains row/col
headers</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
@@ -301,7 +301,7 @@
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
- <property name="label" translatable="yes"
context="duplicaterecordsdialog|records">Records:</property>
+ <property name="label" translatable="no"
context="duplicaterecordsdialog|records">Records:</property>
<property name="mnemonic-widget">allcheckbtn</property>
</object>
<packing>
