From c6db7f77386e4e3a8c3ec97be4eb42c74556141f Mon Sep 17 00:00:00 2001 From: Muhammet Kara Date: Thu, 16 Jun 2016 22:09:45 +0300 Subject: Move AccessibleNames to .ui file for WrapPropertyPanel tdf#87026 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GetQuickHelpText() returns the value of the tooltip text. So moving them into .ui file as tooltips. Change-Id: If7f8f5a585f5a765b0c41374beec2843c0335e75 Reviewed-on: https://gerrit.libreoffice.org/26389 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 7 ------ sw/uiconfig/swriter/ui/sidebarwrap.ui | 32 +++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx index be381bfe6cb1..63517d7a438d 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx @@ -180,13 +180,6 @@ void WrapPropertyPanel::Initialize() aCustomEntry = mpCustomEntry->GetText(); - mpRBNoWrap->SetAccessibleName(mpRBNoWrap->GetQuickHelpText()); - mpRBWrapLeft->SetAccessibleName(mpRBWrapLeft->GetQuickHelpText()); - mpRBWrapRight->SetAccessibleName(mpRBWrapRight->GetQuickHelpText()); - mpRBWrapParallel->SetAccessibleName(mpRBWrapParallel->GetQuickHelpText()); - mpRBWrapThrough->SetAccessibleName(mpRBWrapThrough->GetQuickHelpText()); - mpRBIdealWrap->SetAccessibleName(mpRBIdealWrap->GetQuickHelpText()); - mpBindings->Update( FN_FRAME_NOWRAP ); mpBindings->Update( FN_FRAME_WRAP ); mpBindings->Update( FN_FRAME_WRAP_RIGHT ); diff --git a/sw/uiconfig/swriter/ui/sidebarwrap.ui b/sw/uiconfig/swriter/ui/sidebarwrap.ui index 9e3708a2f79b..0b9b2df70a35 100644 --- a/sw/uiconfig/swriter/ui/sidebarwrap.ui +++ b/sw/uiconfig/swriter/ui/sidebarwrap.ui @@ -1,5 +1,5 @@ - + @@ -74,6 +74,11 @@ 0 True True + + + None + + False @@ -93,6 +98,11 @@ 0 True True + + + Parallel + + False @@ -112,6 +122,11 @@ 0 True True + + + Optimal + + False @@ -131,6 +146,11 @@ 0 True True + + + Before + + False @@ -150,6 +170,11 @@ 0 True True + + + After + + False @@ -169,6 +194,11 @@ 0 True True + + + Through + + False -- cgit v1.2.3