svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 6 ++
svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 3 +
svx/uiconfig/ui/sidebarpossize.ui | 49 +++++++++++++++++++-
3 files changed, 56 insertions(+), 2 deletions(-)
New commits:
commit 368033e18fef487a981ad8b53f8657ea0a0c98d3
Author: Pranam Lashkari <lpra...@collabora.com>
AuthorDate: Sat Mar 28 06:02:05 2020 +0530
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed May 27 08:51:24 2020 +0200
use "To Background" and "To Foreground" only in writer sidebar
Change-Id: Ib7ccac192721b663c9655417fc3d639766d0424d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91267
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94853
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 6258eb810f8d..e5cc427a0f2a 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -110,6 +110,7 @@ PosSizePropertyPanel::PosSizePropertyPanel(
get( mpFtFlip, "fliplabel" );
get( mpFlipTbx, "selectrotationtype" );
get( mpBtnEditChart, "btnEditChart" );
+ get( mArrang, "shaperespectedtotext");
Initialize();
mpBindings->Update( SID_ATTR_METRIC );
@@ -277,12 +278,14 @@ void PosSizePropertyPanel::HandleContextChange(
bool bShowAngle = false;
bool bShowFlip = false;
bool bShowEditChart = false;
+ bool bShowArrangeShape = false;
switch (maContext.GetCombinedContext_DI())
{
case CombinedEnumContext(Application::WriterVariants, Context::Draw):
bShowAngle = true;
bShowFlip = true;
+ bShowArrangeShape = true;
break;
case CombinedEnumContext(Application::WriterVariants,
Context::Graphic):
@@ -342,6 +345,9 @@ void PosSizePropertyPanel::HandleContextChange(
// Edit Chart
mpBtnEditChart->Show(bShowEditChart);
+ // Arrange with respect to text
+ mArrang->Show(bShowArrangeShape);
+
if (mxSidebar.is())
mxSidebar->requestLayout();
}
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index f049d5e4ef9e..26854fa4873c 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -116,6 +116,9 @@ private:
//edit charts button for online's mobile view
VclPtr<PushButton> mpBtnEditChart;
+ // Arrange with respect to text
+ VclPtr<ToolBox> mArrang;
+
// Internal variables
basegfx::B2DRange maRect;
basegfx::B2DRange maWorkArea;
diff --git a/svx/uiconfig/ui/sidebarpossize.ui
b/svx/uiconfig/ui/sidebarpossize.ui
index 8605a49d387e..5a5fc9a00a6c 100644
--- a/svx/uiconfig/ui/sidebarpossize.ui
+++ b/svx/uiconfig/ui/sidebarpossize.ui
@@ -422,8 +422,53 @@
</object>
<packing>
<property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-SidebarToolBox"
id="shaperespectedtotext">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes"
context="sidebarpossize|arrangetoolbar">Arrange</property>
+ <property name="halign">end</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkSeparatorToolItem">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="tobackground">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:SetObjectToBackground</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="toforeground">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:SetObjectToForeground</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
