[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
Caolán McNamara
caolanm at redhat.com
Wed Oct 5 12:27:48 UTC 2016
sc/UIConfig_scalc.mk | 1
sc/inc/sc.hrc | 7
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 8
sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc | 70 ----
sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx | 27 -
sc/source/ui/sidebar/CellAppearancePropertyPanel.src | 205 --------------
sc/source/ui/sidebar/CellBorderStyleControl.cxx | 225 +++++----------
sc/source/ui/sidebar/CellBorderStyleControl.hxx | 10
sc/source/ui/sidebar/CellLineStyleControl.cxx | 1
sc/uiconfig/scalc/ui/floatingborderstyle.ui | 271 +++++++++++++++++++
sc/uiconfig/scalc/ui/floatinglinestyle.ui | 1
11 files changed, 361 insertions(+), 465 deletions(-)
New commits:
commit 768e132ed82cbe73cb4ec0152a421db699f740f3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 5 13:24:49 2016 +0100
grab focus to border style popup
Change-Id: I8943f78721386efaeb5bc23fca612504e4c54431
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index ac57705..a2d798b 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -156,8 +156,7 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBo
{
if (!mxCellBorderStylePopup)
mxCellBorderStylePopup = VclPtr<CellBorderStylePopup>::Create(GetBindings()->GetDispatcher());
- mxCellBorderStylePopup->StartPopupMode(pToolBox, FloatWinPopupFlags::Down |
- FloatWinPopupFlags::NoAppFocusClose);
+ mxCellBorderStylePopup->StartPopupMode(pToolBox, FloatWinPopupFlags::GrabFocus);
}
}
commit 5227af2e4580e478eb92eaab8a42fc188c0fddbb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 5 12:39:08 2016 +0100
convert border style to .ui
and merge CellBorderStylePopup and CellBorderStyleControl
Change-Id: I96ca2784f2055e8d99380b4d4bcd1374c9c40f4e
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 41555ec..b8e8c9c5 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -125,6 +125,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/footerdialog \
sc/uiconfig/scalc/ui/formatcellsdialog \
sc/uiconfig/scalc/ui/formulacalculationoptions \
+ sc/uiconfig/scalc/ui/floatingborderstyle \
sc/uiconfig/scalc/ui/floatinglinestyle \
sc/uiconfig/scalc/ui/goalseekdlg \
sc/uiconfig/scalc/ui/groupdialog \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 048111c..693d1fe 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1088,12 +1088,9 @@
#define RID_SCDLG_COND_FORMAT_MANAGER (SC_DIALOGS_START + 159)
-// defines for CellAppearancePropertyPanel
-#define RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE (SC_DIALOGS_START + 163)
+#define WID_CONDFRMT_REF (SC_DIALOGS_START + 163)
-#define WID_CONDFRMT_REF (SC_DIALOGS_START + 164)
-
-#define SC_DIALOGS_END (RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE + 1)
+#define SC_DIALOGS_END (WID_CONDFRMT_REF + 1)
#ifndef STD_MASKCOLOR
#define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index 0915add..ac57705 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -21,7 +21,6 @@
#include <sfx2/sidebar/Theme.hxx>
#include <sfx2/sidebar/ControlFactory.hxx>
#include "CellAppearancePropertyPanel.hxx"
-#include <CellAppearancePropertyPanel.hrc>
#include "sc.hrc"
#include "scresid.hxx"
#include <sfx2/bindings.hxx>
@@ -91,10 +90,8 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel(
mbInnerBorder(false),
mbTLBR(false),
mbBLTR(false),
-
mxCellLineStylePopup(),
mxCellBorderStylePopup(),
-
maContext(),
mpBindings(pBindings)
{
@@ -158,7 +155,7 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBo
if (aCommand == UNO_SETBORDERSTYLE)
{
if (!mxCellBorderStylePopup)
- mxCellBorderStylePopup = VclPtr<CellBorderStylePopup>::Create(pToolBox, GetBindings()->GetDispatcher());
+ mxCellBorderStylePopup = VclPtr<CellBorderStylePopup>::Create(GetBindings()->GetDispatcher());
mxCellBorderStylePopup->StartPopupMode(pToolBox, FloatWinPopupFlags::Down |
FloatWinPopupFlags::NoAppFocusClose);
}
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc
deleted file mode 100644
index aece513..0000000
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-//line border page
-#define TB_BORDER1 1
-#define TB_BORDER2 2
-#define TB_BORDER3 3
-
-#define TBI_BORDER1_NONE 7
-#define TBI_BORDER1_ALL 8
-#define TBI_BORDER1_OUTER 9
-#define TBI_BORDER1_OUTERBOLD 10
-#define TBI_BORDER2_LEFT 11
-#define TBI_BORDER2_RIGHT 12
-#define TBI_BORDER2_TOP 13
-#define TBI_BORDER2_BOT 14
-#define TBI_BORDER2_BLTR 15
-#define TBI_BORDER2_TLBR 16
-#define TBI_BORDER2_TOPBOT 17
-#define TBI_BORDER2_LEFTRIGHT 18
-#define TBI_BORDER3_S1 19
-#define TBI_BORDER3_S2 20
-#define TBI_BORDER3_S3 21
-#define TBI_BORDER3_S4 22
-#define FL_1 23
-#define FL_2 24
-
-#define IMG_BORDER1 25
-#define IMG_BORDER2 26
-#define IMG_BORDER3 27
-#define IMG_BORDER4 28
-#define IMG_BORDER5 29
-#define IMG_BORDER6 30
-#define IMG_BORDER7 31
-#define IMG_BORDER8 32
-#define IMG_BORDER9 33
-#define IMG_BORDER10 34
-#define IMG_BORDER11 35
-#define IMG_BORDER12 36
-#define IMG_BORDER13 37
-#define IMG_BORDER14 38
-#define IMG_BORDER15 39
-#define IMG_BORDER16 40
-
-#define STR_BORDER_1 41
-#define STR_BORDER_2 42
-#define STR_BORDER_3 43
-#define STR_BORDER_4 44
-#define STR_BORDER_5 45
-#define STR_BORDER_6 46
-#define STR_BORDER_7 47
-#define STR_BORDER_8 48
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
index 612a059..fe1afaa 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
@@ -23,39 +23,16 @@
#include <sfx2/sidebar/IContextChangeReceiver.hxx>
#include <svx/sidebar/PanelLayout.hxx>
#include <vcl/floatwin.hxx>
-#include "CellBorderStyleControl.hxx"
#include <memory>
-class FixedText;
namespace sc { namespace sidebar {
class CellBorderUpdater;
}}
class ToolBox;
-class CheckBox;
namespace sc { namespace sidebar {
-class CellBorderStylePopup : public FloatingWindow
-{
- VclPtr<Control> m_xControl;
-public:
- CellBorderStylePopup(vcl::Window* pParent, SfxDispatcher* pDispatcher)
- : FloatingWindow(pParent, WB_BORDER | WB_SYSTEMWINDOW)
- , m_xControl(VclPtr<CellBorderStyleControl>::Create(this, pDispatcher))
- {
- SetSizePixel(m_xControl->GetOutputSizePixel());
- }
- virtual ~CellBorderStylePopup() override
- {
- disposeOnce();
- }
- virtual void dispose() override
- {
- m_xControl.disposeAndClear();
- FloatingWindow::dispose();
- }
-};
-
+class CellBorderStylePopup;
class CellLineStylePopup;
class CellAppearancePropertyPanel
@@ -65,7 +42,7 @@ class CellAppearancePropertyPanel
{
private:
friend class CellLineStylePopup;
- friend class CellBorderStyleControl;
+ friend class CellBorderStylePopup;
public:
static VclPtr<vcl::Window> Create(
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
index 7682c1a..f1be009 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
@@ -16,14 +16,10 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "CellAppearancePropertyPanel.hrc"
-#include <sfx2/sidebar/ResourceDefinitions.hrc>
+
#include "sc.hrc"
#include "helpids.h"
-#define TOOLBOX_BORDER_WIDTH 107
-#define POPUPPANEL_MARGIN_SMALL_PIXEL 8
-
Image IMG_CELL_BORDER
{
ImageBitmap = Bitmap{File = "sidebar/CellBorder.png";};
@@ -67,203 +63,4 @@ Image IMG_LINE_STYLE9
// cell border style popup
-Control RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE
-{
- OutputSize = TRUE;
- DialogControl = TRUE;
- Border = FALSE;
-
- //This is broken with the auto-doubled hidpi bitmaps
- Size = MAP_PIXEL( POPUPPANEL_MARGIN_SMALL_PIXEL * 2 + 108, POPUPPANEL_MARGIN_SMALL_PIXEL * 2 + 138);
-
- ToolBox TB_BORDER1
- {
- SVLook = TRUE ;
- Pos = MAP_PIXEL(POPUPPANEL_MARGIN_SMALL_PIXEL, POPUPPANEL_MARGIN_SMALL_PIXEL); //MAP_APPFONT (POPUPPANEL_MARGIN_SMALL + OFFSET_X + 1, POPUPPANEL_MARGIN_SMALL + OFFSET_Y + 1) ;
- Size = MAP_PIXEL(TOOLBOX_BORDER_WIDTH, 31); //MAP_APPFONT (TOOLBOX_BORDER_WIDTH ,20) ;
- TabStop = TRUE ;
- HelpID = HID_PROPERTYPANEL_SC_BORDER1_TBX;
- Text [ en-US ] = "Cell Border 1";
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = TBI_BORDER1_NONE ;
- HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_NONE;
- Text [ en-US ] = "No Border" ;
- };
- ToolBoxItem
- {
- Identifier = TBI_BORDER1_ALL ;
- HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_ALL;
- Text [ en-US ] = "All Borders" ;
- };
- ToolBoxItem
- {
- Identifier = TBI_BORDER1_OUTER ;
- HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_OUTER;
- Text [ en-US ] = "Outside Borders" ;
- };
- ToolBoxItem
- {
- Identifier = TBI_BORDER1_OUTERBOLD ;
- HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_OUTERBOLD;
- Text [ en-US ] = "Thick Box Border" ;
- };
- };
- };
- FixedLine FL_1
- {
- Pos = MAP_PIXEL(POPUPPANEL_MARGIN_SMALL_PIXEL, POPUPPANEL_MARGIN_SMALL_PIXEL + 31); //MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X + 1 , POPUPPANEL_MARGIN_SMALL + OFFSET_Y + 20 + 1) ;
- Size = MAP_PIXEL(TOOLBOX_BORDER_WIDTH, 8); // MAP_APPFONT ( TOOLBOX_BORDER_WIDTH , 5 ) ;
- };
- ToolBox TB_BORDER2
- {
- SVLook = TRUE ;
- Pos = MAP_PIXEL(POPUPPANEL_MARGIN_SMALL_PIXEL, POPUPPANEL_MARGIN_SMALL_PIXEL + 31 + 8); // MAP_APPFONT (POPUPPANEL_MARGIN_SMALL + OFFSET_X + 1, POPUPPANEL_MARGIN_SMALL + OFFSET_Y + 20 + 5 + 1) ;
- Size = MAP_PIXEL (TOOLBOX_BORDER_WIDTH ,61) ;
- TabStop = TRUE ;
- HelpID = HID_PROPERTYPANEL_SC_BORDER2_TBX;
- Text [ en-US ] = "Cell Border 2";
- };
- FixedLine FL_2
- {
- Pos = MAP_PIXEL(POPUPPANEL_MARGIN_SMALL_PIXEL, POPUPPANEL_MARGIN_SMALL_PIXEL + 31 + 8 + 61); // MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X + 1 , POPUPPANEL_MARGIN_SMALL + OFFSET_Y + 20 + 38 + 5 + 1) ;
- Size = MAP_PIXEL ( TOOLBOX_BORDER_WIDTH , 8 ) ;
- };
- ToolBox TB_BORDER3
- {
- SVLook = TRUE ;
- Pos = MAP_PIXEL(POPUPPANEL_MARGIN_SMALL_PIXEL, POPUPPANEL_MARGIN_SMALL_PIXEL + 31 +8 + 61 + 8); // MAP_APPFONT (POPUPPANEL_MARGIN_SMALL + OFFSET_X + 1, POPUPPANEL_MARGIN_SMALL + OFFSET_Y + 20 + 38 + 10 + 1) ;
- Size = MAP_PIXEL (TOOLBOX_BORDER_WIDTH ,31) ;
- TabStop = TRUE ;
- HelpID = HID_PROPERTYPANEL_SC_BORDER3_TBX;
- Text [ en-US ] = "Cell Border 3";
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = TBI_BORDER3_S1;
- HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_S1;
- Text [ en-US ] = "Thick Bottom Border" ;
- };
- ToolBoxItem
- {
- Identifier = TBI_BORDER3_S2 ;
- HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_S2;
- Text [ en-US ] = "Double Bottom Border" ;
- };
- ToolBoxItem
- {
- Identifier = TBI_BORDER3_S3 ;
- HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_S3;
- Text [ en-US ] = "Top and Thick Bottom Borders" ;
- };
- ToolBoxItem
- {
- Identifier = TBI_BORDER3_S4 ;
- HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_S4;
- Text [ en-US ] = "Top and Double Bottom Borders" ;
- };
- };
- };
-
- Image IMG_BORDER1
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorder_Empty_18x18.png";};
- };
- Image IMG_BORDER2
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorder_All_18x18.png";};
- };
- Image IMG_BORDER3
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorder_FourBorders_18x18.png";};
- };
- Image IMG_BORDER4
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorder_FourBorders_Thick_18x18.png";};
- };
- Image IMG_BORDER5
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorder_Left_18x18.png";};
- };
- Image IMG_BORDER6
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorder_Right_18x18.png";};
- };
- Image IMG_BORDER7
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorder_Top_18x18.png";};
- };
- Image IMG_BORDER8
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorder_Bottom_18x18.png";};
- };
- Image IMG_BORDER9
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorder_RightDiagonal_18x18.png";};
- };
- Image IMG_BORDER10
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorder_LeftDiagonal_18x18.png";};
- };
- Image IMG_BORDER11
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorder_TopAndBottom_18x18.png";};
- };
- Image IMG_BORDER12
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorder_LeftAndRight_18x18.png";};
- };
- Image IMG_BORDER13
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorder_Bottom_Thick_18x18.png";};
- };
- Image IMG_BORDER14
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorder_Bottom_Double_18x18.png";};
- };
- Image IMG_BORDER15
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorder_TopThin_BottomThick_18x18.png";};
- };
- Image IMG_BORDER16
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorder_TopSingle_BottomDouble_18x18.png";};
- };
- String STR_BORDER_1
- {
- Text [ en-US ] = "Left Border";
- };
- String STR_BORDER_2
- {
- Text [ en-US ] = "Right Border";
- };
- String STR_BORDER_3
- {
- Text [ en-US ] = "Top Border";
- };
- String STR_BORDER_4
- {
- Text [ en-US ] = "Bottom Border";
- };
- String STR_BORDER_5
- {
- Text [ en-US ] = "Diagonal Up Border";
- };
- String STR_BORDER_6
- {
- Text [ en-US ] = "Diagonal Down Border";
- };
- String STR_BORDER_7
- {
- Text [ en-US ] = "Top and Bottom Borders";
- };
- String STR_BORDER_8
- {
- Text [ en-US ] = "Left and Right Borders";
- };
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
index 6e0409a..8c554f4 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -20,7 +20,6 @@
#include "CellBorderStyleControl.hxx"
#include "sc.hrc"
#include "scresid.hxx"
-#include <CellAppearancePropertyPanel.hrc>
#include <editeng/boxitem.hxx>
#include <editeng/borderline.hxx>
#include "CellAppearancePropertyPanel.hxx"
@@ -42,112 +41,41 @@ namespace sc { namespace sidebar {
#define FRM_VALID_OUTER 0x0f
#define FRM_VALID_ALL 0xff
-CellBorderStyleControl::CellBorderStyleControl(FloatingWindow* pParent, SfxDispatcher* pDispatcher)
-: Control(pParent, ScResId(RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE)),
- mpDispatcher(pDispatcher),
- mxFloatParent(pParent),
- maTBBorder1(VclPtr<ToolBox>::Create(this, ScResId(TB_BORDER1))),
- maTBBorder2(VclPtr<ToolBox>::Create(this, ScResId(TB_BORDER2))),
- maTBBorder3(VclPtr<ToolBox>::Create(this, ScResId(TB_BORDER3))),
- maFL1(VclPtr<FixedLine>::Create(this, ScResId(FL_1))),
- maFL2(VclPtr<FixedLine>::Create(this, ScResId(FL_2))),
- mpImageList(nullptr)
+CellBorderStylePopup::CellBorderStylePopup(SfxDispatcher* pDispatcher)
+ : FloatingWindow(SfxGetpApp()->GetTopWindow(), "FloatingBorderStyle", "modules/scalc/ui/floatingborderstyle.ui")
+ , mpDispatcher(pDispatcher)
{
+ get(maTBBorder1, "border1");
+ get(maTBBorder2, "border2");
+ get(maTBBorder3, "border3");
Initialize();
- FreeResource();
}
-CellBorderStyleControl::~CellBorderStyleControl()
+CellBorderStylePopup::~CellBorderStylePopup()
{
disposeOnce();
}
-void CellBorderStyleControl::dispose()
+void CellBorderStylePopup::dispose()
{
- delete[] mpImageList;
- maTBBorder1.disposeAndClear();
- maTBBorder2.disposeAndClear();
- maTBBorder3.disposeAndClear();
- maFL1.disposeAndClear();
- maFL2.disposeAndClear();
- mxFloatParent.clear();
- Control::dispose();
+ maTBBorder1.clear();
+ maTBBorder2.clear();
+ maTBBorder3.clear();
+ FloatingWindow::dispose();
}
-void CellBorderStyleControl::Initialize()
+void CellBorderStylePopup::Initialize()
{
- mpImageList = new Image[16];
- mpImageList[0] = Image(ScResId(IMG_BORDER1));
- mpImageList[1] = Image(ScResId(IMG_BORDER2));
- mpImageList[2] = Image(ScResId(IMG_BORDER3));
- mpImageList[3] = Image(ScResId(IMG_BORDER4));
- mpImageList[4] = Image(ScResId(IMG_BORDER5));
- mpImageList[5] = Image(ScResId(IMG_BORDER6));
- mpImageList[6] = Image(ScResId(IMG_BORDER7));
- mpImageList[7] = Image(ScResId(IMG_BORDER8));
- mpImageList[8] = Image(ScResId(IMG_BORDER9));
- mpImageList[9] = Image(ScResId(IMG_BORDER10));
- mpImageList[10] = Image(ScResId(IMG_BORDER11));
- mpImageList[11] = Image(ScResId(IMG_BORDER12));
- mpImageList[12] = Image(ScResId(IMG_BORDER13));
- mpImageList[13] = Image(ScResId(IMG_BORDER14));
- mpImageList[14] = Image(ScResId(IMG_BORDER15));
- mpImageList[15] = Image(ScResId(IMG_BORDER16));
-
- maTBBorder1->SetItemImage(TBI_BORDER1_NONE, mpImageList[0]);
- maTBBorder1->SetItemImage(TBI_BORDER1_ALL, mpImageList[1]);
- maTBBorder1->SetItemImage(TBI_BORDER1_OUTER, mpImageList[2]);
- maTBBorder1->SetItemImage(TBI_BORDER1_OUTERBOLD, mpImageList[3]);
- maTBBorder1->SetBackground(Wallpaper());
- maTBBorder1->SetPaintTransparent(true);
- Size aTbxSize( maTBBorder1->CalcWindowSizePixel() );
- maTBBorder1->SetOutputSizePixel( aTbxSize );
- maTBBorder1->SetSelectHdl ( LINK(this, CellBorderStyleControl, TB1SelectHdl) );
+ maTBBorder1->SetSelectHdl ( LINK(this, CellBorderStylePopup, TB1SelectHdl) );
maTBBorder2->SetLineCount(2);
- maTBBorder2->InsertItem(TBI_BORDER2_LEFT, mpImageList[4]);
- maTBBorder2->InsertItem(TBI_BORDER2_RIGHT, mpImageList[5]);
- maTBBorder2->InsertItem(TBI_BORDER2_TOP, mpImageList[6]);
- maTBBorder2->InsertItem(TBI_BORDER2_BOT, mpImageList[7]);
- maTBBorder2->InsertBreak();
- maTBBorder2->InsertItem(TBI_BORDER2_BLTR, mpImageList[8]);
- maTBBorder2->InsertItem(TBI_BORDER2_TLBR, mpImageList[9]);
- maTBBorder2->InsertItem(TBI_BORDER2_TOPBOT, mpImageList[10]);
- maTBBorder2->InsertItem(TBI_BORDER2_LEFTRIGHT, mpImageList[11]);
- maTBBorder2->SetBackground(Wallpaper());
- maTBBorder2->SetPaintTransparent(true);
- aTbxSize = maTBBorder2->CalcWindowSizePixel() ;
- maTBBorder2->SetOutputSizePixel( aTbxSize );
- maTBBorder2->SetHelpId(TBI_BORDER2_LEFT, HID_PROPERTYPANEL_SC_BORDER_TBI_LEFT);
- maTBBorder2->SetHelpId(TBI_BORDER2_RIGHT, HID_PROPERTYPANEL_SC_BORDER_TBI_RIGHT);
- maTBBorder2->SetHelpId(TBI_BORDER2_TOP, HID_PROPERTYPANEL_SC_BORDER_TBI_TOP);
- maTBBorder2->SetHelpId(TBI_BORDER2_BOT, HID_PROPERTYPANEL_SC_BORDER_TBI_BOT);
- maTBBorder2->SetHelpId(TBI_BORDER2_BLTR, HID_PROPERTYPANEL_SC_BORDER_TBI_BLTR);
- maTBBorder2->SetHelpId(TBI_BORDER2_TLBR, HID_PROPERTYPANEL_SC_BORDER_TBI_TLBR);
- maTBBorder2->SetHelpId(TBI_BORDER2_TOPBOT, HID_PROPERTYPANEL_SC_BORDER_TBI_TOPBOT);
- maTBBorder2->SetHelpId(TBI_BORDER2_LEFTRIGHT, HID_PROPERTYPANEL_SC_BORDER_TBI_LEFTRIGHT);
- maTBBorder2->SetItemText(TBI_BORDER2_LEFT, ScResId(STR_BORDER_1));
- maTBBorder2->SetItemText(TBI_BORDER2_RIGHT, ScResId(STR_BORDER_2));
- maTBBorder2->SetItemText(TBI_BORDER2_TOP, ScResId(STR_BORDER_3));
- maTBBorder2->SetItemText(TBI_BORDER2_BOT, ScResId(STR_BORDER_4));
- maTBBorder2->SetItemText(TBI_BORDER2_BLTR, ScResId(STR_BORDER_5));
- maTBBorder2->SetItemText(TBI_BORDER2_TLBR, ScResId(STR_BORDER_6));
- maTBBorder2->SetItemText(TBI_BORDER2_TOPBOT, ScResId(STR_BORDER_7));
- maTBBorder2->SetItemText(TBI_BORDER2_LEFTRIGHT, ScResId(STR_BORDER_8));
- maTBBorder2->SetSelectHdl ( LINK(this, CellBorderStyleControl, TB2SelectHdl) );
+ maTBBorder2->InsertBreak(4);
+ maTBBorder2->SetSelectHdl ( LINK(this, CellBorderStylePopup, TB2SelectHdl) );
- maTBBorder3->SetItemImage(TBI_BORDER3_S1, mpImageList[12]);
- maTBBorder3->SetItemImage(TBI_BORDER3_S2, mpImageList[13]);
- maTBBorder3->SetItemImage(TBI_BORDER3_S3, mpImageList[14]);
- maTBBorder3->SetItemImage(TBI_BORDER3_S4, mpImageList[15]);
- maTBBorder3->SetBackground(Wallpaper());
- maTBBorder3->SetPaintTransparent(true);
- aTbxSize = maTBBorder3->CalcWindowSizePixel() ;
- maTBBorder3->SetOutputSizePixel( aTbxSize );
- maTBBorder3->SetSelectHdl ( LINK(this, CellBorderStyleControl, TB3SelectHdl) );
+ maTBBorder3->SetSelectHdl ( LINK(this, CellBorderStylePopup, TB3SelectHdl) );
}
-IMPL_LINK(CellBorderStyleControl, TB1SelectHdl, ToolBox*, pToolBox, void)
+IMPL_LINK(CellBorderStylePopup, TB1SelectHdl, ToolBox*, pToolBox, void)
{
sal_uInt16 nId = pToolBox->GetCurItemId();
SvxBoxItem aBorderOuter( SID_ATTR_BORDER_OUTER );
@@ -155,11 +83,10 @@ IMPL_LINK(CellBorderStyleControl, TB1SelectHdl, ToolBox*, pToolBox, void)
editeng::SvxBorderLine theDefLine(nullptr, 1);
editeng::SvxBorderLine *pLeft = nullptr, *pRight = nullptr, *pTop = nullptr, *pBottom = nullptr;
sal_uInt8 nValidFlags = 0;
- switch ( nId )
+
+ if (nId == maTBBorder1->GetItemId("none"))
{
- case TBI_BORDER1_NONE:
- {
- nValidFlags |= FRM_VALID_ALL;
+ nValidFlags |= FRM_VALID_ALL;
SvxLineItem aLineItem1( SID_ATTR_BORDER_DIAG_BLTR );
SvxLineItem aLineItem2( SID_ATTR_BORDER_DIAG_TLBR );
aLineItem1.SetLine( nullptr ); //modify
@@ -168,23 +95,24 @@ IMPL_LINK(CellBorderStyleControl, TB1SelectHdl, ToolBox*, pToolBox, void)
SID_ATTR_BORDER_DIAG_BLTR, SfxCallMode::RECORD, { &aLineItem1 });
mpDispatcher->ExecuteList(
SID_ATTR_BORDER_DIAG_TLBR, SfxCallMode::RECORD, { &aLineItem2 });
- }
- break;
- case TBI_BORDER1_ALL:
+ }
+ else if (nId == maTBBorder1->GetItemId("all"))
+ {
pLeft = pRight = pTop = pBottom = &theDefLine;
aBorderInner.SetLine( &theDefLine, SvxBoxInfoItemLine::HORI );
aBorderInner.SetLine( &theDefLine, SvxBoxInfoItemLine::VERT );
nValidFlags |= FRM_VALID_ALL;
- break;
- case TBI_BORDER1_OUTER:
+ }
+ else if (nId == maTBBorder1->GetItemId("outside"))
+ {
pLeft = pRight = pTop = pBottom = &theDefLine;
nValidFlags |= FRM_VALID_OUTER;
- break;
- case TBI_BORDER1_OUTERBOLD:
+ }
+ else if (nId == maTBBorder1->GetItemId("thickbox"))
+ {
theDefLine.SetWidth(DEF_LINE_WIDTH_2);
pLeft = pRight = pTop = pBottom = &theDefLine;
nValidFlags |= FRM_VALID_OUTER;
- break;
}
aBorderOuter.SetLine( pLeft, SvxBoxItemLine::LEFT );
@@ -203,14 +131,30 @@ IMPL_LINK(CellBorderStyleControl, TB1SelectHdl, ToolBox*, pToolBox, void)
mpDispatcher->ExecuteList(
SID_ATTR_BORDER, SfxCallMode::RECORD, { &aBorderOuter, &aBorderInner });
- mxFloatParent->EndPopupMode();
+ EndPopupMode();
}
-IMPL_LINK(CellBorderStyleControl, TB2SelectHdl, ToolBox *, pToolBox, void)
+IMPL_LINK(CellBorderStylePopup, TB2SelectHdl, ToolBox *, pToolBox, void)
{
sal_uInt16 nId = pToolBox->GetCurItemId();
- if( nId != TBI_BORDER2_BLTR && nId != TBI_BORDER2_TLBR )
+ if (nId == pToolBox->GetItemId("diagup"))
+ {
+ editeng::SvxBorderLine aTmp( nullptr, 1 );
+ SvxLineItem aLineItem( SID_ATTR_BORDER_DIAG_BLTR );
+ aLineItem.SetLine( &aTmp );
+ mpDispatcher->ExecuteList(
+ SID_ATTR_BORDER_DIAG_BLTR, SfxCallMode::RECORD, { &aLineItem });
+ }
+ else if (nId == pToolBox->GetItemId("diagdown"))
+ {
+ editeng::SvxBorderLine aTmp( nullptr, 1 );
+ SvxLineItem aLineItem( SID_ATTR_BORDER_DIAG_TLBR );
+ aLineItem.SetLine( &aTmp );
+ mpDispatcher->ExecuteList(
+ SID_ATTR_BORDER_DIAG_TLBR, SfxCallMode::RECORD, { &aLineItem });
+ }
+ else
{
SvxBoxItem aBorderOuter( SID_ATTR_BORDER_OUTER );
SvxBoxInfoItem aBorderInner( SID_ATTR_BORDER_INNER );
@@ -220,14 +164,13 @@ IMPL_LINK(CellBorderStyleControl, TB2SelectHdl, ToolBox *, pToolBox, void)
*pTop = nullptr,
*pBottom = nullptr;
sal_uInt8 nValidFlags = 0;
- switch ( nId )
+ if (nId == pToolBox->GetItemId("left"))
{
- case TBI_BORDER2_LEFT:
pLeft = &theDefLine;
nValidFlags |= FRM_VALID_LEFT;
- break;
- case TBI_BORDER2_RIGHT:
-
+ }
+ else if (nId == pToolBox->GetItemId("right"))
+ {
if(!AllSettings::GetLayoutRTL())
{
pRight = &theDefLine;
@@ -238,23 +181,26 @@ IMPL_LINK(CellBorderStyleControl, TB2SelectHdl, ToolBox *, pToolBox, void)
pLeft = &theDefLine;
nValidFlags |= FRM_VALID_LEFT;
}
- break;
- case TBI_BORDER2_TOP:
+ }
+ else if (nId == pToolBox->GetItemId("top"))
+ {
pTop = &theDefLine;
nValidFlags |= FRM_VALID_TOP;
- break;
- case TBI_BORDER2_BOT:
+ }
+ else if (nId == pToolBox->GetItemId("bottom"))
+ {
pBottom = &theDefLine;
nValidFlags |= FRM_VALID_BOTTOM;
- break;
- case TBI_BORDER2_TOPBOT:
+ }
+ else if (nId == pToolBox->GetItemId("topbottom"))
+ {
pTop = pBottom = &theDefLine;
nValidFlags |= FRM_VALID_BOTTOM|FRM_VALID_TOP;
- break;
- case TBI_BORDER2_LEFTRIGHT:
+ }
+ else if (nId == pToolBox->GetItemId("leftright"))
+ {
pLeft = pRight = &theDefLine;
nValidFlags |= FRM_VALID_RIGHT|FRM_VALID_LEFT;
- break;
}
aBorderOuter.SetLine( pLeft, SvxBoxItemLine::LEFT );
aBorderOuter.SetLine( pRight, SvxBoxItemLine::RIGHT );
@@ -273,27 +219,11 @@ IMPL_LINK(CellBorderStyleControl, TB2SelectHdl, ToolBox *, pToolBox, void)
mpDispatcher->ExecuteList(
SID_ATTR_BORDER, SfxCallMode::RECORD, { &aBorderOuter, &aBorderInner});
}
- else if(nId == TBI_BORDER2_BLTR)
- {
- editeng::SvxBorderLine aTmp( nullptr, 1 );
- SvxLineItem aLineItem( SID_ATTR_BORDER_DIAG_BLTR );
- aLineItem.SetLine( &aTmp );
- mpDispatcher->ExecuteList(
- SID_ATTR_BORDER_DIAG_BLTR, SfxCallMode::RECORD, { &aLineItem });
- }
- else if(nId == TBI_BORDER2_TLBR)
- {
- editeng::SvxBorderLine aTmp( nullptr, 1 );
- SvxLineItem aLineItem( SID_ATTR_BORDER_DIAG_TLBR );
- aLineItem.SetLine( &aTmp );
- mpDispatcher->ExecuteList(
- SID_ATTR_BORDER_DIAG_TLBR, SfxCallMode::RECORD, { &aLineItem });
- }
- mxFloatParent->EndPopupMode();
+ EndPopupMode();
}
-IMPL_LINK(CellBorderStyleControl, TB3SelectHdl, ToolBox *, pToolBox, void)
+IMPL_LINK(CellBorderStylePopup, TB3SelectHdl, ToolBox *, pToolBox, void)
{
sal_uInt16 nId = pToolBox->GetCurItemId();
@@ -306,28 +236,29 @@ IMPL_LINK(CellBorderStyleControl, TB3SelectHdl, ToolBox *, pToolBox, void)
//FIXME: properly adapt to new line border model
- switch ( nId )
+ if (nId == maTBBorder3->GetItemId("thickbottom"))
{
- case TBI_BORDER3_S1:
pBottom.reset(new editeng::SvxBorderLine(nullptr, DEF_LINE_WIDTH_2 ));
nValidFlags |= FRM_VALID_BOTTOM;
- break;
- case TBI_BORDER3_S2:
+ }
+ else if (nId == maTBBorder3->GetItemId("doublebottom"))
+ {
pBottom.reset(new editeng::SvxBorderLine(nullptr));
pBottom->GuessLinesWidths(DOUBLE, DEF_LINE_WIDTH_0, DEF_LINE_WIDTH_0, DEF_LINE_WIDTH_1);
nValidFlags |= FRM_VALID_BOTTOM;
- break;
- case TBI_BORDER3_S3:
+ }
+ else if (nId == maTBBorder3->GetItemId("topthickbottom"))
+ {
pBottom.reset(new editeng::SvxBorderLine(nullptr, DEF_LINE_WIDTH_2 ));
pTop.reset(new editeng::SvxBorderLine(nullptr, 1));
nValidFlags |= FRM_VALID_BOTTOM|FRM_VALID_TOP;
- break;
- case TBI_BORDER3_S4:
+ }
+ else if (nId == maTBBorder3->GetItemId("topdoublebottom"))
+ {
pBottom.reset(new editeng::SvxBorderLine(nullptr));
pBottom->GuessLinesWidths(DOUBLE, DEF_LINE_WIDTH_0, DEF_LINE_WIDTH_0, DEF_LINE_WIDTH_1);
pTop.reset(new editeng::SvxBorderLine(nullptr, 1));
nValidFlags |= FRM_VALID_BOTTOM|FRM_VALID_TOP;
- break;
}
aBorderOuter.SetLine( pTop.get(), SvxBoxItemLine::TOP );
@@ -350,7 +281,7 @@ IMPL_LINK(CellBorderStyleControl, TB3SelectHdl, ToolBox *, pToolBox, void)
pTop.reset();
pBottom.reset();
- mxFloatParent->EndPopupMode();
+ EndPopupMode();
}
} } // end of namespace svx::sidebar
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.hxx b/sc/source/ui/sidebar/CellBorderStyleControl.hxx
index ea8c761..28c5c16 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.hxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.hxx
@@ -28,17 +28,13 @@ class SfxDispatcher;
namespace sc { namespace sidebar {
-class CellBorderStyleControl : public Control
+class CellBorderStylePopup : public FloatingWindow
{
private:
SfxDispatcher* mpDispatcher;
- VclPtr<FloatingWindow> mxFloatParent;
VclPtr<ToolBox> maTBBorder1;
VclPtr<ToolBox> maTBBorder2;
VclPtr<ToolBox> maTBBorder3;
- VclPtr<FixedLine> maFL1;
- VclPtr<FixedLine> maFL2;
- Image* mpImageList;
void Initialize();
@@ -47,8 +43,8 @@ private:
DECL_LINK(TB3SelectHdl, ToolBox *, void);
public:
- CellBorderStyleControl(FloatingWindow* pParent, SfxDispatcher* pDispatcher);
- virtual ~CellBorderStyleControl() override;
+ CellBorderStylePopup(SfxDispatcher* pDispatcher);
+ virtual ~CellBorderStylePopup() override;
virtual void dispose() override;
};
diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx
index 7f49749..66abe88 100644
--- a/sc/source/ui/sidebar/CellLineStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx
@@ -20,7 +20,6 @@
#include "CellLineStyleControl.hxx"
#include "sc.hrc"
#include "scresid.hxx"
-#include <CellAppearancePropertyPanel.hrc>
#include "CellLineStyleValueSet.hxx"
#include <vcl/i18nhelp.hxx>
#include <vcl/settings.hxx>
diff --git a/sc/uiconfig/scalc/ui/floatingborderstyle.ui b/sc/uiconfig/scalc/ui/floatingborderstyle.ui
new file mode 100644
index 0000000..e397aaf
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/floatingborderstyle.ui
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface>
+ <requires lib="gtk+" version="3.0"/>
+ <object class="GtkWindow" id="FloatingBorderStyle">
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="border_width">4</property>
+ <property name="resizable">False</property>
+ <property name="destroy_with_parent">True</property>
+ <property name="type_hint">popup-menu</property>
+ <property name="skip_pager_hint">True</property>
+ <property name="deletable">False</property>
+ <child>
+ <object class="GtkGrid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkToolbar" id="border1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">icons</property>
+ <child>
+ <object class="GtkToolButton" id="none">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">No Border</property>
+ <property name="action_name">none</property>
+ <property name="icon_name">sc/res/sidebar/CellBorder_Empty_18x18.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="all">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">All Borders</property>
+ <property name="action_name">all</property>
+ <property name="icon_name">sc/res/sidebar/CellBorder_All_18x18.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="outside">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Outside Borders</property>
+ <property name="action_name">outside</property>
+ <property name="icon_name">sc/res/sidebar/CellBorder_FourBorders_18x18.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="thickbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Thick Box Border</property>
+ <property name="action_name">thickbox</property>
+ <property name="icon_name">sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolbar" id="border3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">icons</property>
+ <child>
+ <object class="GtkToolButton" id="thickbottom">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Thick Bottom Border</property>
+ <property name="action_name">thickbottom</property>
+ <property name="icon_name">sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="doublebottom">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Double Bottom Border</property>
+ <property name="action_name">doublebottom</property>
+ <property name="icon_name">sc/res/sidebar/CellBorder_Bottom_Double_18x18.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="topthickbottom">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Top and Thick Bottom Borders</property>
+ <property name="action_name">topthickbottom</property>
+ <property name="icon_name">sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="topdoublebottom">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Top and Double Bottom Borders</property>
+ <property name="action_name">topdoublebottom</property>
+ <property name="icon_name">sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolbar" id="border2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">icons</property>
+ <child>
+ <object class="GtkToolButton" id="left">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Left Border</property>
+ <property name="action_name">left</property>
+ <property name="icon_name">sc/res/sidebar/CellBorder_Left_18x18.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="right">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Right Border</property>
+ <property name="action_name">right</property>
+ <property name="icon_name">sc/res/sidebar/CellBorder_Right_18x18.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="top">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Top Border</property>
+ <property name="action_name">top</property>
+ <property name="icon_name">sc/res/sidebar/CellBorder_Top_18x18.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="bottom">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Bottom Border</property>
+ <property name="action_name">bottom</property>
+ <property name="icon_name">sc/res/sidebar/CellBorder_Bottom_18x18.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="diagup">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Diagonal Up Border</property>
+ <property name="action_name">diagup</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">sc/res/sidebar/CellBorder_RightDiagonal_18x18.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="diagdown">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Diagonal Down Border</property>
+ <property name="action_name">diagdown</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="topbottom">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Top and Bottom Borders</property>
+ <property name="action_name">topbottom</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">sc/res/sidebar/CellBorder_TopAndBottom_18x18.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="leftright">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Left and Right Borders</property>
+ <property name="action_name">leftright</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">sc/res/sidebar/CellBorder_LeftAndRight_18x18.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+</interface>
diff --git a/sc/uiconfig/scalc/ui/floatinglinestyle.ui b/sc/uiconfig/scalc/ui/floatinglinestyle.ui
index a85c56a..d6c6f0b 100644
--- a/sc/uiconfig/scalc/ui/floatinglinestyle.ui
+++ b/sc/uiconfig/scalc/ui/floatinglinestyle.ui
@@ -19,6 +19,7 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
+ <property name="row_spacing">6</property>
<child>
<object class="GtkBox" id="box">
<property name="visible">True</property>
More information about the Libreoffice-commits
mailing list