Skip to content

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

weld SvxAreaTabDialog 

Change-Id: Ia6ec954c6d0117fddc17432301ddeda3b26bbc8e
Reviewed-on: https://gerrit.libreoffice.org/60222
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst c8610e24
Hide whitespace changes
Inline Side-by-side
Showing with 183 additions and 94 deletions
chart2/source/controller/main/ShapeController.cxx
Dosyayı görüntüle @ 9ae23dfa
...@@ -292,7 +292,7 @@ void ShapeController::executeDispatch_FormatArea() ...@@ -292,7 +292,7 @@ void ShapeController::executeDispatch_FormatArea()
} }
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
ScopedVclPtr< AbstractSvxAreaTabDialog > pDlg( ScopedVclPtr< AbstractSvxAreaTabDialog > pDlg(
pFact->CreateSvxAreaTabDialog( pChartWindow, &aAttr, &pDrawModelWrapper->getSdrModel(), true ) ); pFact->CreateSvxAreaTabDialog(pChartWindow->GetFrameWeld(), &aAttr, &pDrawModelWrapper->getSdrModel(), true));
if ( pDlg->Execute() == RET_OK ) if ( pDlg->Execute() == RET_OK )
{ {
const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet(); const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet();
...@@ -326,7 +326,7 @@ void ShapeController::executeDispatch_TextAttributes() ...@@ -326,7 +326,7 @@ void ShapeController::executeDispatch_TextAttributes()
} }
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
ScopedVclPtr< SfxAbstractTabDialog > pDlg( ScopedVclPtr< SfxAbstractTabDialog > pDlg(
pFact->CreateTextTabDialog( pChartWindow ? pChartWindow->GetFrameWeld() : nullptr, &aAttr, pDrawViewWrapper ) ); pFact->CreateTextTabDialog(pChartWindow->GetFrameWeld(), &aAttr, pDrawViewWrapper));
if ( pDlg->Execute() == RET_OK ) if ( pDlg->Execute() == RET_OK )
{ {
const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet(); const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet();
......
cui/source/factory/dlgfact.cxx
Dosyayı görüntüle @ 9ae23dfa
...@@ -180,7 +180,16 @@ short AbstractSvxPathSelectDialog_Impl::Execute() ...@@ -180,7 +180,16 @@ short AbstractSvxPathSelectDialog_Impl::Execute()
IMPL_ABSTDLG_BASE(AbstractSvxHpLinkDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSvxHpLinkDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractFmSearchDialog_Impl); IMPL_ABSTDLG_BASE(AbstractFmSearchDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractGraphicFilterDialog_Impl); IMPL_ABSTDLG_BASE(AbstractGraphicFilterDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSvxAreaTabDialog_Impl);
short AbstractSvxAreaTabDialog_Impl::Execute()
{
return m_xDlg->execute();
}
bool AbstractSvxAreaTabDialog_Impl::StartExecuteAsync(AsyncContext &rCtx)
{
return SfxTabDialogController::runAsync(m_xDlg, rCtx.maEndDialogFn);
}
short AbstractPasteDialog_Impl::Execute() short AbstractPasteDialog_Impl::Execute()
{ {
...@@ -798,27 +807,27 @@ Graphic AbstractGraphicFilterDialog_Impl::GetFilteredGraphic( const Graphic& rGr ...@@ -798,27 +807,27 @@ Graphic AbstractGraphicFilterDialog_Impl::GetFilteredGraphic( const Graphic& rGr
// AbstractSvxAreaTabDialog implementations just forwards everything to the dialog // AbstractSvxAreaTabDialog implementations just forwards everything to the dialog
void AbstractSvxAreaTabDialog_Impl::SetCurPageId( const OString& rName ) void AbstractSvxAreaTabDialog_Impl::SetCurPageId( const OString& rName )
{ {
pDlg->SetCurPageId( rName ); m_xDlg->SetCurPageId( rName );
} }
const SfxItemSet* AbstractSvxAreaTabDialog_Impl::GetOutputItemSet() const const SfxItemSet* AbstractSvxAreaTabDialog_Impl::GetOutputItemSet() const
{ {
return pDlg->GetOutputItemSet(); return m_xDlg->GetOutputItemSet();
} }
const sal_uInt16* AbstractSvxAreaTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) const sal_uInt16* AbstractSvxAreaTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
{ {
return pDlg->GetInputRanges( pItem ); return m_xDlg->GetInputRanges( pItem );
} }
void AbstractSvxAreaTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet ) void AbstractSvxAreaTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
{ {
pDlg->SetInputSet( pInSet ); m_xDlg->SetInputSet( pInSet );
} }
//From class Window.
void AbstractSvxAreaTabDialog_Impl::SetText( const OUString& rStr ) void AbstractSvxAreaTabDialog_Impl::SetText( const OUString& rStr )
{ {
pDlg->SetText( rStr ); m_xDlg->set_title(rStr);
} }
void AbstractSvxPostItDialog_Impl::SetText( const OUString& rStr ) void AbstractSvxPostItDialog_Impl::SetText( const OUString& rStr )
...@@ -1293,13 +1302,12 @@ VclPtr<AbstractGraphicFilterDialog> AbstractDialogFactory_Impl::CreateGraphicFil ...@@ -1293,13 +1302,12 @@ VclPtr<AbstractGraphicFilterDialog> AbstractDialogFactory_Impl::CreateGraphicFil
return VclPtr<AbstractGraphicFilterDialog_Impl>::Create( pDlg ); return VclPtr<AbstractGraphicFilterDialog_Impl>::Create( pDlg );
} }
VclPtr<AbstractSvxAreaTabDialog> AbstractDialogFactory_Impl::CreateSvxAreaTabDialog( vcl::Window* pParent, VclPtr<AbstractSvxAreaTabDialog> AbstractDialogFactory_Impl::CreateSvxAreaTabDialog(weld::Window* pParent,
const SfxItemSet* pAttr, const SfxItemSet* pAttr,
SdrModel* pModel, SdrModel* pModel,
bool bShadow) bool bShadow)
{ {
VclPtrInstance<SvxAreaTabDialog> pDlg( pParent, pAttr, pModel, bShadow ); return VclPtr<AbstractSvxAreaTabDialog_Impl>::Create(o3tl::make_unique<SvxAreaTabDialog>(pParent, pAttr, pModel, bShadow));
return VclPtr<AbstractSvxAreaTabDialog_Impl>::Create( pDlg );
} }
VclPtr<SfxAbstractTabDialog> AbstractDialogFactory_Impl::CreateSvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog VclPtr<SfxAbstractTabDialog> AbstractDialogFactory_Impl::CreateSvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog
......
cui/source/factory/dlgfact.hxx
Dosyayı görüntüle @ 9ae23dfa
...@@ -468,15 +468,22 @@ class AbstractGraphicFilterDialog_Impl :public AbstractGraphicFilterDialog ...@@ -468,15 +468,22 @@ class AbstractGraphicFilterDialog_Impl :public AbstractGraphicFilterDialog
}; };
class SvxAreaTabDialog; class SvxAreaTabDialog;
class AbstractSvxAreaTabDialog_Impl :public AbstractSvxAreaTabDialog class AbstractSvxAreaTabDialog_Impl : public AbstractSvxAreaTabDialog
{ {
DECL_ABSTDLG_BASE(AbstractSvxAreaTabDialog_Impl,SvxAreaTabDialog) protected:
virtual void SetCurPageId( const OString& rName ) override; std::shared_ptr<SvxAreaTabDialog> m_xDlg;
virtual const SfxItemSet* GetOutputItemSet() const override; public:
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) override; explicit AbstractSvxAreaTabDialog_Impl(std::unique_ptr<SvxAreaTabDialog> p)
virtual void SetInputSet( const SfxItemSet* pInSet ) override; : m_xDlg(std::move(p))
// From class Window. {
virtual void SetText( const OUString& rStr ) override; }
virtual short Execute() override;
virtual bool StartExecuteAsync(AsyncContext &rCtx) override;
virtual void SetCurPageId(const OString& rName) override;
virtual const SfxItemSet* GetOutputItemSet() const override;
virtual const sal_uInt16* GetInputRanges(const SfxItemPool& pItem) override;
virtual void SetInputSet(const SfxItemSet* pInSet) override;
virtual void SetText(const OUString& rStr) override;
}; };
class AbstractInsertObjectDialog_Impl : public SfxAbstractInsertObjectDialog class AbstractInsertObjectDialog_Impl : public SfxAbstractInsertObjectDialog
...@@ -737,10 +744,10 @@ public: ...@@ -737,10 +744,10 @@ public:
const Graphic& rGraphic) override; const Graphic& rGraphic) override;
virtual VclPtr<AbstractGraphicFilterDialog> CreateGraphicFilterMosaic (vcl::Window* pParent, virtual VclPtr<AbstractGraphicFilterDialog> CreateGraphicFilterMosaic (vcl::Window* pParent,
const Graphic& rGraphic) override; const Graphic& rGraphic) override;
virtual VclPtr<AbstractSvxAreaTabDialog> CreateSvxAreaTabDialog( vcl::Window* pParent, virtual VclPtr<AbstractSvxAreaTabDialog> CreateSvxAreaTabDialog(weld::Window* pParent,
const SfxItemSet* pAttr, const SfxItemSet* pAttr,
SdrModel* pModel, SdrModel* pModel,
bool bShadow ) override; bool bShadow) override;
virtual VclPtr<SfxAbstractTabDialog> CreateSvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, virtual VclPtr<SfxAbstractTabDialog> CreateSvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr,
SdrModel* pModel, SdrModel* pModel,
const SdrObject* pObj, const SdrObject* pObj,
......
cui/source/inc/cuitabarea.hxx
Dosyayı görüntüle @ 9ae23dfa
...@@ -95,12 +95,8 @@ enum class PageType ...@@ -95,12 +95,8 @@ enum class PageType
Transparence, Transparence,
}; };
class SvxAreaTabDialog final : public SfxTabDialog class SvxAreaTabDialog final : public SfxTabDialogController
{ {
sal_uInt16 m_nAreaTabPage;
sal_uInt16 m_nShadowTabPage;
sal_uInt16 m_nTransparenceTabPage;
SdrModel* mpDrawModel; SdrModel* mpDrawModel;
XColorListRef mpColorList; XColorListRef mpColorList;
...@@ -120,14 +116,14 @@ class SvxAreaTabDialog final : public SfxTabDialog ...@@ -120,14 +116,14 @@ class SvxAreaTabDialog final : public SfxTabDialog
ChangeType mnGradientListState; ChangeType mnGradientListState;
ChangeType mnHatchingListState; ChangeType mnHatchingListState;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
virtual short Ok() override; virtual short Ok() override;
DECL_LINK( CancelHdlImpl, Button*, void ); DECL_LINK(CancelHdlImpl, weld::Button&, void);
void SavePalettes(); void SavePalettes();
public: public:
SvxAreaTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow ); SvxAreaTabDialog(weld::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow);
void SetNewColorList( XColorListRef const & pColorList ) void SetNewColorList( XColorListRef const & pColorList )
{ mpNewColorList = pColorList; } { mpNewColorList = pColorList; }
......
cui/source/tabpages/tabarea.cxx
Dosyayı görüntüle @ 9ae23dfa
...@@ -34,18 +34,12 @@ ...@@ -34,18 +34,12 @@
SvxAreaTabDialog::SvxAreaTabDialog SvxAreaTabDialog::SvxAreaTabDialog
( (
vcl::Window* pParent, weld::Window* pParent,
const SfxItemSet* pAttr, const SfxItemSet* pAttr,
SdrModel* pModel, SdrModel* pModel,
bool bShadow bool bShadow
) )
: SfxTabDialog( pParent, : SfxTabDialogController(pParent, "cui/ui/areadialog.ui", "AreaDialog", pAttr)
"AreaDialog",
"cui/ui/areadialog.ui",
pAttr )
, m_nAreaTabPage(0)
, m_nShadowTabPage(0)
, m_nTransparenceTabPage(0)
, mpDrawModel ( pModel ), , mpDrawModel ( pModel ),
mpColorList ( pModel->GetColorList() ), mpColorList ( pModel->GetColorList() ),
mpNewColorList ( pModel->GetColorList() ), mpNewColorList ( pModel->GetColorList() ),
...@@ -64,21 +58,21 @@ SvxAreaTabDialog::SvxAreaTabDialog ...@@ -64,21 +58,21 @@ SvxAreaTabDialog::SvxAreaTabDialog
mnGradientListState ( ChangeType::NONE ), mnGradientListState ( ChangeType::NONE ),
mnHatchingListState ( ChangeType::NONE ) mnHatchingListState ( ChangeType::NONE )
{ {
m_nAreaTabPage = AddTabPage( "RID_SVXPAGE_AREA", SvxAreaTabPage::Create, nullptr ); AddTabPage("RID_SVXPAGE_AREA", SvxAreaTabPage::Create, nullptr);
if(bShadow) if (bShadow)
{ {
m_nShadowTabPage = AddTabPage( "RID_SVXPAGE_SHADOW", SvxShadowTabPage::Create, nullptr ); AddTabPage("RID_SVXPAGE_SHADOW", SvxShadowTabPage::Create, nullptr);
} }
else else
{ {
RemoveTabPage( "RID_SVXPAGE_SHADOW" ); RemoveTabPage( "RID_SVXPAGE_SHADOW" );
} }
m_nTransparenceTabPage = AddTabPage( "RID_SVXPAGE_TRANSPARENCE", SvxTransparenceTabPage::Create, nullptr); AddTabPage( "RID_SVXPAGE_TRANSPARENCE", SvxTransparenceTabPage::Create, nullptr);
CancelButton& rBtnCancel = GetCancelButton(); weld::Button& rBtnCancel = GetCancelButton();
rBtnCancel.SetClickHdl( LINK( this, SvxAreaTabDialog, CancelHdlImpl ) ); rBtnCancel.connect_clicked(LINK(this, SvxAreaTabDialog, CancelHdlImpl));
} }
void SvxAreaTabDialog::SavePalettes() void SvxAreaTabDialog::SavePalettes()
...@@ -221,40 +215,39 @@ short SvxAreaTabDialog::Ok() ...@@ -221,40 +215,39 @@ short SvxAreaTabDialog::Ok()
// RET_OK is returned, if at least one // RET_OK is returned, if at least one
// TabPage returns sal_True in FillItemSet(). // TabPage returns sal_True in FillItemSet().
// This happens by default at the moment. // This happens by default at the moment.
return SfxTabDialog::Ok(); return SfxTabDialogController::Ok();
} }
IMPL_LINK_NOARG(SvxAreaTabDialog, CancelHdlImpl, weld::Button&, void)
IMPL_LINK_NOARG(SvxAreaTabDialog, CancelHdlImpl, Button*, void)
{ {
SavePalettes(); SavePalettes();
EndDialog(); m_xDialog->response(RET_CANCEL);
} }
void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) void SvxAreaTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
{ {
if (nId == m_nAreaTabPage ) if (rId == "RID_SVXPAGE_AREA")
{ {
static_cast<SvxAreaTabPage&>(rPage).SetColorList( mpColorList ); static_cast<SvxAreaTabPage&>(rPage).SetColorList( mpColorList );
static_cast<SvxAreaTabPage&>(rPage).SetGradientList( mpGradientList ); static_cast<SvxAreaTabPage&>(rPage).SetGradientList( mpGradientList );
static_cast<SvxAreaTabPage&>(rPage).SetHatchingList( mpHatchingList ); static_cast<SvxAreaTabPage&>(rPage).SetHatchingList( mpHatchingList );
static_cast<SvxAreaTabPage&>(rPage).SetBitmapList( mpBitmapList ); static_cast<SvxAreaTabPage&>(rPage).SetBitmapList( mpBitmapList );
static_cast<SvxAreaTabPage&>(rPage).SetPatternList( mpPatternList ); static_cast<SvxAreaTabPage&>(rPage).SetPatternList( mpPatternList );
static_cast<SvxAreaTabPage&>(rPage).SetGrdChgd( &mnGradientListState ); static_cast<SvxAreaTabPage&>(rPage).SetGrdChgd( &mnGradientListState );
static_cast<SvxAreaTabPage&>(rPage).SetHtchChgd( &mnHatchingListState ); static_cast<SvxAreaTabPage&>(rPage).SetHtchChgd( &mnHatchingListState );
static_cast<SvxAreaTabPage&>(rPage).SetBmpChgd( &mnBitmapListState ); static_cast<SvxAreaTabPage&>(rPage).SetBmpChgd( &mnBitmapListState );
static_cast<SvxAreaTabPage&>(rPage).SetPtrnChgd( &mnPatternListState ); static_cast<SvxAreaTabPage&>(rPage).SetPtrnChgd( &mnPatternListState );
static_cast<SvxAreaTabPage&>(rPage).SetColorChgd( &mnColorListState ); static_cast<SvxAreaTabPage&>(rPage).SetColorChgd( &mnColorListState );
} }
else if (nId == m_nShadowTabPage) else if (rId == "RID_SVXPAGE_SHADOW")
{ {
static_cast<SvxShadowTabPage&>(rPage).SetColorList( mpColorList ); static_cast<SvxShadowTabPage&>(rPage).SetColorList( mpColorList );
static_cast<SvxShadowTabPage&>(rPage).SetColorChgd( &mnColorListState ); static_cast<SvxShadowTabPage&>(rPage).SetColorChgd( &mnColorListState );
} }
else if (nId == m_nTransparenceTabPage) else if (rId == "RID_SVXPAGE_TRANSPARENCE")
{ {
static_cast<SvxTransparenceTabPage&>(rPage).SetPageType( PageType::Area ); static_cast<SvxTransparenceTabPage&>(rPage).SetPageType( PageType::Area );
static_cast<SvxTransparenceTabPage&>(rPage).SetDlgType( 0 ); static_cast<SvxTransparenceTabPage&>(rPage).SetDlgType( 0 );
} }
} }
......
cui/source/tabpages/tpshadow.cxx
Dosyayı görüntüle @ 9ae23dfa
...@@ -416,7 +416,6 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs ) ...@@ -416,7 +416,6 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs )
ModifyShadowHdl_Impl(*m_xMtrTransparent); ModifyShadowHdl_Impl(*m_xMtrTransparent);
} }
VclPtr<SfxTabPage> SvxShadowTabPage::Create( TabPageParent pParent, VclPtr<SfxTabPage> SvxShadowTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrs ) const SfxItemSet* rAttrs )
{ {
...@@ -428,10 +427,12 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl, weld::ToggleButton&, void ...@@ -428,10 +427,12 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl, weld::ToggleButton&, void
if (m_xTsbShowShadow->get_state() == TRISTATE_FALSE) if (m_xTsbShowShadow->get_state() == TRISTATE_FALSE)
{ {
m_xGridShadow->set_sensitive(false); m_xGridShadow->set_sensitive(false);
m_xCtlPosition->set_sensitive(false);
} }
else else
{ {
m_xGridShadow->set_sensitive(true); m_xGridShadow->set_sensitive(true);
m_xCtlPosition->set_sensitive(true);
} }
m_aCtlPosition.Invalidate(); m_aCtlPosition.Invalidate();
ModifyShadowHdl_Impl(*m_xMtrTransparent); ModifyShadowHdl_Impl(*m_xMtrTransparent);
......
cui/uiconfig/ui/areadialog.ui
Dosyayı görüntüle @ 9ae23dfa
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 --> <!-- Generated with glade 3.22.1 -->
<interface domain="cui"> <interface domain="cui">
<requires lib="gtk+" version="3.18"/> <requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="AreaDialog"> <object class="GtkDialog" id="AreaDialog">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="title" translatable="yes" context="areadialog|AreaDialog">Area</property> <property name="title" translatable="yes" context="areadialog|AreaDialog">Area</property>
<property name="resizable">False</property> <property name="modal">True</property>
<property name="default_width">0</property>
<property name="default_height">0</property>
<property name="type_hint">dialog</property> <property name="type_hint">dialog</property>
<child>
<placeholder/>
</child>
<child internal-child="vbox"> <child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1"> <object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property> <property name="can_focus">False</property>
...@@ -18,12 +23,10 @@ ...@@ -18,12 +23,10 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="layout_style">end</property> <property name="layout_style">end</property>
<child> <child>
<object class="GtkButton" id="ok"> <object class="GtkButton" id="reset">
<property name="label">gtk-ok</property> <property name="label">gtk-revert-to-saved</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
</object> </object>
...@@ -34,10 +37,12 @@ ...@@ -34,10 +37,12 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="cancel"> <object class="GtkButton" id="ok">
<property name="label">gtk-cancel</property> <property name="label">gtk-ok</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
</object> </object>
...@@ -48,8 +53,8 @@ ...@@ -48,8 +53,8 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="help"> <object class="GtkButton" id="cancel">
<property name="label">gtk-help</property> <property name="label">gtk-cancel</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
...@@ -59,12 +64,11 @@ ...@@ -59,12 +64,11 @@
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">2</property>
<property name="secondary">True</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="reset"> <object class="GtkButton" id="help">
<property name="label">gtk-revert-to-saved</property> <property name="label">gtk-help</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
...@@ -74,6 +78,7 @@ ...@@ -74,6 +78,7 @@
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">3</property> <property name="position">3</property>
<property name="secondary">True</property>
</packing> </packing>
</child> </child>
</object> </object>
...@@ -87,7 +92,7 @@ ...@@ -87,7 +92,7 @@
<child> <child>
<object class="GtkNotebook" id="tabcontrol"> <object class="GtkNotebook" id="tabcontrol">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<child> <child>
...@@ -97,6 +102,30 @@ ...@@ -97,6 +102,30 @@
<child> <child>
<placeholder/> <placeholder/>
</child> </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> </object>
</child> </child>
<child type="tab"> <child type="tab">
...@@ -116,6 +145,30 @@ ...@@ -116,6 +145,30 @@
<child> <child>
<placeholder/> <placeholder/>
</child> </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> </object>
<packing> <packing>
<property name="position">1</property> <property name="position">1</property>
...@@ -139,6 +192,30 @@ ...@@ -139,6 +192,30 @@
<child> <child>
<placeholder/> <placeholder/>
</child> </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> </object>
<packing> <packing>
<property name="position">2</property> <property name="position">2</property>
...@@ -165,10 +242,10 @@ ...@@ -165,10 +242,10 @@
</object> </object>
</child> </child>
<action-widgets> <action-widgets>
<action-widget response="0">reset</action-widget>
<action-widget response="-5">ok</action-widget> <action-widget response="-5">ok</action-widget>
<action-widget response="-6">cancel</action-widget> <action-widget response="-6">cancel</action-widget>
<action-widget response="-11">help</action-widget> <action-widget response="-11">help</action-widget>
<action-widget response="0">reset</action-widget>
</action-widgets> </action-widgets>
</object> </object>
</interface> </interface>
cui/uiconfig/ui/shadowtabpage.ui
Dosyayı görüntüle @ 9ae23dfa
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<!-- Generated with glade 3.22.1 --> <!-- Generated with glade 3.22.1 -->
<interface domain="cui"> <interface domain="cui">
<requires lib="gtk+" version="3.18"/> <requires lib="gtk+" version="3.18"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="adjustmentDistance"> <object class="GtkAdjustment" id="adjustmentDistance">
<property name="upper">999</property> <property name="upper">999</property>
<property name="step_increment">1</property> <property name="step_increment">1</property>
...@@ -16,6 +15,9 @@ ...@@ -16,6 +15,9 @@
<object class="GtkFrame" id="ShadowTabPage"> <object class="GtkFrame" id="ShadowTabPage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="shadow_type">none</property> <property name="shadow_type">none</property>
......
cui/uiconfig/ui/transparencytabpage.ui
Dosyayı görüntüle @ 9ae23dfa
...@@ -40,7 +40,9 @@ ...@@ -40,7 +40,9 @@
<object class="GtkFrame" id="TransparencyTabPage"> <object class="GtkFrame" id="TransparencyTabPage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="valign">start</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="shadow_type">none</property> <property name="shadow_type">none</property>
......
include/svx/svxdlg.hxx
Dosyayı görüntüle @ 9ae23dfa
...@@ -426,10 +426,10 @@ public: ...@@ -426,10 +426,10 @@ public:
const Graphic& rGraphic)=0; const Graphic& rGraphic)=0;
virtual VclPtr<AbstractGraphicFilterDialog> CreateGraphicFilterMosaic (vcl::Window* pParent, virtual VclPtr<AbstractGraphicFilterDialog> CreateGraphicFilterMosaic (vcl::Window* pParent,
const Graphic& rGraphic)=0; const Graphic& rGraphic)=0;
virtual VclPtr<AbstractSvxAreaTabDialog> CreateSvxAreaTabDialog( vcl::Window* pParent, virtual VclPtr<AbstractSvxAreaTabDialog> CreateSvxAreaTabDialog(weld::Window* pParent,
const SfxItemSet* pAttr, const SfxItemSet* pAttr,
SdrModel* pModel, SdrModel* pModel,
bool bShadow) = 0 ; bool bShadow) = 0 ;
virtual VclPtr<SfxAbstractTabDialog> CreateSvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog virtual VclPtr<SfxAbstractTabDialog> CreateSvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog
SdrModel* pModel, SdrModel* pModel,
const SdrObject* pObj, const SdrObject* pObj,
......
reportdesign/source/ui/misc/UITools.cxx
Dosyayı görüntüle @ 9ae23dfa
...@@ -743,7 +743,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R ...@@ -743,7 +743,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R
std::shared_ptr<rptui::OReportModel> pModel = ::reportdesign::OReportDefinition::getSdrModel(_xShape->getSection()->getReportDefinition()); std::shared_ptr<rptui::OReportModel> pModel = ::reportdesign::OReportDefinition::getSdrModel(_xShape->getSection()->getReportDefinition());
VclPtr<vcl::Window> pParent = VCLUnoHelper::GetWindow( _rxParentWindow ); weld::Window* pParent = Application::GetFrameWeld(_rxParentWindow);
bool bSuccess = false; bool bSuccess = false;
try try
...@@ -754,7 +754,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R ...@@ -754,7 +754,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R
{ // want the dialog to be destroyed before our set { // want the dialog to be destroyed before our set
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
ScopedVclPtr<AbstractSvxAreaTabDialog> pDialog(pFact->CreateSvxAreaTabDialog( pParent,pDescriptor.get(),pModel.get(), true )); ScopedVclPtr<AbstractSvxAreaTabDialog> pDialog(pFact->CreateSvxAreaTabDialog(pParent, pDescriptor.get(), pModel.get(), true));
if ( RET_OK == pDialog->Execute() ) if ( RET_OK == pDialog->Execute() )
{ {
bSuccess = true; bSuccess = true;
......
sc/source/ui/drawfunc/drawsh.cxx
Dosyayı görüntüle @ 9ae23dfa
...@@ -415,8 +415,9 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq ) ...@@ -415,8 +415,9 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq )
pView->MergeAttrFromMarked( aNewAttr, false ); pView->MergeAttrFromMarked( aNewAttr, false );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
vcl::Window* pWin = pViewData->GetDialogParent();
ScopedVclPtr<AbstractSvxAreaTabDialog> pDlg(pFact->CreateSvxAreaTabDialog( ScopedVclPtr<AbstractSvxAreaTabDialog> pDlg(pFact->CreateSvxAreaTabDialog(
pViewData->GetDialogParent(), &aNewAttr, pWin ? pWin->GetFrameWeld() : nullptr, &aNewAttr,
pViewData->GetDocument()->GetDrawLayer(), true)); pViewData->GetDocument()->GetDrawLayer(), true));
if ( pDlg->Execute() == RET_OK ) if ( pDlg->Execute() == RET_OK )
......
sd/source/ui/func/fuarea.cxx
Dosyayı görüntüle @ 9ae23dfa
...@@ -61,7 +61,7 @@ void FuArea::DoExecute( SfxRequest& rReq ) ...@@ -61,7 +61,7 @@ void FuArea::DoExecute( SfxRequest& rReq )
mpView->GetAttributes( aNewAttr ); mpView->GetAttributes( aNewAttr );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
VclPtr<AbstractSvxAreaTabDialog> pDlg( pFact->CreateSvxAreaTabDialog(mpViewShell->GetActiveWindow(), &aNewAttr, mpDoc, true) ); VclPtr<AbstractSvxAreaTabDialog> pDlg(pFact->CreateSvxAreaTabDialog(mpViewShell->GetFrameWeld(), &aNewAttr, mpDoc, true));
pDlg->StartExecuteAsync([=](sal_Int32 nResult){ pDlg->StartExecuteAsync([=](sal_Int32 nResult){
if (nResult == RET_OK) if (nResult == RET_OK)
...@@ -84,6 +84,8 @@ void FuArea::DoExecute( SfxRequest& rReq ) ...@@ -84,6 +84,8 @@ void FuArea::DoExecute( SfxRequest& rReq )
// deferred until the dialog ends // deferred until the dialog ends
mpViewShell->Cancel(); mpViewShell->Cancel();
pDlg->disposeOnce();
}); });
} }
......
sw/source/uibase/shells/drawdlg.cxx
Dosyayı görüntüle @ 9ae23dfa
...@@ -92,7 +92,7 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq) ...@@ -92,7 +92,7 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
bool bHasMarked = pView->AreObjectsMarked(); bool bHasMarked = pView->AreObjectsMarked();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
ScopedVclPtr<AbstractSvxAreaTabDialog> pDlg(pFact->CreateSvxAreaTabDialog( nullptr, ScopedVclPtr<AbstractSvxAreaTabDialog> pDlg(pFact->CreateSvxAreaTabDialog(rReq.GetFrameWeld(),
&aNewAttr, &aNewAttr,
pDoc, pDoc,
true)); true));
......
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