Skip to content

C
core
Kaydet (Commit) 019a0fbd authored tarafından Szymon Kłos's avatar Szymon Kłos Kaydeden (comit) Jan Holesovsky
Dosyalara gözat
Seçenekler

underline popup control possible to use outside sidebar 

Change-Id: I48097007c7dc0439b33233939c1d73902dfeb679
Reviewed-on: https://gerrit.libreoffice.org/24491Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJan Holesovsky <kendy@collabora.com>
üst 00fc1ee1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 382 deletions
svx/source/sidebar/text/TextUnderlinePopup.hxx → include/svx/TextUnderlinePopup.hxx
Dosyayı görüntüle @ 019a0fbd
......@@ -16,30 +16,30 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTUNDERLINEPOPUP_HXX
#define INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTUNDERLINEPOPUP_HXX
#ifndef INCLUDED_SVX_SIDEBAR_TEXT_TEXTUNDERLINEPOPUP_HXX
#define INCLUDED_SVX_SIDEBAR_TEXT_TEXTUNDERLINEPOPUP_HXX
#include "svx/sidebar/Popup.hxx"
#include <sfx2/tbxctrl.hxx>
#include <svx/svxdllapi.h>
#include <vcl/vclenum.hxx>
#include <functional>
namespace svx { namespace sidebar {
namespace svx {
class TextUnderlinePopup
: public Popup
class SVX_DLLPUBLIC TextUnderlinePopup : public SfxToolBoxControl
{
public:
TextUnderlinePopup (
vcl::Window* pParent,
const ::std::function<PopupControl* (PopupContainer*)>& rControlCreator);
SFX_DECL_TOOLBOX_CONTROL();
TextUnderlinePopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
virtual ~TextUnderlinePopup();
void Rearrange (FontLineStyle eLine);
virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override;
};
} } // end of namespace svx::sidebar
} // end of namespace svx
#endif
......
sc/source/ui/app/scdll.cxx
Dosyayı görüntüle @ 019a0fbd
......@@ -34,6 +34,7 @@
#include <comphelper/types.hxx>
#include <svx/ParaLineSpacingPopup.hxx>
#include <svx/TextCharacterSpacingPopup.hxx>
#include <svx/TextUnderlinePopup.hxx>
#include <svtools/parhtml.hxx>
#include <sot/formats.hxx>
......@@ -171,6 +172,7 @@ void ScDLL::Init()
SvxUndoRedoControl ::RegisterControl(SID_REDO, pMod );
svx::ParaLineSpacingPopup ::RegisterControl(SID_ATTR_PARA_LINESPACE, pMod );
svx::TextCharacterSpacingPopup ::RegisterControl(SID_ATTR_CHAR_KERNING, pMod );
svx::TextUnderlinePopup ::RegisterControl(SID_ATTR_CHAR_UNDERLINE, pMod );
svx::FormatPaintBrushToolBoxControl::RegisterControl(SID_FORMATPAINTBRUSH, pMod );
SvxGrafModeToolBoxControl ::RegisterControl(SID_ATTR_GRAF_MODE, pMod);
......
sd/source/ui/app/sddll.cxx
Dosyayı görüntüle @ 019a0fbd
......@@ -70,6 +70,7 @@
#include <svx/formatpaintbrushctrl.hxx>
#include <svx/ParaLineSpacingPopup.hxx>
#include <svx/TextCharacterSpacingPopup.hxx>
#include <svx/TextUnderlinePopup.hxx>
#include <svx/grafctrl.hxx>
#include <svx/hyperdlg.hxx>
#include <svx/imapdlg.hxx>
......@@ -229,6 +230,7 @@ void SdDLL::RegisterControllers()
SvxColorToolBoxControl::RegisterControl( SID_EXTRUSION_3D_COLOR, pMod );
svx::ParaLineSpacingPopup::RegisterControl(SID_ATTR_PARA_LINESPACE, pMod);
svx::TextCharacterSpacingPopup::RegisterControl(SID_ATTR_CHAR_KERNING, pMod);
svx::TextUnderlinePopup::RegisterControl(SID_ATTR_CHAR_UNDERLINE, pMod);
::avmedia::MediaToolBoxControl::RegisterControl( SID_AVMEDIA_TOOLBOX, pMod );
XmlSecStatusBarControl::RegisterControl( SID_SIGNATURE, pMod );
......
svx/AllLangResTarget_svx.mk
Dosyayı görüntüle @ 019a0fbd
......@@ -65,7 +65,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
svx/source/sidebar/EmptyPanel.src \
svx/source/sidebar/area/AreaPropertyPanel.src \
svx/source/sidebar/line/LinePropertyPanel.src \
svx/source/sidebar/text/TextPropertyPanel.src \
svx/source/sidebar/paragraph/ParaPropertyPanel.src \
svx/source/stbctrls/stbctrls.src \
svx/source/svdraw/svdstr.src \
......
svx/UIConfig_svx.mk
Dosyayı görüntüle @ 019a0fbd
......@@ -71,6 +71,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/textcharacterspacingcontrol \
svx/uiconfig/ui/textcontrolchardialog \
svx/uiconfig/ui/textcontrolparadialog \
svx/uiconfig/ui/textunderlinecontrol \
svx/uiconfig/ui/xformspage \
))
......
svx/source/sidebar/text/TextPropertyPanel.cxx
Dosyayı görüntüle @ 019a0fbd
......@@ -27,24 +27,14 @@
#include <svtools/unitconv.hxx>
#include <vcl/toolbox.hxx>
#include "TextCharacterSpacingControl.hxx"
#include "TextUnderlineControl.hxx"
#include "TextUnderlinePopup.hxx"
#include <svx/sidebar/PopupContainer.hxx>
using namespace css;
using namespace css::uno;
const char UNO_UNDERLINE[] = ".uno:Underline";
namespace svx { namespace sidebar {
VclPtr<PopupControl> TextPropertyPanel::CreateUnderlinePopupControl (PopupContainer* pParent)
{
return VclPtrInstance<TextUnderlineControl>(pParent, *this, mpBindings);
}
VclPtr<vcl::Window> TextPropertyPanel::Create (
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
......@@ -68,11 +58,8 @@ VclPtr<vcl::Window> TextPropertyPanel::Create (
TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& /*rContext*/ )
: PanelLayout(pParent, "SidebarTextPanel", "svx/ui/sidebartextpanel.ui", rxFrame),
maFontSizeControl (SID_ATTR_CHAR_FONTHEIGHT, *pBindings, *this, OUString("FontHeight"), rxFrame),
maUnderlineControl (SID_ATTR_CHAR_UNDERLINE, *pBindings, *this, OUString("Underline"), rxFrame),
maUnderlinePopup(this, [this] (PopupContainer *const pContainer) { return this->CreateUnderlinePopupControl(pContainer); }),
maContext(),
mpBindings(pBindings)
maContext()
{
get(mpToolBoxFont, "fonteffects");
get(mpToolBoxIncDec, "fontadjust");
......@@ -81,14 +68,8 @@ TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, const css::uno::Ref
get(mpToolBoxFontColor, "colorbar_others");
get(mpToolBoxBackgroundColor, "colorbar_background");
//toolbox
SetupToolboxItems();
InitToolBoxFont();
//init state
mpHeightItem = nullptr;
meUnderline = LINESTYLE_NONE;
meUnderlineColor = COL_AUTO;
}
TextPropertyPanel::~TextPropertyPanel()
......@@ -105,9 +86,6 @@ void TextPropertyPanel::dispose()
mpToolBoxFontColor.clear();
maFontSizeControl.dispose();
maUnderlineControl.dispose();
maUnderlinePopup.dispose();
PanelLayout::dispose();
}
......@@ -163,40 +141,6 @@ void TextPropertyPanel::HandleContextChange (
mpToolBoxBackgroundColor->Show(bDrawText);
}
void TextPropertyPanel::DataChanged (const DataChangedEvent& /*rEvent*/)
{
SetupToolboxItems();
}
void TextPropertyPanel::EndUnderlinePopupMode()
{
maUnderlinePopup.Hide();
}
void TextPropertyPanel::InitToolBoxFont()
{
Link<ToolBox *, void> aLink = LINK(this, TextPropertyPanel, UnderlineClickHdl);
mpToolBoxFont->SetDropdownClickHdl(aLink);
}
void TextPropertyPanel::SetupToolboxItems()
{
maUnderlineControl.SetupToolBoxItem(*mpToolBoxFont, mpToolBoxFont->GetItemId(UNO_UNDERLINE));
}
IMPL_LINK_TYPED(TextPropertyPanel, UnderlineClickHdl, ToolBox*, pToolBox, void)
{
const sal_uInt16 nId = pToolBox->GetCurItemId();
const OUString aCommand(pToolBox->GetItemCommand(nId));
if (aCommand == UNO_UNDERLINE)
{
pToolBox->SetItemDown( nId, true );
maUnderlinePopup.Rearrange(meUnderline);
maUnderlinePopup.Show(*pToolBox);
}
}
void TextPropertyPanel::NotifyItemUpdate (
const sal_uInt16 nSID,
const SfxItemState eState,
......@@ -213,18 +157,6 @@ void TextPropertyPanel::NotifyItemUpdate (
mpHeightItem = nullptr;
}
break;
case SID_ATTR_CHAR_UNDERLINE:
{
if( eState >= SfxItemState::DEFAULT && dynamic_cast<const SvxUnderlineItem*>( pState) != nullptr )
{
const SvxUnderlineItem* pItem = static_cast<const SvxUnderlineItem*>(pState);
meUnderline = (FontLineStyle)pItem->GetValue();
meUnderlineColor = pItem->GetColor();
}
else
meUnderline = LINESTYLE_NONE;
}
break;
case SID_ATTR_CHAR_KERNING:
{
mpToolBoxSpacing->Enable(bIsEnabled);
......
svx/source/sidebar/text/TextPropertyPanel.hrc
Dosyayı görüntüle @ 019a0fbd
......@@ -18,53 +18,6 @@
*/
#include "svx/dialogs.hrc"
#define VS_SPACING_WIDTH 80
#define CUSTOM_HEIGHT CBOX_HEIGHT + MBOX_HEIGHT + POPUPPANEL_MARGIN_LARGE * 3 + POPUPPANEL_MARGIN_SMALL * 2 + TEXT_HEIGHT * 2
#define CUSTOM_WIDTH VS_SPACING_WIDTH - 8
#define CUSTOM_X POPUPPANEL_MARGIN_LARGE + OFFSET_X + 1
#define CUSTOM_Y OFFSET_Y + POPUPPANEL_MARGIN_SMALL * 3 + 15 * 6 + TEXT_HEIGHT
#define VS_UNDERLINE_WIDTH 57
#define VS_UNDERLINE_HEIGHT 12 * 10
//popup window underline
#define VS_UNDERLINE 1
#define PB_OPTIONS 2
#define IMG_SINGLE 10
#define IMG_DOUBLE 11
#define IMG_BOLD2 12
#define IMG_DOT 13
#define IMG_DOT_BOLD 14
#define IMG_DASH 15
#define IMG_DASH_LONG 16
#define IMG_DASH_DOT 17
#define IMG_DASH_DOT_DOT 18
#define IMG_WAVE 19
#define STR_SINGLE 20
#define STR_DOUBLE 21
#define STR_BOLD 22
#define STR_DOT 23
#define STR_DOT_BOLD 24
#define STR_DASH 25
#define STR_DASH_LONG 26
#define STR_DASH_DOT 27
#define STR_DASH_DOT_DOT 28
#define STR_WAVE 29
#define IMG_SINGLE_SEL 40
#define IMG_DOUBLE_SEL 41
#define IMG_BOLD2_SEL 42
#define IMG_DOT_SEL 43
#define IMG_DOT_BOLD_SEL 44
#define IMG_DASH_SEL 45
#define IMG_DASH_LONG_SEL 46
#define IMG_DASH_DOT_SEL 47
#define IMG_DASH_DOT_DOT_SEL 48
#define IMG_WAVE_SEL 49
#define STR_WITHOUT 50
//help ids
#define HID_UNDERLINE_BTN "SVX_HID_UNDERLINE_BTN"
#define HID_SPACING_CB_KERN "SVX_HID_SPACING_CB_KERN"
......
svx/source/sidebar/text/TextPropertyPanel.hxx
Dosyayı görüntüle @ 019a0fbd
......@@ -29,7 +29,6 @@
#include <com/sun/star/ui/XSidebar.hpp>
#include <com/sun/star/frame/XToolbarController.hpp>
#include "TextUnderlinePopup.hxx"
#include <svx/sidebar/PanelLayout.hxx>
class ToolBox;
......@@ -54,11 +53,6 @@ public:
SfxBindings* pBindings,
const ::sfx2::sidebar::EnumContext& rContext);
virtual void DataChanged (const DataChangedEvent& rEvent) override;
void EndUnderlinePopupMode();
Color& GetUnderlineColor() { return meUnderlineColor;}
virtual void HandleContextChange (
const ::sfx2::sidebar::EnumContext& rContext) override;
......@@ -87,22 +81,10 @@ private:
//control items
::sfx2::sidebar::ControllerItem maFontSizeControl;
::sfx2::sidebar::ControllerItem maUnderlineControl;
FontLineStyle meUnderline;
Color meUnderlineColor;
SvxFontHeightItem* mpHeightItem;
TextUnderlinePopup maUnderlinePopup;
::sfx2::sidebar::EnumContext maContext;
SfxBindings* mpBindings;
VclPtr<PopupControl> CreateUnderlinePopupControl (PopupContainer* pParent);
DECL_LINK_TYPED(UnderlineClickHdl, ToolBox*, void);
void SetupToolboxItems();
void InitToolBoxFont();
};
} } // end of namespace svx::sidebar
......
svx/source/sidebar/text/TextPropertyPanel.src deleted 100644 → 0
Dosyayı görüntüle @ 00fc1ee1
/* -*- 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 .
*/
#include "TextPropertyPanel.hrc"
#include <sfx2/sidebar/ResourceDefinitions.hrc>
#include "helpid.hrc"
Control RID_POPUPPANEL_TEXTPAGE_UNDERLINE
{
OutputSize = TRUE;
DialogControl = TRUE;
Border = FALSE;
Size = MAP_APPFONT( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH + VS_UNDERLINE_WIDTH, 13+ VS_UNDERLINE_HEIGHT + POPUP_BORDER_HEIGHT + POPUPPANEL_MARGIN_SMALL * 2 + POPUPPANEL_MARGIN_LARGE);
Control VS_UNDERLINE
{
HelpID = HID_PPROPERTYPANEL_TEXT_UNDERLINE_VS;
Hide = TRUE ;
Pos = MAP_APPFONT( POPUPPANEL_MARGIN_SMALL + OFFSET_X , POPUPPANEL_MARGIN_SMALL + OFFSET_Y );
Size = MAP_APPFONT ( VS_UNDERLINE_WIDTH ,VS_UNDERLINE_HEIGHT);
TabStop = TRUE ;
Text = "Underline";
};
PushButton PB_OPTIONS
{
HelpID = HID_UNDERLINE_BTN;
Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X , POPUPPANEL_MARGIN_SMALL * 2 + OFFSET_Y + VS_UNDERLINE_HEIGHT );
Size = MAP_APPFONT ( VS_UNDERLINE_WIDTH, 13 );
TabStop = TRUE;
Text [ en-US ] = "~More Options...";
};
Image IMG_SINGLE
{
ImageBitmap = Bitmap{File = "symphony/line1.bmp";};
};
Image IMG_DOUBLE
{
ImageBitmap = Bitmap{File = "symphony/line2.bmp";};
};
Image IMG_BOLD2
{
ImageBitmap = Bitmap{File = "symphony/line3.bmp";};
};
Image IMG_DOT
{
ImageBitmap = Bitmap{File = "symphony/line4.bmp";};
};
Image IMG_DOT_BOLD
{
ImageBitmap = Bitmap{File = "symphony/line5.bmp";};
};
Image IMG_DASH
{
ImageBitmap = Bitmap{File = "symphony/line6.bmp";};
};
Image IMG_DASH_LONG
{
ImageBitmap = Bitmap{File = "symphony/line7.bmp";};
};
Image IMG_DASH_DOT
{
ImageBitmap = Bitmap{File = "symphony/line8.bmp";};
};
Image IMG_DASH_DOT_DOT
{
ImageBitmap = Bitmap{File = "symphony/line9.bmp";};
};
Image IMG_WAVE
{
ImageBitmap = Bitmap{File = "symphony/line10.bmp";};
};
//image when selected
Image IMG_SINGLE_SEL
{
ImageBitmap = Bitmap{File = "symphony/selected-line1.bmp";};
};
Image IMG_DOUBLE_SEL
{
ImageBitmap = Bitmap{File = "symphony/selected-line2.bmp";};
};
Image IMG_BOLD2_SEL
{
ImageBitmap = Bitmap{File = "symphony/selected-line3.bmp";};
};
Image IMG_DOT_SEL
{
ImageBitmap = Bitmap{File = "symphony/selected-line4.bmp";};
};
Image IMG_DOT_BOLD_SEL
{
ImageBitmap = Bitmap{File = "symphony/selected-line5.bmp";};
};
Image IMG_DASH_SEL
{
ImageBitmap = Bitmap{File = "symphony/selected-line6.bmp";};
};
Image IMG_DASH_LONG_SEL
{
ImageBitmap = Bitmap{File = "symphony/selected-line7.bmp";};
};
Image IMG_DASH_DOT_SEL
{
ImageBitmap = Bitmap{File = "symphony/selected-line8.bmp";};
};
Image IMG_DASH_DOT_DOT_SEL
{
ImageBitmap = Bitmap{File = "symphony/selected-line9.bmp";};
};
Image IMG_WAVE_SEL
{
ImageBitmap = Bitmap{File = "symphony/selected-line10.bmp";};
};
String STR_WITHOUT
{
Text [ en-US ] = "(Without)";
};
//tips
String STR_SINGLE
{
Text [ en-US ] = "Single";
};
String STR_DOUBLE
{
Text [ en-US ] = "Double";
};
String STR_BOLD
{
Text [ en-US ] = "Bold";
};
String STR_DOT
{
Text [ en-US ] = "Dotted";
};
String STR_DOT_BOLD
{
Text [ en-US ] = "Dotted (Bold)";
};
String STR_DASH
{
Text [ en-US ] = "Dash";
};
String STR_DASH_LONG
{
Text [ en-US ] = "Long Dash";
};
String STR_DASH_DOT
{
Text [ en-US ] = "Dot Dash";
};
String STR_DASH_DOT_DOT
{
Text [ en-US ] = "Dot Dot Dash";
};
String STR_WAVE
{
Text [ en-US ] = "Wave";
};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
svx/source/sidebar/text/TextUnderlineControl.hxx
Dosyayı görüntüle @ 019a0fbd
......@@ -22,58 +22,40 @@
#include "svx/sidebar/PopupControl.hxx"
#include <sfx2/bindings.hxx>
#include "TextPropertyPanel.hxx"
#include <vcl/button.hxx>
#include <vcl/vclenum.hxx>
#include <svtools/valueset.hxx>
#include <sfx2/tbxctrl.hxx>
namespace svx{ namespace sidebar {
namespace svx {
class TextUnderlineControl:public svx::sidebar::PopupControl
class TextUnderlineControl : public SfxPopupWindow
{
public:
TextUnderlineControl (
vcl::Window* pParent,
svx::sidebar::TextPropertyPanel& rPanel,
SfxBindings* pBindings);
TextUnderlineControl(sal_uInt16 nId);
virtual ~TextUnderlineControl();
virtual void dispose() override;
void Rearrange(FontLineStyle eLine);
private:
svx::sidebar::TextPropertyPanel& mrTextPropertyPanel;
SfxBindings* mpBindings;
VclPtr<ValueSet> maVSUnderline;
VclPtr<PushButton> maPBOptions;
Image maIMGSingle;
Image maIMGDouble;
Image maIMGBold;
Image maIMGDot;
Image maIMGDotBold;
Image maIMGDash;
Image maIMGDashLong;
Image maIMGDashDot;
Image maIMGDashDotDot;
Image maIMGWave;
Image maIMGSingleSel;
Image maIMGDoubleSel;
Image maIMGBoldSel;
Image maIMGDotSel;
Image maIMGDotBoldSel;
Image maIMGDashSel;
Image maIMGDashLongSel;
Image maIMGDashDotSel;
Image maIMGDashDotDotSel;
Image maIMGWaveSel;
void initial();
DECL_LINK_TYPED( PBClickHdl, Button*, void);
DECL_LINK_TYPED(VSSelectHdl, ValueSet*, void);
VclPtr<PushButton> maNone;
VclPtr<PushButton> maSingle;
VclPtr<PushButton> maDouble;
VclPtr<PushButton> maBold;
VclPtr<PushButton> maDot;
VclPtr<PushButton> maDotBold;
VclPtr<PushButton> maDash;
VclPtr<PushButton> maDashLong;
VclPtr<PushButton> maDashDot;
VclPtr<PushButton> maDashDotDot;
VclPtr<PushButton> maWave;
VclPtr<PushButton> maMoreOptions;
FontLineStyle getLineStyle(Button* pButton);
Color GetUnderlineColor();
DECL_LINK_TYPED(PBClickHdl, Button*, void);
};
}}
}
#endif
......
svx/source/sidebar/text/TextUnderlinePopup.cxx
Dosyayı görüntüle @ 019a0fbd
......@@ -16,34 +16,33 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "TextUnderlinePopup.hxx"
#include <svx/TextUnderlinePopup.hxx>
#include "TextUnderlineControl.hxx"
#include <editeng/udlnitem.hxx>
#include <vcl/toolbox.hxx>
namespace svx { namespace sidebar {
using namespace svx;
TextUnderlinePopup::TextUnderlinePopup (
vcl::Window* pParent,
const ::std::function<PopupControl* (PopupContainer*)>& rControlCreator)
: Popup(
pParent,
rControlCreator,
OUString( "Underline"))
SFX_IMPL_TOOLBOX_CONTROL(TextUnderlinePopup, SvxTextLineItem);
TextUnderlinePopup::TextUnderlinePopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx)
: SfxToolBoxControl(nSlotId, nId, rTbx)
{
rTbx.SetItemBits(nId, ToolBoxItemBits::DROPDOWNONLY | rTbx.GetItemBits(nId));
}
TextUnderlinePopup::~TextUnderlinePopup()
{
}
void TextUnderlinePopup::Rearrange (FontLineStyle eLine)
VclPtr<SfxPopupWindow> TextUnderlinePopup::CreatePopupWindow()
{
ProvideContainerAndControl();
VclPtr<TextUnderlineControl> pControl = VclPtr<TextUnderlineControl>::Create(GetSlotId());
pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus|FloatWinPopupFlags::NoAppFocusClose);
SetPopupWindow(pControl);
TextUnderlineControl* pControl = dynamic_cast<TextUnderlineControl*>(mxControl.get());
if (pControl != nullptr)
pControl->Rearrange(eLine);
return pControl;
}
} } // end of namespace svx::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
svx/uiconfig/ui/textunderlinecontrol.ui 0 → 100644
Dosyayı görüntüle @ 019a0fbd
This diff is collapsed.
sw/source/uibase/app/swmodule.cxx
Dosyayı görüntüle @ 019a0fbd
......@@ -26,6 +26,7 @@
#include <svtools/ehdl.hxx>
#include <svx/ParaLineSpacingPopup.hxx>
#include <svx/TextCharacterSpacingPopup.hxx>
#include <svx/TextUnderlinePopup.hxx>
#include <svx/svdobj.hxx>
#include <svx/pszctrl.hxx>
#include <svx/insctrl.hxx>
......@@ -286,6 +287,7 @@ void SwDLL::RegisterControls()
SwTbxAutoTextCtrl::RegisterControl(FN_GLOSSARY_DLG, pMod );
svx::ParaLineSpacingPopup::RegisterControl(SID_ATTR_PARA_LINESPACE, pMod);
svx::TextCharacterSpacingPopup::RegisterControl(SID_ATTR_CHAR_KERNING, pMod);
svx::TextUnderlinePopup::RegisterControl(SID_ATTR_CHAR_UNDERLINE, pMod);
SvxColorToolBoxControl::RegisterControl( SID_EXTRUSION_3D_COLOR, pMod );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment