diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-05-21 09:46:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-05-21 13:35:30 +0200 |
| commit | f654af56695197d11c277c424b0dd2b93195add9 (patch) | |
| tree | 7507fea1128caf3408b56d4c7bf9fb59f9637375 /sw/source/ui | |
| parent | 9ae02c9e5ce44173f042abcf3d644fb65d1d91b9 (diff) | |
move wrap icons outside radiobuttons
not possible in gtk4 to put an image in here anymore AFAICS,
this was always an odd case anyway
Change-Id: Ic9415cd0c91a7f006231d786f2a3a22b8f97af6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115907
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/frmdlg/wrap.cxx | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index a09c8475cdcd..bf4029269154 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -72,11 +72,17 @@ SwWrapTabPage::SwWrapTabPage(weld::Container* pPage, weld::DialogController* pCo , m_bHtmlMode(false) , m_bDrawMode(false) , m_bContourImage(false) + , m_xNoWrapImg(m_xBuilder->weld_image("noneimg")) , m_xNoWrapRB(m_xBuilder->weld_radio_button("none")) + , m_xWrapLeftImg(m_xBuilder->weld_image("beforeimg")) , m_xWrapLeftRB(m_xBuilder->weld_radio_button("before")) + , m_xWrapRightImg(m_xBuilder->weld_image("afterimg")) , m_xWrapRightRB(m_xBuilder->weld_radio_button("after")) + , m_xWrapParallelImg(m_xBuilder->weld_image("parallelimg")) , m_xWrapParallelRB(m_xBuilder->weld_radio_button("parallel")) + , m_xWrapThroughImg(m_xBuilder->weld_image("throughimg")) , m_xWrapThroughRB(m_xBuilder->weld_radio_button("through")) + , m_xIdealWrapImg(m_xBuilder->weld_image("optimalimg")) , m_xIdealWrapRB(m_xBuilder->weld_radio_button("optimal")) , m_xLeftMarginED(m_xBuilder->weld_metric_spin_button("left", FieldUnit::CM)) , m_xRightMarginED(m_xBuilder->weld_metric_spin_button("right", FieldUnit::CM)) @@ -604,23 +610,23 @@ IMPL_LINK_NOARG(SwWrapTabPage, ContourHdl, weld::ToggleButton&, void) void SwWrapTabPage::SetImages() { - m_xWrapThroughRB->set_from_icon_name(RID_BMP_WRAP_THROUGH); + m_xWrapThroughImg->set_from_icon_name(RID_BMP_WRAP_THROUGH); bool bWrapOutline = !m_xWrapOutlineCB->get_active(); if (bWrapOutline) { - m_xNoWrapRB->set_from_icon_name(RID_BMP_WRAP_NONE); - m_xWrapLeftRB->set_from_icon_name(RID_BMP_WRAP_LEFT); - m_xWrapRightRB->set_from_icon_name(RID_BMP_WRAP_RIGHT); - m_xWrapParallelRB->set_from_icon_name(RID_BMP_WRAP_PARALLEL); - m_xIdealWrapRB->set_from_icon_name(RID_BMP_WRAP_IDEAL); + m_xNoWrapImg->set_from_icon_name(RID_BMP_WRAP_NONE); + m_xWrapLeftImg->set_from_icon_name(RID_BMP_WRAP_LEFT); + m_xWrapRightImg->set_from_icon_name(RID_BMP_WRAP_RIGHT); + m_xWrapParallelImg->set_from_icon_name(RID_BMP_WRAP_PARALLEL); + m_xIdealWrapImg->set_from_icon_name(RID_BMP_WRAP_IDEAL); } else { - m_xNoWrapRB->set_from_icon_name(RID_BMP_WRAP_CONTOUR_NONE); - m_xWrapLeftRB->set_from_icon_name(RID_BMP_WRAP_CONTOUR_LEFT); - m_xWrapRightRB->set_from_icon_name(RID_BMP_WRAP_CONTOUR_RIGHT); - m_xWrapParallelRB->set_from_icon_name(RID_BMP_WRAP_CONTOUR_PARALLEL); - m_xIdealWrapRB->set_from_icon_name(RID_BMP_WRAP_CONTOUR_IDEAL); + m_xNoWrapImg->set_from_icon_name(RID_BMP_WRAP_CONTOUR_NONE); + m_xWrapLeftImg->set_from_icon_name(RID_BMP_WRAP_CONTOUR_LEFT); + m_xWrapRightImg->set_from_icon_name(RID_BMP_WRAP_CONTOUR_RIGHT); + m_xWrapParallelImg->set_from_icon_name(RID_BMP_WRAP_CONTOUR_PARALLEL); + m_xIdealWrapImg->set_from_icon_name(RID_BMP_WRAP_CONTOUR_IDEAL); } } |