From 2f4dda0a26fba2555641debdc84ec2ece1433ec6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 24 Jan 2020 15:47:40 +0000 Subject: Related: tdf#128942 remove the scrolledwindow frames from all the dialcontrols MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I445753ad1eb4d441e5a5e909ae450bda6013a6b3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87352 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- chart2/source/controller/dialogs/res_DataLabel.cxx | 2 +- chart2/source/controller/dialogs/tp_AxisLabel.cxx | 2 +- .../source/controller/dialogs/tp_PolarOptions.cxx | 2 +- .../source/controller/dialogs/tp_TitleRotation.cxx | 2 +- chart2/uiconfig/ui/dlg_DataLabel.ui | 21 ++------ chart2/uiconfig/ui/titlerotationtabpage.ui | 57 ++++++---------------- chart2/uiconfig/ui/tp_DataLabel.ui | 21 ++------ chart2/uiconfig/ui/tp_PolarOptions.ui | 29 +++-------- chart2/uiconfig/ui/tp_axisLabel.ui | 39 +++++---------- cui/source/tabpages/align.cxx | 2 +- cui/source/tabpages/transfrm.cxx | 2 +- cui/uiconfig/ui/cellalignment.ui | 41 +++++----------- cui/uiconfig/ui/rotationtabpage.ui | 1 + include/svx/dialcontrol.hxx | 4 -- svx/source/dialog/dialcontrol.cxx | 17 ------- .../sidebar/possize/PosSizePropertyPanel.cxx | 2 +- svx/uiconfig/ui/sidebarpossize.ui | 35 ++++--------- sw/source/ui/frmdlg/frmpage.cxx | 2 +- sw/uiconfig/swriter/ui/picturepage.ui | 21 ++------ 19 files changed, 77 insertions(+), 225 deletions(-) diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 9c5e4617f662..e6620d7c56c8 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -109,7 +109,7 @@ DataLabelResources::DataLabelResources(weld::Builder* pBuilder, weld::Window* pP , m_xNF_Degrees(pBuilder->weld_metric_spin_button("NF_LABEL_DEGREES", FieldUnit::DEGREE)) , m_xBxTextDirection(pBuilder->weld_widget("boxTXT_DIRECTION")) , m_xLB_TextDirection(new TextDirectionListBox(pBuilder->weld_combo_box("LB_LABEL_TEXTDIR"))) - , m_xDC_Dial(new svx::DialControl(pBuilder->weld_scrolled_window("anglepreview"))) + , m_xDC_Dial(new svx::DialControl) , m_xDC_DialWin(new weld::CustomWeld(*pBuilder, "CT_DIAL", *m_xDC_Dial)) { m_xDC_Dial->SetText(m_xFT_Dial->get_label()); diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index 36ec56178a07..1eaaa4063461 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -54,7 +54,7 @@ SchAxisLabelTabPage::SchAxisLabelTabPage(weld::Container* pPage, weld::DialogCon , m_xCbStacked(m_xBuilder->weld_check_button("stackedCB")) , m_xFtTextDirection(m_xBuilder->weld_label("textdirL")) , m_xLbTextDirection(new TextDirectionListBox(m_xBuilder->weld_combo_box("textdirLB"))) - , m_xCtrlDial(new svx::DialControl(m_xBuilder->weld_scrolled_window("anglepreview"))) + , m_xCtrlDial(new svx::DialControl) , m_xCtrlDialWin(new weld::CustomWeld(*m_xBuilder, "dialCtrl", *m_xCtrlDial)) { m_xCtrlDial->SetText(m_xFtABCD->get_label()); diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx index f94536c2db35..804c4221247a 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx @@ -33,7 +33,7 @@ PolarOptionsTabPage::PolarOptionsTabPage(weld::Container* pPage, weld::DialogCon , m_xNF_StartingAngle(m_xBuilder->weld_metric_spin_button("NF_STARTING_ANGLE", FieldUnit::DEGREE)) , m_xFL_PlotOptions(m_xBuilder->weld_frame("framePLOT_OPTIONS")) , m_xCB_IncludeHiddenCells(m_xBuilder->weld_check_button("CB_INCLUDE_HIDDEN_CELLS_POLAR")) - , m_xAngleDial(new svx::DialControl(m_xBuilder->weld_scrolled_window("anglepreview"))) + , m_xAngleDial(new svx::DialControl) , m_xAngleDialWin(new weld::CustomWeld(*m_xBuilder, "CT_ANGLE_DIAL", *m_xAngleDial)) { m_xAngleDial->SetLinkedField(m_xNF_StartingAngle.get()); diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index 4efcb30da2bc..32510374aa33 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -38,7 +38,7 @@ SchAlignmentTabPage::SchAlignmentTabPage(weld::Container* pPage, weld::DialogCon , m_xFtTextDirection(m_xBuilder->weld_label("textdirL")) , m_xFtABCD(m_xBuilder->weld_label("labelABCD")) , m_xLbTextDirection(new TextDirectionListBox(m_xBuilder->weld_combo_box("textdirLB"))) - , m_xCtrlDial(new svx::DialControl(m_xBuilder->weld_scrolled_window("anglepreview"))) + , m_xCtrlDial(new svx::DialControl) , m_xCtrlDialWin(new weld::CustomWeld(*m_xBuilder, "dialCtrl", *m_xCtrlDial)) { m_xCtrlDial->SetLinkedField(m_xNfRotate.get()); diff --git a/chart2/uiconfig/ui/dlg_DataLabel.ui b/chart2/uiconfig/ui/dlg_DataLabel.ui index 3b0130674dcd..4050677ee964 100644 --- a/chart2/uiconfig/ui/dlg_DataLabel.ui +++ b/chart2/uiconfig/ui/dlg_DataLabel.ui @@ -378,25 +378,10 @@ False 12 - + True - True - never - never - in - - - True - False - - - True - True - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK - - - - + False + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK False diff --git a/chart2/uiconfig/ui/titlerotationtabpage.ui b/chart2/uiconfig/ui/titlerotationtabpage.ui index 31c53c0334e7..04fa4dfce4cd 100644 --- a/chart2/uiconfig/ui/titlerotationtabpage.ui +++ b/chart2/uiconfig/ui/titlerotationtabpage.ui @@ -1,4 +1,5 @@ + @@ -42,8 +43,6 @@ 0 2 - 1 - 1 @@ -57,8 +56,6 @@ 1 2 - 1 - 1 @@ -77,36 +74,6 @@ 1 0 - 1 - 1 - - - - - True - True - center - center - in - - - True - False - - - True - True - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK - - - - - - - 0 - 0 - 1 - 1 @@ -129,8 +96,6 @@ 0 0 - 1 - 1 @@ -141,16 +106,12 @@ 0 1 - 1 - 1 2 0 - 1 - 1 @@ -163,8 +124,6 @@ 0 1 - 1 - 1 @@ -176,7 +135,19 @@ 1 1 2 - 1 + + + + + True + False + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK + center + center + + + 0 + 0 diff --git a/chart2/uiconfig/ui/tp_DataLabel.ui b/chart2/uiconfig/ui/tp_DataLabel.ui index 8028cbd995fc..40c26c455864 100644 --- a/chart2/uiconfig/ui/tp_DataLabel.ui +++ b/chart2/uiconfig/ui/tp_DataLabel.ui @@ -307,25 +307,10 @@ False 12 - + True - True - never - never - in - - - True - False - - - True - True - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK - - - - + False + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK False diff --git a/chart2/uiconfig/ui/tp_PolarOptions.ui b/chart2/uiconfig/ui/tp_PolarOptions.ui index 7dbd320aa9c2..ceea40c580a2 100644 --- a/chart2/uiconfig/ui/tp_PolarOptions.ui +++ b/chart2/uiconfig/ui/tp_PolarOptions.ui @@ -1,5 +1,5 @@ - + @@ -42,8 +42,8 @@ True False - 0 Orientation + 0 @@ -74,25 +74,12 @@ False 12 - + True - True + False + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK center center - in - - - True - False - - - True - True - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK - - - - False @@ -118,10 +105,10 @@ True False - 0 _Degrees True NF_STARTING_ANGLE + 0 False @@ -137,8 +124,8 @@ True False - 0 Starting Angle + 0 @@ -180,8 +167,8 @@ True False - 0 Plot Options + 0 diff --git a/chart2/uiconfig/ui/tp_axisLabel.ui b/chart2/uiconfig/ui/tp_axisLabel.ui index d4bc8d5afbef..328f81a5afe1 100644 --- a/chart2/uiconfig/ui/tp_axisLabel.ui +++ b/chart2/uiconfig/ui/tp_axisLabel.ui @@ -298,32 +298,6 @@ 0 - - - True - True - center - center - in - - - True - False - - - True - True - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK - - - - - - - 0 - 0 - - True @@ -385,6 +359,19 @@ 2 + + + True + False + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK + center + center + + + 0 + 0 + + diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index efa1b35a9efc..a0ecb03c7f69 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -132,7 +132,7 @@ AlignmentTabPage::AlignmentTabPage(weld::Container* pPage, weld::DialogControlle , m_xOrientFrame(m_xBuilder->weld_widget("orientation")) , m_xPropertiesFrame(m_xBuilder->weld_widget("properties")) , m_xVsRefEdge(new weld::CustomWeld(*m_xBuilder, "references", m_aVsRefEdge)) - , m_xCtrlDial(new DialControl(m_xBuilder->weld_scrolled_window("anglepreview"))) + , m_xCtrlDial(new DialControl) , m_xCtrlDialWin(new weld::CustomWeld(*m_xBuilder, "dialcontrol", *m_xCtrlDial)) { m_xCtrlDial->SetLinkedField(m_xNfRotate.get()); diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 90def10a4323..fc4743fbde2d 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -177,7 +177,7 @@ SvxAngleTabPage::SvxAngleTabPage(weld::Container* pPage, weld::DialogController* , m_xCtlRect(new weld::CustomWeld(*m_xBuilder, "CTL_RECT", m_aCtlRect)) , m_xFlAngle(m_xBuilder->weld_widget("FL_ANGLE")) , m_xNfAngle(m_xBuilder->weld_metric_spin_button("NF_ANGLE", FieldUnit::DEGREE)) - , m_xCtlAngle(new svx::DialControl(m_xBuilder->weld_scrolled_window("anglepreview"))) + , m_xCtlAngle(new svx::DialControl) , m_xCtlAngleWin(new weld::CustomWeld(*m_xBuilder, "CTL_ANGLE", *m_xCtlAngle)) { // calculate PoolUnit diff --git a/cui/uiconfig/ui/cellalignment.ui b/cui/uiconfig/ui/cellalignment.ui index ed26edc39796..a9074c61a943 100644 --- a/cui/uiconfig/ui/cellalignment.ui +++ b/cui/uiconfig/ui/cellalignment.ui @@ -118,34 +118,6 @@ 1 - - - True - True - never - never - in - - - True - False - - - True - True - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK - center - center - - - - - - - 1 - 1 - - True @@ -190,6 +162,19 @@ 0 + + + True + False + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK + center + center + + + 1 + 1 + + diff --git a/cui/uiconfig/ui/rotationtabpage.ui b/cui/uiconfig/ui/rotationtabpage.ui index 5d3f9a1acbe5..7a89884eaa0e 100644 --- a/cui/uiconfig/ui/rotationtabpage.ui +++ b/cui/uiconfig/ui/rotationtabpage.ui @@ -276,6 +276,7 @@ False Default _settings: True + CTL_ANGLE False diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index fffcf6ade3e8..44e35e211151 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -75,7 +75,6 @@ private: class SAL_WARN_UNUSED SVX_DLLPUBLIC DialControl final : public weld::CustomWidgetController { public: - DialControl(std::unique_ptr xScrolledWindow); virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; @@ -87,8 +86,6 @@ public: virtual bool MouseButtonUp( const MouseEvent& rMEvt ) override; virtual bool KeyInput(const KeyEvent& rKEvt) override; virtual void LoseFocus() override; - virtual void Show() override; - virtual void Hide() override; virtual void Resize() override; @@ -152,7 +149,6 @@ private: void Init( const Size& rWinSize, const vcl::Font& rWinFont ); void SetSize( const Size& rWinSize ); }; - std::unique_ptr mxScrolledWindow; std::unique_ptr< DialControl_Impl > mpImpl; void HandleMouseEvent( const Point& rPos, bool bInitial ); diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 244ceb4fac4e..7faf0d9852e9 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -253,23 +253,6 @@ void DialControl::DialControl_Impl::SetSize( const Size& rWinSize ) mxBmpBuffered->SetSize( maWinSize ); } -DialControl::DialControl(std::unique_ptr xScrolledWindow) - : mxScrolledWindow(std::move(xScrolledWindow)) -{ -} - -void DialControl::Show() -{ - mxScrolledWindow->show(); - weld::CustomWidgetController::Show(); -} - -void DialControl::Hide() -{ - weld::CustomWidgetController::Hide(); - mxScrolledWindow->hide(); -} - void DialControl::SetDrawingArea(weld::DrawingArea* pDrawingArea) { CustomWidgetController::SetDrawingArea(pDrawingArea); diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 5ff2f531c40a..eb22debd13e6 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -73,7 +73,7 @@ PosSizePropertyPanel::PosSizePropertyPanel( mxCbxScale(m_xBuilder->weld_check_button("ratio")), mxFtAngle(m_xBuilder->weld_label("rotationlabel")), mxMtrAngle(m_xBuilder->weld_metric_spin_button("rotation", FieldUnit::DEGREE)), - mxCtrlDial(new DialControl(m_xBuilder->weld_scrolled_window("anglepreview"))), + mxCtrlDial(new DialControl), mxDial(new weld::CustomWeld(*m_xBuilder, "orientationcontrol", *mxCtrlDial)), mxFtFlip(m_xBuilder->weld_label("fliplabel")), mxFlipTbx(m_xBuilder->weld_toolbar("selectrotationtype")), diff --git a/svx/uiconfig/ui/sidebarpossize.ui b/svx/uiconfig/ui/sidebarpossize.ui index 049626c2247b..86d5eaaa5a24 100644 --- a/svx/uiconfig/ui/sidebarpossize.ui +++ b/svx/uiconfig/ui/sidebarpossize.ui @@ -328,34 +328,19 @@ - + True - True + False + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK + Rotation Angle end center - never - never - in - - - True - False - - - True - False - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK - Rotation Angle - - - - - - Rotation - - - - + + + + + + Rotation diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index dedafbf2fd34..5ba7541fb468 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2310,7 +2310,7 @@ SwGrfExtPage::SwGrfExtPage(weld::Container* pPage, weld::DialogController* pCont // RotGrfFlyFrame: Need Angle and RotateControls now , m_xFlAngle(m_xBuilder->weld_frame("FL_ANGLE")) , m_xNfAngle(m_xBuilder->weld_metric_spin_button("NF_ANGLE", FieldUnit::DEGREE)) - , m_xCtlAngle(new svx::DialControl(m_xBuilder->weld_scrolled_window("anglepreview"))) + , m_xCtlAngle(new svx::DialControl) , m_xCtlAngleWin(new weld::CustomWeld(*m_xBuilder, "CTL_ANGLE", *m_xCtlAngle)) , m_xBmpWin(new weld::CustomWeld(*m_xBuilder, "preview", m_aBmpWin)) { diff --git a/sw/uiconfig/swriter/ui/picturepage.ui b/sw/uiconfig/swriter/ui/picturepage.ui index a5045dc8e8d7..23f9ef2be5ff 100644 --- a/sw/uiconfig/swriter/ui/picturepage.ui +++ b/sw/uiconfig/swriter/ui/picturepage.ui @@ -310,25 +310,12 @@ - + True - True + False + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK + Rotation Angle center - in - - - True - False - - - True - True - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK - Rotation Angle - - - - False -- cgit