Skip to content

C
core
Kaydet (Commit) 389491ae authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

weld SwMultiTOXTabDialog 

Change-Id: Ic1ae4cfe43bdf31d511e9ac0f65a821c53ab59eb
Reviewed-on: https://gerrit.libreoffice.org/65432
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 6bd751f9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 219 additions and 62 deletions
include/vcl/weld.hxx
Dosyayı görüntüle @ 389491ae
......@@ -1649,6 +1649,7 @@ class VCL_DLLPUBLIC Menu
public:
virtual OString popup_at_rect(weld::Widget* pParent, const tools::Rectangle& rRect) = 0;
virtual void set_sensitive(const OString& rIdent, bool bSensitive) = 0;
virtual void set_label(const OString& rIdent, const OUString& rLabel) = 0;
virtual void set_active(const OString& rIdent, bool bActive) = 0;
virtual bool get_active(const OString& rIdent) const = 0;
virtual void set_visible(const OString& rIdent, bool bVisible) = 0;
......
solenv/sanitizers/ui/modules/swriter.false
Dosyayı görüntüle @ 389491ae
......@@ -3,3 +3,8 @@ sw/uiconfig/swriter/ui/pageformatpanel.ui://GtkLabel[@id='customlabel'] orphan-l
sw/uiconfig/swriter/ui/pagestylespanel.ui://GtkLabel[@id='customlabel'] orphan-label
sw/uiconfig/swriter/ui/pagefooterpanel.ui://GtkLabel[@id='customlabel'] orphan-label
sw/uiconfig/swriter/ui/pageheaderpanel.ui://GtkLabel[@id='customlabel'] orphan-label
sw/uiconfig/swriter/ui/previewmenu.ui://GtkRadioMenuItem[@id='zoom20'] button-no-label
sw/uiconfig/swriter/ui/previewmenu.ui://GtkRadioMenuItem[@id='zoom40'] button-no-label
sw/uiconfig/swriter/ui/previewmenu.ui://GtkRadioMenuItem[@id='zoom50'] button-no-label
sw/uiconfig/swriter/ui/previewmenu.ui://GtkRadioMenuItem[@id='zoom75'] button-no-label
sw/uiconfig/swriter/ui/previewmenu.ui://GtkRadioMenuItem[@id='zoom100'] button-no-label
sw/UIConfig_swriter.mk
Dosyayı görüntüle @ 389491ae
......@@ -229,6 +229,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/paradialog \
sw/uiconfig/swriter/ui/picturedialog \
sw/uiconfig/swriter/ui/picturepage \
sw/uiconfig/swriter/ui/previewmenu \
sw/uiconfig/swriter/ui/previewzoomdialog \
sw/uiconfig/swriter/ui/printeroptions \
sw/uiconfig/swriter/ui/printmergedialog \
......
sw/inc/swabstdlg.hxx
Dosyayı görüntüle @ 389491ae
......@@ -472,7 +472,7 @@ public:
const SfxItemSet* pSwItemSet,
SwWrtShell &) = 0;
virtual VclPtr<AbstractMultiTOXTabDialog> CreateMultiTOXTabDialog(
vcl::Window* pParent, const SfxItemSet& rSet,
weld::Window* pParent, const SfxItemSet& rSet,
SwWrtShell &rShell,
SwTOXBase* pCurTOX,
bool bGlobal) = 0;
......
sw/source/ui/dialog/swdlgfact.cxx
Dosyayı görüntüle @ 389491ae
......@@ -245,7 +245,15 @@ short AbstractMailMergeFieldConnectionsDlg_Impl::Execute()
return m_xDlg->run();
}
IMPL_ABSTDLG_BASE(AbstractMultiTOXTabDialog_Impl);
short AbstractMultiTOXTabDialog_Impl::Execute()
{
return m_xDlg->run();
}
bool AbstractMultiTOXTabDialog_Impl::StartExecuteAsync(AsyncContext &rCtx)
{
return SfxTabDialogController::runAsync(m_xDlg, rCtx.maEndDialogFn);
}
short AbstractEditRegionDlg_Impl::Execute()
{
......@@ -657,17 +665,17 @@ bool AbstractMailMergeFieldConnectionsDlg_Impl::IsUseExistingConnections() const
CurTOXType AbstractMultiTOXTabDialog_Impl::GetCurrentTOXType() const
{
return pDlg->GetCurrentTOXType();
return m_xDlg->GetCurrentTOXType();
}
SwTOXDescription& AbstractMultiTOXTabDialog_Impl::GetTOXDescription(CurTOXType eTOXTypes)
{
return pDlg->GetTOXDescription(eTOXTypes);
return m_xDlg->GetTOXDescription(eTOXTypes);
}
const SfxItemSet* AbstractMultiTOXTabDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
return m_xDlg->GetOutputItemSet();
}
void AbstractEditRegionDlg_Impl::SelectSection(const OUString& rSectionName)
......@@ -1071,14 +1079,10 @@ VclPtr<SfxAbstractTabDialog> SwAbstractDialogFactory_Impl::CreateOutlineTabDialo
return VclPtr<AbstractTabController_Impl>::Create(std::make_unique<SwOutlineTabDialog>(pParent, pSwItemSet, rWrtSh));
}
VclPtr<AbstractMultiTOXTabDialog> SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialog(
vcl::Window* pParent, const SfxItemSet& rSet,
SwWrtShell &rShell,
SwTOXBase* pCurTOX,
bool bGlobal)
VclPtr<AbstractMultiTOXTabDialog> SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialog(weld::Window* pParent, const SfxItemSet& rSet,
SwWrtShell &rShell, SwTOXBase* pCurTOX, bool bGlobal)
{
VclPtr<SwMultiTOXTabDialog> pDlg = VclPtr<SwMultiTOXTabDialog>::Create( pParent, rSet, rShell, pCurTOX, USHRT_MAX, bGlobal );
return VclPtr<AbstractMultiTOXTabDialog_Impl>::Create( pDlg );
return VclPtr<AbstractMultiTOXTabDialog_Impl>::Create(std::make_unique<SwMultiTOXTabDialog>(pParent, rSet, rShell, pCurTOX, USHRT_MAX, bGlobal));
}
VclPtr<AbstractEditRegionDlg> SwAbstractDialogFactory_Impl::CreateEditRegionDlg(weld::Window* pParent, SwWrtShell& rWrtSh)
......
sw/source/ui/dialog/swdlgfact.hxx
Dosyayı görüntüle @ 389491ae
......@@ -513,7 +513,15 @@ public:
class SwMultiTOXTabDialog;
class AbstractMultiTOXTabDialog_Impl : public AbstractMultiTOXTabDialog
{
DECL_ABSTDLG_BASE(AbstractMultiTOXTabDialog_Impl,SwMultiTOXTabDialog)
protected:
std::shared_ptr<SwMultiTOXTabDialog> m_xDlg;
public:
explicit AbstractMultiTOXTabDialog_Impl(std::unique_ptr<SwMultiTOXTabDialog> p)
: m_xDlg(std::move(p))
{
}
virtual short Execute() override;
virtual bool StartExecuteAsync(VclAbstractDialog::AsyncContext &rCtx) override;
virtual CurTOXType GetCurrentTOXType() const override ;
virtual SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes) override;
//from SfxTabDialog
......@@ -700,7 +708,7 @@ public:
const SfxItemSet* pSwItemSet,
SwWrtShell &) override;
virtual VclPtr<AbstractMultiTOXTabDialog> CreateMultiTOXTabDialog(
vcl::Window* pParent, const SfxItemSet& rSet,
weld::Window* pParent, const SfxItemSet& rSet,
SwWrtShell &rShell,
SwTOXBase* pCurTOX,
bool bGlobal) override;
......
sw/source/ui/index/cntex.cxx
Dosyayı görüntüle @ 389491ae
......@@ -94,11 +94,11 @@ static void lcl_SetBOOLProp(
}
}
IMPL_LINK_NOARG(SwMultiTOXTabDialog, CreateExample_Hdl, SwOneExampleFrame&, void)
IMPL_LINK_NOARG(SwMultiTOXTabDialog, CreateExample_Hdl, OneExampleFrame&, void)
{
try
{
uno::Reference< frame::XModel > & xModel = m_pExampleFrame->GetModel();
uno::Reference< frame::XModel > & xModel = m_xExampleFrame->GetModel();
uno::Reference< lang::XUnoTunnel > xDocTunnel(xModel, uno::UNO_QUERY);
SwXTextDocument* pDoc = reinterpret_cast<SwXTextDocument*>(xDocTunnel->getSomething(SwXTextDocument::getUnoTunnelId()));
......@@ -138,7 +138,7 @@ IMPL_LINK_NOARG(SwMultiTOXTabDialog, CreateExample_Hdl, SwOneExampleFrame&, void
void SwMultiTOXTabDialog::CreateOrUpdateExample(
TOXTypes nTOXIndex, sal_uInt16 nPage, sal_uInt16 nCurrentLevel)
{
if(!m_pExampleFrame || !m_pExampleFrame->IsInitialized())
if(!m_xExampleFrame || !m_xExampleFrame->IsInitialized())
return;
try
......@@ -157,7 +157,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
OSL_ENSURE(m_vTypeData[nTOXIndex].m_pxIndexSections &&
m_vTypeData[nTOXIndex].m_pxIndexSections->xContainerSection.is(),
"Section not created");
uno::Reference< frame::XModel > & xModel = m_pExampleFrame->GetModel();
uno::Reference< frame::XModel > & xModel = m_xExampleFrame->GetModel();
bool bInitialCreate = true;
if(!m_vTypeData[nTOXIndex].m_pxIndexSections->xDocumentIndex.is())
{
......@@ -401,6 +401,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
{
OSL_FAIL("::CreateExample() - exception caught");
}
m_xExampleFrame->Invalidate();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/ui/index/cnttab.cxx
Dosyayı görüntüle @ 389491ae
This diff is collapsed.
sw/source/uibase/inc/swuicnttab.hxx
Dosyayı görüntüle @ 389491ae
......@@ -43,7 +43,7 @@ class SwTOXWidget;
class SwTOXEdit;
class SwTOXButton;
class SwTOXEntryTabPage;
class SwOneExampleFrame;
class OneExampleFrame;
class SwWrtShell;
namespace com{namespace sun{namespace star{
......@@ -59,20 +59,11 @@ struct SwIndexSections_Impl
css::uno::Reference< css::text::XDocumentIndex > xDocumentIndex;
};
class SwMultiTOXTabDialog : public SfxTabDialog
class SwMultiTOXTabDialog : public SfxTabDialogController
{
VclPtr<vcl::Window> m_pExampleContainerWIN;
VclPtr<CheckBox> m_pShowExampleCB;
std::unique_ptr<SwTOXMgr> m_pMgr;
SwWrtShell& m_rWrtShell;
sal_uInt16 m_nSelectId;
sal_uInt16 m_nColumnId;
sal_uInt16 m_nBackGroundId;
sal_uInt16 m_nEntriesId;
std::unique_ptr<SwOneExampleFrame> m_pExampleFrame;
struct TypeData
{
std::unique_ptr<SwForm> m_pForm;
......@@ -92,21 +83,24 @@ class SwMultiTOXTabDialog : public SfxTabDialog
bool m_bExampleCreated;
bool const m_bGlobalFlag;
std::unique_ptr<OneExampleFrame> m_xExampleFrame;
std::unique_ptr<weld::CheckButton> m_xShowExampleCB;
std::unique_ptr<weld::CustomWeld> m_xExampleFrameWin;
virtual short Ok() override;
std::unique_ptr<SwTOXDescription> CreateTOXDescFromTOXBase(const SwTOXBase*pCurTOX);
DECL_LINK(CreateExample_Hdl, SwOneExampleFrame&, void);
DECL_LINK(ShowPreviewHdl, Button*, void);
DECL_LINK(CreateExample_Hdl, OneExampleFrame&, void);
DECL_LINK(ShowPreviewHdl, weld::ToggleButton&, void);
public:
SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet& rSet,
SwMultiTOXTabDialog(weld::Window* pParent, const SfxItemSet& rSet,
SwWrtShell &rShell,
SwTOXBase* pCurTOX, sal_uInt16 nToxType,
bool bGlobal);
virtual ~SwMultiTOXTabDialog() override;
virtual void dispose() override;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override;
virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
SwForm* GetForm(CurTOXType eType);
......@@ -254,7 +248,10 @@ class SwTokenWindow
OUString m_sAdditionalAccnameString2;
OUString m_sAdditionalAccnameString3;
Idle m_aAdjustPositionsIdle;
VclPtr<SwTOXEntryTabPage> m_pParent;
std::unique_ptr<weld::Container> m_xParentWidget;
std::unique_ptr<weld::Builder> m_xBuilder;
std::unique_ptr<weld::Container> m_xContainer;
std::unique_ptr<weld::Button> m_xLeftScrollWin;
......@@ -270,6 +267,7 @@ class SwTokenWindow
DECL_LINK(TbxFocusBtnHdl, SwTOXWidget&, void);
DECL_LINK(ScrollBtnHdl, weld::Button&, void);
DECL_LINK(ScrollHdl, weld::ScrolledWindow&, void);
DECL_LINK(AdjustPositionsHdl, const Size&, void);
void SetActiveControl(SwTOXWidget* pSet);
......@@ -436,7 +434,7 @@ class SwTOXStylesTabPage : public SfxTabPage
SwForm& GetForm()
{
SwMultiTOXTabDialog* pDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog());
SwMultiTOXTabDialog* pDlg = static_cast<SwMultiTOXTabDialog*>(GetDialogController());
return *pDlg->GetForm(pDlg->GetCurrentTOXType());
}
......
sw/source/uibase/inc/unotools.hxx
Dosyayı görüntüle @ 389491ae
......@@ -24,6 +24,8 @@
#include <vcl/fixed.hxx>
#include <vcl/layout.hxx>
#include <vcl/idle.hxx>
#include <vcl/weld.hxx>
#include <vcl/customweld.hxx>
#include "actctrl.hxx"
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/text/XTextCursor.hpp>
......@@ -101,6 +103,50 @@ public:
static void CreateErrorMessage();
};
class SW_DLLPUBLIC OneExampleFrame : public weld::CustomWidgetController
{
ScopedVclPtr<VirtualDevice> m_xVirDev;
css::uno::Reference< css::frame::XModel > m_xModel;
css::uno::Reference< css::frame::XController > m_xController;
css::uno::Reference< css::text::XTextCursor > m_xCursor;
Idle m_aLoadedIdle;
Link<OneExampleFrame&,void> m_aInitializedLink;
OUString m_sArgumentURL;
SwView* const m_pModuleView;
sal_uInt32 const m_nStyleFlags;
bool m_bIsInitialized;
DECL_DLLPRIVATE_LINK( TimeoutHdl, Timer*, void );
void PopupHdl(const OString& rId);
SAL_DLLPRIVATE void CreateControl();
SAL_DLLPRIVATE void DisposeControl();
public:
OneExampleFrame(sal_uInt32 nStyleFlags,
const Link<OneExampleFrame&,void>* pInitalizedLink,
const OUString* pURL = nullptr);
virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
virtual bool ContextMenu(const CommandEvent& rCEvt) override;
virtual ~OneExampleFrame() override;
css::uno::Reference< css::frame::XModel > & GetModel() {return m_xModel;}
css::uno::Reference< css::frame::XController > & GetController() {return m_xController;}
css::uno::Reference< css::text::XTextCursor > & GetTextCursor() {return m_xCursor;}
void ClearDocument();
bool IsInitialized() const {return m_bIsInitialized;}
bool CreatePopup(const Point& rPt);
};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/uibase/shells/textidx.cxx
Dosyayı görüntüle @ 389491ae
......@@ -49,7 +49,6 @@ void SwTextShell::ExecIdx(SfxRequest const &rReq)
pArgs->GetItemState(nSlot, false, &pItem );
SfxViewFrame* pVFrame = GetView().GetViewFrame();
vcl::Window *pMDI = &pVFrame->GetWindow();
switch( nSlot )
{
......@@ -133,9 +132,11 @@ void SwTextShell::ExecIdx(SfxRequest const &rReq)
}
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
VclPtr<AbstractMultiTOXTabDialog> pDlg(pFact->CreateMultiTOXTabDialog(
pMDI, aSet, rSh, const_cast<SwTOXBase*>(pCurTOX),
GetView().GetFrameWeld(), aSet, rSh, const_cast<SwTOXBase*>(pCurTOX),
bGlobal));
pDlg->StartExecuteAsync(nullptr);
pDlg->StartExecuteAsync([pDlg](sal_Int32 /*nResult*/){
pDlg->disposeOnce();
});
}
break;
case FN_REMOVE_CUR_TOX:
......
sw/source/uibase/utlui/glbltree.cxx
Dosyayı görüntüle @ 389491ae
......@@ -906,7 +906,7 @@ void SwGlobalTree::ExecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry )
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
ScopedVclPtr<AbstractMultiTOXTabDialog> pDlg(pFact->CreateMultiTOXTabDialog(
this, aSet,
GetFrameWeld(), aSet,
*m_pActiveShell,
nullptr,
true));
......
sw/uiconfig/swriter/ui/previewmenu.ui 0 → 100644
Dosyayı görüntüle @ 389491ae
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
<object class="GtkMenu" id="previewmenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkRadioMenuItem" id="zoom20">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="zoom40">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="zoom50">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="zoom75">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
</object>
</child>
<child>
<object class="GtkRadioMenuItem" id="zoom100">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
</object>
</child>
</object>
</interface>
sw/uiconfig/swriter/ui/tocentriespage.ui
Dosyayı görüntüle @ 389491ae
......@@ -2,15 +2,6 @@
<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkTreeStore" id="liststore1">
<columns>
<!-- column-name text -->
<column type="gchararray"/>
<!-- column-name id -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">19.989999999999998</property>
<property name="step_increment">0.050000000000000003</property>
......@@ -26,32 +17,40 @@
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">res/sc10712.png</property>
<property name="icon_name">res/sc10712.png</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">res/sc10713.png</property>
<property name="icon_name">res/sc10713.png</property>
</object>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">res/sc10712.png</property>
<property name="icon_name">res/sc10712.png</property>
</object>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">res/sc10712.png</property>
<property name="icon_name">res/sc10712.png</property>
</object>
<object class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">res/sc10713.png</property>
<property name="icon_name">res/sc10713.png</property>
</object>
<object class="GtkImage" id="image6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">res/sc10713.png</property>
<property name="icon_name">res/sc10713.png</property>
</object>
<object class="GtkTreeStore" id="liststore1">
<columns>
<!-- column-name text -->
<column type="gchararray"/>
<!-- column-name id -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkBox" id="TocEntriesPage">
<property name="visible">True</property>
......@@ -162,6 +161,7 @@
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
<property name="row_spacing">12</property>
<child>
......@@ -473,8 +473,8 @@
<property name="hexpand">True</property>
<child>
<object class="GtkComboBoxText" id="authfield">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -492,9 +492,9 @@
<child>
<object class="GtkButton" id="insert">
<property name="label" translatable="yes" context="tocentriespage|insert">_Insert</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
<property name="use_underline">True</property>
</object>
<packing>
......@@ -506,9 +506,9 @@
<child>
<object class="GtkButton" id="remove">
<property name="label" translatable="yes" context="tocentriespage|remove">_Remove</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
<property name="use_underline">True</property>
</object>
<packing>
......@@ -520,9 +520,9 @@
<child>
<object class="GtkButton" id="chapterno">
<property name="label" translatable="yes" context="tocentriespage|chapterno">Chapter No.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
<property name="use_underline">True</property>
</object>
<packing>
......@@ -748,8 +748,8 @@
</child>
<child>
<object class="GtkFrame" id="sortingframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
......@@ -821,8 +821,8 @@
</child>
<child>
<object class="GtkFrame" id="sortkeyframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
......
sw/uiconfig/swriter/ui/tocindexpage.ui
Dosyayı görüntüle @ 389491ae
This source diff could not be displayed because it is too large. You can view the blob instead.
sw/uiconfig/swriter/ui/tocstylespage.ui
Dosyayı görüntüle @ 389491ae
......@@ -26,6 +26,8 @@
<object class="GtkBox" id="TocStylesPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
......
sw/uiconfig/swriter/ui/tokenwidget.ui
Dosyayı görüntüle @ 389491ae
......@@ -45,12 +45,49 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<child>
<object class="GtkGrid" id="ctrl">
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child>
<placeholder/>
<object class="GtkGrid" id="ctrl">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="vexpand">True</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>
</child>
......
vcl/source/app/salvtables.cxx
Dosyayı görüntüle @ 389491ae
......@@ -843,6 +843,10 @@ public:
{
return m_xMenu->IsItemChecked(m_xMenu->GetItemId(rIdent));
}
virtual void set_label(const OString& rIdent, const OUString& rLabel) override
{
m_xMenu->SetItemText(m_xMenu->GetItemId(rIdent), rLabel);
}
virtual void set_visible(const OString& rIdent, bool bShow) override
{
m_xMenu->ShowItem(m_xMenu->GetItemId(rIdent), bShow);
......
vcl/unx/gtk3/gtk3gtkinst.cxx
Dosyayı görüntüle @ 389491ae
......@@ -5295,6 +5295,11 @@ public:
set_item_visible(rIdent, bShow);
}
virtual void set_label(const OString& rIdent, const OUString& rLabel) override
{
set_item_label(rIdent, rLabel);
}
virtual void insert_separator(int pos, const OUString& rId) override
{
MenuHelper::insert_separator(pos, rId);
......
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