sc/UIConfig_scalc.mk | 2
sc/source/ui/dbgui/validate.cxx | 8 -
sc/uiconfig/scalc/ui/erroralerttabpage-mobile.ui | 152 -------------------
sc/uiconfig/scalc/ui/validationhelptabpage-mobile.ui | 110 -------------
sc/uiconfig/scalc/ui/validationhelptabpage.ui | 6
static/CustomTarget_emscripten_fs_image.mk | 2
vcl/jsdialog/enabled.cxx | 13 -
7 files changed, 12 insertions(+), 281 deletions(-)
New commits:
commit 48059620d89aa234a6529e8d555fa24c315dd98c
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Mon Mar 13 10:38:10 2023 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Mon Mar 13 11:30:11 2023 +0000
jsdialog: enable data validation dialog
Change-Id: Ide679ada03dff5e62432d77b8c804d667bf2435b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148781
Tested-by: Szymon Kłos <szymon.k...@collabora.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 13a4b98a6c7c..0696cf11acda 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -124,7 +124,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/dropmenu \
sc/uiconfig/scalc/ui/doubledialog \
sc/uiconfig/scalc/ui/erroralerttabpage \
- sc/uiconfig/scalc/ui/erroralerttabpage-mobile \
sc/uiconfig/scalc/ui/externaldata \
sc/uiconfig/scalc/ui/exponentialsmoothingdialog \
sc/uiconfig/scalc/ui/filldlg \
@@ -262,7 +261,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/validationdialog \
sc/uiconfig/scalc/ui/validationcriteriapage \
sc/uiconfig/scalc/ui/validationhelptabpage \
- sc/uiconfig/scalc/ui/validationhelptabpage-mobile \
sc/uiconfig/scalc/ui/warnautocorrect \
sc/uiconfig/scalc/ui/xmlsourcedialog \
sc/uiconfig/scalc/ui/zoombox \
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index d194fdc1070e..a7b02c6a2086 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -691,11 +691,10 @@ IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl,
weld::Toggleable&, void)
// Input Help Page
ScTPValidationHelp::ScTPValidationHelp(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rArgSet)
- : SfxTabPage(pPage, pController, IS_MOBILE ?
OUString("modules/scalc/ui/validationhelptabpage-mobile.ui")
- : OUString("modules/scalc/ui/validationhelptabpage.ui"),
"ValidationHelpTabPage", &rArgSet)
+ : SfxTabPage(pPage, pController,
"modules/scalc/ui/validationhelptabpage.ui", "ValidationHelpTabPage", &rArgSet)
, m_xTsbHelp(m_xBuilder->weld_check_button("tsbhelp"))
, m_xEdtTitle(m_xBuilder->weld_entry("title"))
- , m_xEdInputHelp(m_xBuilder->weld_text_view("inputhelp"))
+ , m_xEdInputHelp(m_xBuilder->weld_text_view("inputhelp_text"))
{
m_xEdInputHelp->set_size_request(m_xEdInputHelp->get_approximate_digit_width()
* 40, m_xEdInputHelp->get_height_rows(13));
}
@@ -743,8 +742,7 @@ ScTPValidationError::ScTPValidationError(weld::Container*
pPage, weld::DialogCon
const SfxItemSet& rArgSet)
: SfxTabPage ( pPage, pController,
- IS_MOBILE ?
OUString("modules/scalc/ui/erroralerttabpage-mobile.ui")
- :
OUString("modules/scalc/ui/erroralerttabpage.ui"), "ErrorAlertTabPage",
+ "modules/scalc/ui/erroralerttabpage.ui",
"ErrorAlertTabPage",
&rArgSet )
, m_xTsbShow(m_xBuilder->weld_check_button("tsbshow"))
, m_xLbAction(m_xBuilder->weld_combo_box("actionCB"))
diff --git a/sc/uiconfig/scalc/ui/erroralerttabpage-mobile.ui
b/sc/uiconfig/scalc/ui/erroralerttabpage-mobile.ui
deleted file mode 100644
index 74846ac19a62..000000000000
--- a/sc/uiconfig/scalc/ui/erroralerttabpage-mobile.ui
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
-<interface domain="sc">
- <requires lib="gtk+" version="3.20"/>
- <object class="GtkBox" id="ErrorAlertTabPage">
- <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="GtkCheckButton" id="tsbshow">
- <property name="label" translatable="yes"
context="erroralerttabpage-mobile|tsbshow">Show error _message when invalid
values are entered</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="hexpand">True</property>
- <property name="use_underline">True</property>
- <property name="inconsistent">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="action_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="erroralerttabpage-mobile|action_label">_Action:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">actionCB</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="title_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="erroralerttabpage-mobile|title_label">_Title:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">erroralert_title</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="vexpand">True</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTextView" id="errorMsg">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="vexpand">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="erroralert_title">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="truncate-multiline">True</property>
- <property name="activates_default">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="errormsg_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="erroralerttabpage-mobile|errormsg_label">_Error message:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">errorMsg</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="browseBtn">
- <property name="label" translatable="yes"
context="erroralerttabpage-mobile|browseBtn">_Browse...</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="actionCB">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <items>
- <item translatable="yes"
context="erroralerttabpage-mobile|actionCB">Stop</item>
- <item translatable="yes"
context="erroralerttabpage-mobile|actionCB">Warning</item>
- <item translatable="yes"
context="erroralerttabpage-mobile|actionCB">Information</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
-</interface>
diff --git a/sc/uiconfig/scalc/ui/validationhelptabpage-mobile.ui
b/sc/uiconfig/scalc/ui/validationhelptabpage-mobile.ui
deleted file mode 100644
index b1d9c6cea887..000000000000
--- a/sc/uiconfig/scalc/ui/validationhelptabpage-mobile.ui
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
-<interface domain="sc">
- <requires lib="gtk+" version="3.20"/>
- <object class="GtkBox" id="ValidationHelpTabPage">
- <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="GtkCheckButton" id="tsbhelp">
- <property name="label" translatable="yes"
context="validationhelptabpage-mobile|tsbhelp">_Show input help when cell is
selected</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="hexpand">True</property>
- <property name="use_underline">True</property>
- <property name="inconsistent">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkEntry" id="title">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="truncate-multiline">True</property>
- <property name="activates_default">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="title_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="validationhelptabpage-mobile|title_label">_Title:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">title</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="inputhelp_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="validationhelptabpage-mobile|inputhelp_label">_Input help:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">inputhelp</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTextView" id="inputhelp">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
-</interface>
diff --git a/sc/uiconfig/scalc/ui/validationhelptabpage.ui
b/sc/uiconfig/scalc/ui/validationhelptabpage.ui
index 313c07333f5d..15ea8a0877c4 100644
--- a/sc/uiconfig/scalc/ui/validationhelptabpage.ui
+++ b/sc/uiconfig/scalc/ui/validationhelptabpage.ui
@@ -89,7 +89,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes"
context="validationhelptabpage|inputhelp_label">_Input help:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">inputhelp</property>
+ <property name="mnemonic_widget">inputhelp_text</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
</object>
@@ -106,14 +106,14 @@
<property name="vexpand">True</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkTextView" id="inputhelp">
+ <object class="GtkTextView" id="inputhelp_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="inputhelp-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="validationhelptabpage|extended_tip|inputhelp">Enter
the message that you want to display when the cell or cell range is
selected.</property>
+ <property name="AtkObject::accessible-description"
translatable="yes"
context="validationhelptabpage|extended_tip|inputhelp_text">Enter the message
that you want to display when the cell or cell range is selected.</property>
</object>
</child>
</object>
diff --git a/static/CustomTarget_emscripten_fs_image.mk
b/static/CustomTarget_emscripten_fs_image.mk
index f2cf08f65107..37526af1af4a 100644
--- a/static/CustomTarget_emscripten_fs_image.mk
+++ b/static/CustomTarget_emscripten_fs_image.mk
@@ -955,7 +955,6 @@ gb_emscripten_fs_image_files += \
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/descriptivestatisticsdialog.ui
\
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/doubledialog.ui
\
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/dropmenu.ui
\
-
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/erroralerttabpage-mobile.ui
\
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/erroralerttabpage.ui
\
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/exponentialsmoothingdialog.ui
\
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/externaldata.ui
\
@@ -1090,7 +1089,6 @@ gb_emscripten_fs_image_files += \
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/ungroupdialog.ui
\
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/validationcriteriapage.ui
\
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/validationdialog.ui
\
-
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/validationhelptabpage-mobile.ui
\
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/validationhelptabpage.ui
\
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/warnautocorrect.ui
\
$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/xmlsourcedialog.ui
\
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index e4b487f6d6d0..dcc5377f171c 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -18,13 +18,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
// mobile only dialogs
if (bMobile)
{
- if (// scalc
- rUIFile == u"modules/scalc/ui/erroralerttabpage-mobile.ui"
- || rUIFile == u"modules/scalc/ui/validationcriteriapage.ui"
- || rUIFile == u"modules/scalc/ui/validationdialog.ui"
- || rUIFile == u"modules/scalc/ui/validationhelptabpage-mobile.ui"
- // swriter
- || rUIFile == u"modules/swriter/ui/watermarkdialog.ui"
+ if (// swriter
+ rUIFile == u"modules/swriter/ui/watermarkdialog.ui"
|| rUIFile == u"modules/swriter/ui/wordcount-mobile.ui"
// svx
|| rUIFile == u"svx/ui/findreplacedialog-mobile.ui")
@@ -74,6 +69,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"modules/scalc/ui/deletecells.ui"
|| rUIFile == u"modules/scalc/ui/deletecontents.ui"
|| rUIFile == u"modules/scalc/ui/descriptivestatisticsdialog.ui"
+ || rUIFile == u"modules/scalc/ui/erroralerttabpage.ui"
|| rUIFile == u"modules/scalc/ui/exponentialsmoothingdialog.ui"
|| rUIFile == u"modules/scalc/ui/fourieranalysisdialog.ui"
|| rUIFile == u"modules/scalc/ui/groupdialog.ui"
@@ -91,6 +87,9 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"modules/scalc/ui/textimportcsv.ui"
|| rUIFile == u"modules/scalc/ui/ttestdialog.ui"
|| rUIFile == u"modules/scalc/ui/ungroupdialog.ui"
+ || rUIFile == u"modules/scalc/ui/validationcriteriapage.ui"
+ || rUIFile == u"modules/scalc/ui/validationdialog.ui"
+ || rUIFile == u"modules/scalc/ui/validationhelptabpage.ui"
|| rUIFile == u"modules/scalc/ui/ztestdialog.ui"
// schart
|| rUIFile == u"modules/schart/ui/charttypedialog.ui"
