sc/source/ui/dataprovider/dataprovider.cxx | 11 ---
sc/source/ui/inc/dataprovider.hxx | 1
sc/source/ui/miscdlgs/dataproviderdlg.cxx | 13 ----
sc/uiconfig/scalc/ui/dataproviderdlg.ui | 55 ++++++++++++++---
sc/uiconfig/scalc/ui/datetimetransformationentry.ui | 4 -
sc/uiconfig/scalc/ui/deletecolumnentry.ui | 12 +++
sc/uiconfig/scalc/ui/deleterowentry.ui | 2
sc/uiconfig/scalc/ui/findreplaceentry.ui | 2
sc/uiconfig/scalc/ui/mergecolumnentry.ui | 4 -
sc/uiconfig/scalc/ui/numbertransformationentry.ui | 4 -
sc/uiconfig/scalc/ui/replacenulltransformationentry.ui | 4 -
sc/uiconfig/scalc/ui/sorttransformationentry.ui | 2
sc/uiconfig/scalc/ui/swaprowsentry.ui | 2
13 files changed, 74 insertions(+), 42 deletions(-)
New commits:
commit 5c838df65338dbb38fea1e3b68e55c92200c7468
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Thu Feb 27 16:48:37 2025 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Mon Mar 3 12:52:38 2025 +0100
tdf#165339 - Data Provider - tweak wording and more
+ Moved data format org.libreoffice.calc.* to dataproviderdlg.ui
as ID of provider_lst widget
+ Add strings CSV,HTML,XML,SQL to list and set non translatable
+ Adjust dialog labels according to UX advise
+ Adjust transformation names in list
+ Adjust individual transformation dialogs to same names (visible in
tranformation set box).
+ Deleted methods related to org.libreoffice.calc.* in cxx controller
+ and in header hxx file.
Change-Id: I960dd267d40f81f203bb6cc2a3979a69edd72108
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182338
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
Tested-by: Jenkins
diff --git a/sc/source/ui/dataprovider/dataprovider.cxx
b/sc/source/ui/dataprovider/dataprovider.cxx
index dced70cca0bd..296ca0ee2722 100644
--- a/sc/source/ui/dataprovider/dataprovider.cxx
+++ b/sc/source/ui/dataprovider/dataprovider.cxx
@@ -298,17 +298,6 @@ std::shared_ptr<DataProvider>
DataProviderFactory::getDataProvider(ScDocument* p
return std::shared_ptr<DataProvider>();
}
-std::vector<OUString> DataProviderFactory::getDataProviders()
-{
- std::vector<OUString> aDataProviders;
- aDataProviders.emplace_back("org.libreoffice.calc.csv");
- aDataProviders.emplace_back("org.libreoffice.calc.html");
- aDataProviders.emplace_back("org.libreoffice.calc.xml");
- aDataProviders.emplace_back("org.libreoffice.calc.sql");
-
- return aDataProviders;
-}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/dataprovider.hxx
b/sc/source/ui/inc/dataprovider.hxx
index 680bf3819390..4647c2ba4278 100644
--- a/sc/source/ui/inc/dataprovider.hxx
+++ b/sc/source/ui/inc/dataprovider.hxx
@@ -141,7 +141,6 @@ public:
static std::shared_ptr<DataProvider> getDataProvider(ScDocument* pDoc,
sc::ExternalDataSource& rDataSource);
- static std::vector<OUString> getDataProviders();
};
}
diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx
b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
index fd9b83aded94..8861605d70e3 100644
--- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx
+++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
@@ -785,12 +785,6 @@ ScDataProviderDlg::ScDataProviderDlg(weld::Window*
pParent, std::shared_ptr<ScDo
bool bSuccess =
mxDoc->GetDBCollection()->getNamedDBs().insert(std::unique_ptr<ScDBData>(pDBData));
SAL_WARN_IF(!bSuccess, "sc", "temporary warning");
- auto aDataProvider = sc::DataProviderFactory::getDataProviders();
- for (const auto& rDataProvider : aDataProvider)
- {
- mxProviderList->append_text(rDataProvider);
- }
-
mxOKBtn->connect_clicked(LINK(this, ScDataProviderDlg, ApplyQuitHdl));
mxCancelBtn->connect_clicked(LINK(this, ScDataProviderDlg, CancelQuitHdl));
mxAddTransformationBtn->connect_clicked(LINK(this, ScDataProviderDlg,
TransformationListHdl));
@@ -897,16 +891,15 @@ IMPL_LINK_NOARG(ScDataProviderDlg,
TransformationSelectHdl, weld::ComboBox&, voi
sc::ExternalDataSource ScDataProviderDlg::getDataSource(ScDocument* pDoc)
{
- sc::ExternalDataSource aSource(mxEditURL->get_text(),
mxProviderList->get_active_text(), pDoc);
+ sc::ExternalDataSource aSource(mxEditURL->get_text(),
mxProviderList->get_active_id(), pDoc);
- OUString aID = mxEditID->get_text();
- aSource.setID(aID);
+ aSource.setID(mxProviderList->get_active_id());
return aSource;
}
void ScDataProviderDlg::isValid()
{
- bool bValid = !mxProviderList->get_active_text().isEmpty();
+ bool bValid = !mxProviderList->get_active_id().isEmpty();
bValid &= !mxEditURL->get_text().isEmpty();
updateApplyBtn(bValid);
}
diff --git a/sc/uiconfig/scalc/ui/dataproviderdlg.ui
b/sc/uiconfig/scalc/ui/dataproviderdlg.ui
index 5c00a3001260..d32a6db0bf03 100644
--- a/sc/uiconfig/scalc/ui/dataproviderdlg.ui
+++ b/sc/uiconfig/scalc/ui/dataproviderdlg.ui
@@ -117,6 +117,11 @@
<object class="GtkComboBoxText" id="select_db_range">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="select_db_range-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="dataproviderdlg|extended_tip|select_dg_range">The database range to
receive the data from the provider.</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left-attach">1</property>
@@ -128,7 +133,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="dataproviderdlg/provider">Data Provider:</property>
+ <property name="label" translatable="yes"
context="dataproviderdlg/provider">Data Format:</property>
<property name="use-underline">True</property>
<property
name="mnemonic-widget">provider_lst</property>
<property name="xalign">0</property>
@@ -142,6 +147,17 @@
<object class="GtkComboBoxText" id="provider_lst">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <items>
+ <item id="org.libreoffice.calc.csv">CSV</item>
+ <item id="org.libreoffice.calc.html">HTML</item>
+ <item id="org.libreoffice.calc.xml">XML</item>
+ <item id="org.libreoffice.calc.sql">SQL</item>
+ </items>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="provider_lst-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="dataproviderdlg|extended_tip|provider_lst">The format of the data to
be imported.</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left-attach">1</property>
@@ -168,6 +184,11 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="truncate-multiline">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="ed_url-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="dataproviderdlg|extended_tip|ed_url">The URL of the data provider.For
local file, insert the file path and name. For web service, insert the
URL.</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left-attach">1</property>
@@ -191,7 +212,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="dataproviderdlg/id">Id / Xpath:</property>
+ <property name="label" translatable="yes"
context="dataproviderdlg/id">Identifier:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">ed_id</property>
<property name="xalign">0</property>
@@ -206,6 +227,11 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="truncate-multiline">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="ed_id-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="dataproviderdlg|extended_tip|ed_id">The table identifier in the HTML
source or the XPath in XML source.</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left-attach">1</property>
@@ -262,6 +288,11 @@
<property name="halign">end</property>
<property name="margin-end">12</property>
<property name="use-underline">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="add_transformation-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="dataproviderdlg|extended_tip|add_transformation">Includes the selected
transformation to the transformation set. Transformations are included at the
bottom of the list.</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left-attach">1</property>
@@ -274,7 +305,7 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<items>
- <item id="0" translatable="yes"
context="dataproviderdlg|transformation_list">Delete Column</item>
+ <item id="0" translatable="yes"
context="dataproviderdlg|transformation_list">Delete Columns</item>
<item id="1" translatable="yes"
context="dataproviderdlg|transformation_list">Delete Row</item>
<item id="2" translatable="yes"
context="dataproviderdlg|transformation_list">Swap Rows</item>
<item id="3" translatable="yes"
context="dataproviderdlg|transformation_list">Split Column</item>
@@ -282,11 +313,16 @@
<item id="5" translatable="yes"
context="dataproviderdlg|transformation_list">Text Transformation</item>
<item id="6" translatable="yes"
context="dataproviderdlg|transformation_list">Sort Columns</item>
<item id="7" translatable="yes"
context="dataproviderdlg|transformation_list">Aggregate Functions</item>
- <item id="8" translatable="yes"
context="dataproviderdlg|transformation_list">Number Transformations</item>
- <item id="9" translatable="yes"
context="dataproviderdlg|transformation_list">Replace Null
Transformations</item>
- <item id="10" translatable="yes"
context="dataproviderdlg|transformation_list">Date & Time
Transformations</item>
- <item id="11" translatable="yes"
context="dataproviderdlg|transformation_list">Find Replace Transformation</item>
+ <item id="8" translatable="yes"
context="dataproviderdlg|transformation_list">Numeric</item>
+ <item id="9" translatable="yes"
context="dataproviderdlg|transformation_list">Replace Null</item>
+ <item id="10" translatable="yes"
context="dataproviderdlg|transformation_list">Date and Time</item>
+ <item id="11" translatable="yes"
context="dataproviderdlg|transformation_list">Find and Replace</item>
</items>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="transformation_box-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="dataproviderdlg|extended_tip|transformation_box">Available
transformations that can be applied t the provided data.</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left-attach">0</property>
@@ -393,6 +429,11 @@
<property name="halign">end</property>
<property name="margin-end">6</property>
<property name="use-underline">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="apply-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="dataproviderdlg|extended_tip|apply">Applies the
transformations to the provided data and displays results in the Preview area
for inspection.</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/datetimetransformationentry.ui
b/sc/uiconfig/scalc/ui/datetimetransformationentry.ui
index 8ca3b9e7fb9d..d02215cdc601 100644
--- a/sc/uiconfig/scalc/ui/datetimetransformationentry.ui
+++ b/sc/uiconfig/scalc/ui/datetimetransformationentry.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="sc">
<requires lib="gtk+" version="3.20"/>
<!-- n-columns=3 n-rows=3 -->
@@ -26,7 +26,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes"
context="datetimetransformationentry|name">Date Time Transformations</property>
+ <property name="label" translatable="yes"
context="datetimetransformationentry|name">Date and Time</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">ed_lst</property>
</object>
diff --git a/sc/uiconfig/scalc/ui/deletecolumnentry.ui
b/sc/uiconfig/scalc/ui/deletecolumnentry.ui
index db951e2d766d..dc5de1913281 100644
--- a/sc/uiconfig/scalc/ui/deletecolumnentry.ui
+++ b/sc/uiconfig/scalc/ui/deletecolumnentry.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="sc">
<requires lib="gtk+" version="3.20"/>
<!-- n-columns=2 n-rows=3 -->
@@ -44,6 +44,11 @@
<property name="width-chars">10</property>
<property name="truncate-multiline">True</property>
<property name="placeholder-text" translatable="yes"
context="deletecolumnentry/cols">Cols(; Separated)</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="ed_columns-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="deletecolumnentry|extended_tip|ed_columns">List of
columns to delete, separated by semi-colons.</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left-attach">0</property>
@@ -57,6 +62,11 @@
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="halign">end</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="ed_delete-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="deletecolumnentry|extended_tip|ed_delete">Removes
this entry from the transformation list.</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left-attach">1</property>
diff --git a/sc/uiconfig/scalc/ui/deleterowentry.ui
b/sc/uiconfig/scalc/ui/deleterowentry.ui
index e51c57232329..9d7d3547a257 100644
--- a/sc/uiconfig/scalc/ui/deleterowentry.ui
+++ b/sc/uiconfig/scalc/ui/deleterowentry.ui
@@ -26,7 +26,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes"
context="deleterow|delete_label">Delete Row Action</property>
+ <property name="label" translatable="yes"
context="deleterow|delete_label">Delete Row</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">ed_find</property>
</object>
diff --git a/sc/uiconfig/scalc/ui/findreplaceentry.ui
b/sc/uiconfig/scalc/ui/findreplaceentry.ui
index 03582cefa5e7..473940e0ba74 100644
--- a/sc/uiconfig/scalc/ui/findreplaceentry.ui
+++ b/sc/uiconfig/scalc/ui/findreplaceentry.ui
@@ -26,7 +26,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes"
context="findreplace|label_action">Find Replace Action</property>
+ <property name="label" translatable="yes"
context="findreplace|label_action">Find and Replace</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">ed_find</property>
</object>
diff --git a/sc/uiconfig/scalc/ui/mergecolumnentry.ui
b/sc/uiconfig/scalc/ui/mergecolumnentry.ui
index 41ce05894067..dfb03ac4639a 100644
--- a/sc/uiconfig/scalc/ui/mergecolumnentry.ui
+++ b/sc/uiconfig/scalc/ui/mergecolumnentry.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="sc">
<requires lib="gtk+" version="3.20"/>
<!-- n-columns=3 n-rows=3 -->
@@ -26,7 +26,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes"
context="mergecolumnentry|name">Merge Column Action</property>
+ <property name="label" translatable="yes"
context="mergecolumnentry|name">Merge Column</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">ed_separator</property>
</object>
diff --git a/sc/uiconfig/scalc/ui/numbertransformationentry.ui
b/sc/uiconfig/scalc/ui/numbertransformationentry.ui
index 35cd42a7afb1..fae37508938a 100644
--- a/sc/uiconfig/scalc/ui/numbertransformationentry.ui
+++ b/sc/uiconfig/scalc/ui/numbertransformationentry.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="sc">
<requires lib="gtk+" version="3.20"/>
<!-- n-columns=3 n-rows=3 -->
@@ -26,7 +26,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes"
context="numbertransformationentry|name">Number Transformations</property>
+ <property name="label" translatable="yes"
context="numbertransformationentry|name">Numeric</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">ed_lst</property>
</object>
diff --git a/sc/uiconfig/scalc/ui/replacenulltransformationentry.ui
b/sc/uiconfig/scalc/ui/replacenulltransformationentry.ui
index babd68f4ffe3..bf2d86c76958 100644
--- a/sc/uiconfig/scalc/ui/replacenulltransformationentry.ui
+++ b/sc/uiconfig/scalc/ui/replacenulltransformationentry.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="sc">
<requires lib="gtk+" version="3.20"/>
<!-- n-columns=3 n-rows=3 -->
@@ -26,7 +26,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes"
context="replacenulltransformationentry|name">Replace Null
Transformation</property>
+ <property name="label" translatable="yes"
context="replacenulltransformationentry|name">Replace Null</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">ed_str</property>
</object>
diff --git a/sc/uiconfig/scalc/ui/sorttransformationentry.ui
b/sc/uiconfig/scalc/ui/sorttransformationentry.ui
index c2c9cc65930a..9672b73b6e31 100644
--- a/sc/uiconfig/scalc/ui/sorttransformationentry.ui
+++ b/sc/uiconfig/scalc/ui/sorttransformationentry.ui
@@ -26,7 +26,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes"
context="sorttransformationentry|name">Sort Transformation</property>
+ <property name="label" translatable="yes"
context="sorttransformationentry|name">Sort Columns</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">ed_ascending</property>
</object>
diff --git a/sc/uiconfig/scalc/ui/swaprowsentry.ui
b/sc/uiconfig/scalc/ui/swaprowsentry.ui
index c5251127a673..317f110b5d5a 100644
--- a/sc/uiconfig/scalc/ui/swaprowsentry.ui
+++ b/sc/uiconfig/scalc/ui/swaprowsentry.ui
@@ -26,7 +26,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes"
context="swaprows|action">Swap Rows Action</property>
+ <property name="label" translatable="yes"
context="swaprows|action">Swap Rows</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">ed_row1</property>
</object>
