summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-02-28 11:13:12 +0000
committerCaolán McNamara <caolanm@redhat.com>2020-03-24 11:00:50 +0100
commit5a2c0ab29719ac914d30d8789c0e386541702cbf (patch)
treea114088ae5b6d537de78db1745f9524e40baa714 /sc
parent70b9775af71b0e1a4b4d0760d2884631184db5ae (diff)
weld writer navigator
GtkToggleToolButton are much wider than vcl equivalents. Split the bottom toolbar into two toolbars. Rearrange their contents so the layout of each level visually match. Notes: Master documents have two modes, master content tree and the normal content tree. You can drag entries from the content tree into the document, drag mode drop down controls whether its a link or a copy etc that's dropped in. Documents can be dropped into the content and global trees. If outline tracking isn't active, then when content changes the tree is cleared and refilled, typically an effort is made to reselect the same entry that was previously selected. Additionally, if the amount of content didn't change an effort is made to scroll back to the location the scrollbar was at before the clear. Change-Id: I00c015145eac5b1acc3398d3c40861d830e4264a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89725 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/sidebar/AlignmentPropertyPanel.cxx8
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx4
-rw-r--r--sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx2
3 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index f5c8f7e4955b..25ad4f1a131b 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -58,13 +58,13 @@ AlignmentPropertyPanel::AlignmentPropertyPanel(
, mxCBStacked(m_xBuilder->weld_check_button("stacked"))
, mxTextOrientBox(m_xBuilder->weld_widget("textorientbox"))
, mxHorizontalAlign(m_xBuilder->weld_toolbar("horizontalalignment"))
- , mxHorizontalAlignDispatch(new ToolbarUnoDispatcher(*mxHorizontalAlign, rxFrame))
+ , mxHorizontalAlignDispatch(new ToolbarUnoDispatcher(*mxHorizontalAlign, *m_xBuilder, rxFrame))
, mxVertAlign(m_xBuilder->weld_toolbar("verticalalignment"))
- , mxVertAlignDispatch(new ToolbarUnoDispatcher(*mxVertAlign, rxFrame))
+ , mxVertAlignDispatch(new ToolbarUnoDispatcher(*mxVertAlign, *m_xBuilder, rxFrame))
, mxWriteDirection(m_xBuilder->weld_toolbar("writedirection"))
- , mxWriteDirectionDispatch(new ToolbarUnoDispatcher(*mxWriteDirection, rxFrame))
+ , mxWriteDirectionDispatch(new ToolbarUnoDispatcher(*mxWriteDirection, *m_xBuilder, rxFrame))
, mxIndentButtons(m_xBuilder->weld_toolbar("indentbuttons"))
- , mxIndentButtonsDispatch(new ToolbarUnoDispatcher(*mxIndentButtons, rxFrame))
+ , mxIndentButtonsDispatch(new ToolbarUnoDispatcher(*mxIndentButtons, *m_xBuilder, rxFrame))
, maAlignHorControl(SID_H_ALIGNCELL, *pBindings, *this)
, maLeftIndentControl(SID_ATTR_ALIGN_INDENT, *pBindings, *this)
, maMergeCellControl(FID_MERGE_TOGGLE, *pBindings, *this)
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index b7e04177dc1a..b3669f5ce786 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -51,10 +51,10 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel(
mxTBCellBorder(m_xBuilder->weld_toolbar("cellbordertype")),
mxTBCellBackground(m_xBuilder->weld_toolbar("cellbackgroundcolor")),
- mxBackColorDispatch(new ToolbarUnoDispatcher(*mxTBCellBackground, rxFrame)),
+ mxBackColorDispatch(new ToolbarUnoDispatcher(*mxTBCellBackground, *m_xBuilder, rxFrame)),
mxTBLineStyle(m_xBuilder->weld_toolbar("borderlinestyle")),
mxTBLineColor(m_xBuilder->weld_toolbar("borderlinecolor")),
- mxLineColorDispatch(new ToolbarUnoDispatcher(*mxTBLineColor, rxFrame)),
+ mxLineColorDispatch(new ToolbarUnoDispatcher(*mxTBLineColor, *m_xBuilder, rxFrame)),
mbCellBorderPopoverCreated(false),
mbLinePopoverCreated(false),
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index 653a6494c2b5..ec9e665287b2 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -37,7 +37,7 @@ NumberFormatPropertyPanel::NumberFormatPropertyPanel(
: PanelLayout(pParent,"NumberFormatPropertyPanel", "modules/scalc/ui/sidebarnumberformat.ui", rxFrame, true)
, mxLbCategory(m_xBuilder->weld_combo_box("category"))
, mxTBCategory(m_xBuilder->weld_toolbar("numberformat"))
- , mxCatagoryDispatch(new ToolbarUnoDispatcher(*mxTBCategory, rxFrame))
+ , mxCatagoryDispatch(new ToolbarUnoDispatcher(*mxTBCategory, *m_xBuilder, rxFrame))
, mxFtDecimals(m_xBuilder->weld_label("decimalplaceslabel"))
, mxEdDecimals(m_xBuilder->weld_spin_button("decimalplaces"))
, mxFtDenominator(m_xBuilder->weld_label("denominatorplaceslabel"))