svx/UIConfig_svx.mk | 1
svx/source/dialog/srchdlg.cxx | 7
svx/uiconfig/ui/findreplacedialog-mobile.ui | 1148 ++++++++++++++++++++++++++++
sw/uiconfig/swriter/ui/wordcount-mobile.ui | 4
vcl/source/window/builder.cxx | 3
5 files changed, 1159 insertions(+), 4 deletions(-)
New commits:
commit db90f14b15ebbe843a6fe14c15dea1e883a2317c
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Mon Mar 2 09:39:17 2020 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Mon Mar 2 09:39:17 2020 +0100
Dont show unnecesary buttons on mobile in wordcount
Change-Id: Id6c58f04d29945c23cdcca0c83bba0141ab87c86
diff --git a/sw/uiconfig/swriter/ui/wordcount-mobile.ui
b/sw/uiconfig/swriter/ui/wordcount-mobile.ui
index 37129797d11d..83c63b450b0a 100644
--- a/sw/uiconfig/swriter/ui/wordcount-mobile.ui
+++ b/sw/uiconfig/swriter/ui/wordcount-mobile.ui
@@ -22,7 +22,7 @@
<child>
<object class="GtkButton" id="close">
<property name="label">gtk-close</property>
- <property name="visible">True</property>
+ <property name="visible">False</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="can_default">True</property>
@@ -39,7 +39,7 @@
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</property>
- <property name="visible">True</property>
+ <property name="visible">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
commit cf2602566afb85aed741f474234e7bf6aee3f17b
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Mon Mar 2 09:32:27 2020 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Mon Mar 2 09:32:27 2020 +0100
Add mobile version of find replace dialog
Change-Id: If651f84b97a1ed6b08b9f4eb56ce95fe659cddf7
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index a7cb36f70587..ec45da1cf2e0 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/extrustiondepthdialog \
svx/uiconfig/ui/filtermenu \
svx/uiconfig/ui/findreplacedialog \
+ svx/uiconfig/ui/findreplacedialog-mobile \
svx/uiconfig/ui/floatingareastyle \
svx/uiconfig/ui/floatingcontour \
svx/uiconfig/ui/floatinglineproperty \
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index bec45a0d1aeb..fdeb5b29266b 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -73,6 +73,8 @@
#include <svx/svxdlg.hxx>
#include <vcl/toolbox.hxx>
#include <o3tl/typed_flags_set.hxx>
+#include <comphelper/lok.hxx>
+#include <sfx2/lokhelper.hxx>
#include <cstdlib>
#include <memory>
@@ -86,6 +88,8 @@ using namespace comphelper;
#define REMEMBER_SIZE 10
+#define IS_MOBILE (comphelper::LibreOfficeKit::isActive() &&
comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()))
+
enum class ModifyFlags {
NONE = 0x000000,
Search = 0x000001,
@@ -257,7 +261,8 @@ void SearchAttrItemList::Remove(size_t nPos)
SvxSearchDialog::SvxSearchDialog(weld::Window* pParent, SfxChildWindow*
pChildWin, SfxBindings& rBind)
: SfxModelessDialogController(&rBind, pChildWin, pParent,
- "svx/ui/findreplacedialog.ui",
"FindReplaceDialog")
+ IS_MOBILE ?
OUString("svx/ui/findreplacedialog-mobile.ui") :
OUString("svx/ui/findreplacedialog.ui"),
+ "FindReplaceDialog")
, mbSuccess(false)
, mbClosing(false)
, rBindings(rBind)
diff --git a/svx/uiconfig/ui/findreplacedialog-mobile.ui
b/svx/uiconfig/ui/findreplacedialog-mobile.ui
new file mode 100644
index 000000000000..a7284b125179
--- /dev/null
+++ b/svx/uiconfig/ui/findreplacedialog-mobile.ui
@@ -0,0 +1,1148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
+<interface domain="svx">
+ <requires lib="gtk+" version="3.18"/>
+ <object class="GtkDialog" id="FindReplaceDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes"
context="findreplacedialog|FindReplaceDialog">Find & Replace</property>
+ <property name="resizable">False</property>
+ <property name="default_width">0</property>
+ <property name="default_height">0</property>
+ <property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox3">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area3">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="close">
+ <property name="label">gtk-close</property>
+ <property name="visible">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <property name="image_position">top</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="parent _container_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkFrame" id="searchframe">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment_srch">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="search_grid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="margin_right">6</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="GtkComboBoxText" id="searchterm">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="combobox-entry">
+ <property name="can_focus">True</property>
+ <property
name="activates_default">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="searchlist">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="valign">center</property>
+ <property name="label" translatable="yes"
context="findreplacedialog|label4">_Find:</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property
name="yalign">0.40000000596046448</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="searchdesc">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="wrap">True</property>
+ <property name="ellipsize">end</property>
+ <property name="xalign">0</property>
+ <property
name="yalign">0.55000001192092896</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="searchlabel">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="wrap">True</property>
+ <property name="ellipsize">end</property>
+ <property name="xalign">0</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="searchlabel-atkobject">
+ <property name="AtkObject::accessible-role"
translatable="no">static</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="checkboxrow">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="matchcase">
+ <property name="label" translatable="yes"
context="findreplacedialog|matchcase">Ma_tch case</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</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>
+ <object class="GtkCheckButton"
id="searchformatted">
+ <property name="label" translatable="yes"
context="findreplacedialog|searchformatted">For_matted display</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkCheckButton"
id="wholewords">
+ <property name="label" translatable="yes"
context="findreplacedialog|wholewords">Whole wor_ds only</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="use_underline">True</property>
+ <property name="xalign">0</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>
+ <object class="GtkLabel" id="entirecells">
+ <property name="can_focus">False</property>
+ <property
name="no_show_all">True</property>
+ <property name="label" translatable="yes"
context="findreplacedialog|entirecells">_Entire cells</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="allsheets">
+ <property name="label" translatable="yes"
context="findreplacedialog|allsheets">All _sheets</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="no_show_all">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="findreplacedialog|label1">_Search For</property>
+ <property name="use_underline">True</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="replaceframe">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment_rep">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="replace_grid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="margin_right">6</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="GtkComboBoxText" id="replaceterm">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry"
id="combobox-entry2">
+ <property name="can_focus">True</property>
+ <property
name="activates_default">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="replacelist">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="height">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="valign">center</property>
+ <property name="label" translatable="yes"
context="findreplacedialog|label5">Re_place:</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="replacedesc">
+ <property name="width_request">1</property>
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="wrap">True</property>
+ <property name="ellipsize">end</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="findreplacedialog|label2">Re_place With</property>
+ <property name="use_underline">True</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="controlbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="margin_left">10</property>
+ <property name="margin_right">10</property>
+ <property name="margin_top">15</property>
+ <property name="spacing">12</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkButton" id="searchall">
+ <property name="label" translatable="yes"
context="findreplacedialog|searchall">Find _All</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="backsearch">
+ <property name="label" translatable="yes"
context="findreplacedialog|backsearch">Find Pre_vious</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="search">
+ <property name="label" translatable="yes"
context="findreplacedialog|search">Find Ne_xt</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="replace">
+ <property name="label" translatable="yes"
context="findreplacedialog|replace">_Replace</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="replaceall">
+ <property name="label" translatable="yes"
context="findreplacedialog|replaceall">Replace A_ll</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hide-box">
+ <property name="visible">False</property>
+ <child>
+ <object class="GtkFrame" id="componentframe">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="margin_top">6</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment_cmp">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="component_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">18</property>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="no">Component Label</property>
+ <property name="use_underline">True</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkButton" id="component1">
+ <property name="label"
translatable="no">component button 1</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property name="no_show_all">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="component2">
+ <property name="label"
translatable="no">component button 2</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property name="no_show_all">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label6">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="no">Component
Label</property>
+ <property name="use_underline">True</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="optionsgrid">
+ <property name="visible">False</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">10</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="GtkExpander" id="OptionsExpander">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="margin_left">6</property>
+ <property name="margin_top">1</property>
+ <property name="margin_bottom">1</property>
+ <property name="hexpand">True</property>
+ <property name="label_fill">True</property>
+ <child>
+ <object class="GtkAlignment" id="alignment5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property
name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkCheckButton"
id="selection">
+ <property name="label" translatable="yes"
context="findreplacedialog|selection">C_urrent selection only</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="no_show_all">True</property>
+ <property
name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property
name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="regexp">
+ <property name="label" translatable="yes"
context="findreplacedialog|regexp">Re_gular expressions</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="no_show_all">True</property>
+ <property
name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property
name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox" id="buttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">12</property>
+ <property
name="layout_style">spread</property>
+ <child>
+ <object class="GtkButton"
id="attributes">
+ <property name="label"
translatable="yes"
context="findreplacedialog|attributes">Attribut_es...</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property
name="no_show_all">True</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="format">
+ <property name="label"
translatable="yes" context="findreplacedialog|format">For_mat...</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property
name="no_show_all">True</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="noformat">
+ <property name="label"
translatable="yes" context="findreplacedialog|noformat">_No Format</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property
name="no_show_all">True</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="layout">
+ <property name="label" translatable="yes"
context="findreplacedialog|layout">Search for st_yles</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="no_show_all">True</property>
+ <property
name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property
name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="includediacritics">
+ <property name="label" translatable="yes"
context="findreplacedialog|includediacritics">Diac_ritic-sensitive</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property
name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="includekashida">
+ <property name="label" translatable="yes"
context="findreplacedialog|includekashida">_Kashida-sensitive</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property
name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="matchcharwidth">
+ <property name="label" translatable="yes"
context="findreplacedialog|matchcharwidth">Match character _width</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property
name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkCheckButton"
id="similarity">
+ <property name="label"
translatable="yes" context="findreplacedialog|similarity">S_imilarity
search</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="no_show_all">True</property>
+ <property
name="use_underline">True</property>
+ <property name="xalign">0</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>
+ <object class="GtkButton"
id="similaritybtn">
+ <property name="label"
translatable="yes"
context="findreplacedialog|similaritybtn">Similarities...</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property
name="no_show_all">True</property>
+ <property name="halign">end</property>
+ <property
name="hexpand">True</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkCheckButton"
id="soundslike">
+ <property name="label"
translatable="yes" context="findreplacedialog|soundslike">Sounds like
(_Japanese)</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="no_show_all">True</property>
+ <property
name="use_underline">True</property>
+ <property name="xalign">0</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>
+ <object class="GtkButton"
id="soundslikebtn">
+ <property name="label"
translatable="yes"
context="findreplacedialog|soundslikebtn">Sounds...</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property
name="no_show_all">True</property>
+ <property name="halign">end</property>
+ <property
name="hexpand">True</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkCheckButton"
id="wildcard">
+ <property name="label"
translatable="yes" context="findreplacedialog|wildcard">Wil_dcards</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="no_show_all">True</property>
+ <property
name="use_underline">True</property>
+ <property name="xalign">0</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>
+ <object class="GtkCheckButton"
id="notes">
+ <property name="label"
translatable="yes" context="findreplacedialog|notes">_Comments</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property
name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="replace_backwards">
+ <property name="label" translatable="yes"
context="findreplacedialog|replace_backwards">Replace _backwards</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="no_show_all">True</property>
+ <property
name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property
name="draw_indicator">True</property>
+ </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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="calcgrid">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property
name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkBox" id="searchin_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">15</property>
+ <child>
+ <object class="GtkLabel"
id="searchinlabel">
+ <property
name="can_focus">False</property>
+ <property
name="no_show_all">True</property>
+ <property name="label"
translatable="yes" context="findreplacedialog|searchinlabel">Search
i_n:</property>
+ <property
name="use_underline">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText"
id="calcsearchin">
+ <property
name="can_focus">False</property>
+ <property
name="no_show_all">True</property>
+ <items>
+ <item translatable="yes"
context="findreplacedialog|calcsearchin">Formulas</item>
+ <item translatable="yes"
context="findreplacedialog|calcsearchin">Values</item>
+ <item translatable="yes"
context="findreplacedialog|calcsearchin">Notes</item>
+ </items>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox"
id="searchdirection_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">4</property>
+ <property name="spacing">15</property>
+ <child>
+ <object class="GtkLabel" id="searchdir">
+ <property
name="can_focus">False</property>
+ <property
name="no_show_all">True</property>
+ <property name="label"
translatable="yes" context="findreplacedialog|searchdir">Direction:</property>
+ <property
name="use_underline">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box4">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="spacing">15</property>
+ <child>
+ <object class="GtkRadioButton"
id="rows">
+ <property name="label"
translatable="yes" context="findreplacedialog|rows">Ro_ws</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="no_show_all">True</property>
+ <property
name="use_underline">True</property>
+ <property
name="xalign">0</property>
+ <property
name="active">True</property>
+ <property
name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="member-of"
target="searchdir"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton"
id="cols">
+ <property name="label"
translatable="yes" context="findreplacedialog|cols">Colum_ns</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="no_show_all">True</property>
+ <property
name="use_underline">True</property>
+ <property
name="xalign">0</property>
+ <property
name="draw_indicator">True</property>
+ <property
name="group">rows</property>
+ <accessibility>
+ <relation type="member-of"
target="searchdir"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</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>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"
context="findreplacedialog|label3">Other _options</property>
+ <property name="use_underline">True</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-11">help</action-widget>
+ <action-widget response="-7">close</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup2">
+ <property name="ignore_hidden">True</property>
+ <widgets>
+ <widget name="label4"/>
+ <widget name="label5"/>
+ </widgets>
+ </object>
+</interface>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 306e504f8f48..bbf3679cf1ef 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -148,7 +148,8 @@ weld::Builder* Application::CreateBuilder(weld::Widget*
pParent, const OUString
if (bMobile)
{
- if (rUIFile == "modules/swriter/ui/wordcount-mobile.ui")
+ if (rUIFile == "modules/swriter/ui/wordcount-mobile.ui" ||
+ rUIFile == "svx/ui/findreplacedialog-mobile.ui")
bUseJSBuilder = true;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
