Skip to content

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

weld SwSectionPropertyTabDialog 

Change-Id: I1958c4bcbd4e4acc1af1b81abd4dd6955a1a3de6
Reviewed-on: https://gerrit.libreoffice.org/69298
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst d06f63db
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 29 deletions
sw/source/ui/dialog/uiregionsw.cxx
Dosyayı görüntüle @ 9bfdd19d
...@@ -1143,10 +1143,10 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl, Button*, void) ...@@ -1143,10 +1143,10 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl, Button*, void)
aSet.Put(SwFormatFrameSize(ATT_VAR_SIZE, nWidth)); aSet.Put(SwFormatFrameSize(ATT_VAR_SIZE, nWidth));
aSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(nWidth, nWidth))); aSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(nWidth, nWidth)));
ScopedVclPtrInstance< SwSectionPropertyTabDialog > aTabDlg(this, aSet, rSh); SwSectionPropertyTabDialog aTabDlg(GetFrameWeld(), aSet, rSh);
if(RET_OK == aTabDlg->Execute()) if (RET_OK == aTabDlg.run())
{ {
const SfxItemSet* pOutSet = aTabDlg->GetOutputItemSet(); const SfxItemSet* pOutSet = aTabDlg.GetOutputItemSet();
if( pOutSet && pOutSet->Count() ) if( pOutSet && pOutSet->Count() )
{ {
const SfxPoolItem *pColItem, *pBrushItem, const SfxPoolItem *pColItem, *pBrushItem,
...@@ -2123,26 +2123,26 @@ IMPL_LINK( SwSectionFootnoteEndTabPage, FootEndHdl, weld::ToggleButton&, rBox, v ...@@ -2123,26 +2123,26 @@ IMPL_LINK( SwSectionFootnoteEndTabPage, FootEndHdl, weld::ToggleButton&, rBox, v
} }
SwSectionPropertyTabDialog::SwSectionPropertyTabDialog( SwSectionPropertyTabDialog::SwSectionPropertyTabDialog(
vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) weld::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh)
: SfxTabDialog(pParent, "FormatSectionDialog", : SfxTabDialogController(pParent, "modules/swriter/ui/formatsectiondialog.ui",
"modules/swriter/ui/formatsectiondialog.ui", &rSet) "FormatSectionDialog", &rSet)
, rWrtSh(rSh) , rWrtSh(rSh)
{ {
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
m_nColumnPageId = AddTabPage("columns", SwColumnPage::Create); AddTabPage("columns", SwColumnPage::Create, nullptr);
m_nBackPageId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ) ); AddTabPage("background", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), nullptr);
m_nNotePageId = AddTabPage("notes", SwSectionFootnoteEndTabPage::Create); AddTabPage("notes", SwSectionFootnoteEndTabPage::Create, nullptr);
m_nIndentPage = AddTabPage("indents", SwSectionIndentTabPage::Create); AddTabPage("indents", SwSectionIndentTabPage::Create, nullptr);
SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
long nHtmlMode = rHtmlOpt.GetExportMode(); long nHtmlMode = rHtmlOpt.GetExportMode();
bool bWeb = dynamic_cast<SwWebDocShell*>( rSh.GetView().GetDocShell() ) != nullptr ; bool bWeb = dynamic_cast<SwWebDocShell*>( rSh.GetView().GetDocShell() ) != nullptr ;
if(bWeb) if(bWeb)
{ {
RemoveTabPage(m_nNotePageId); RemoveTabPage("notes");
RemoveTabPage(m_nIndentPage); RemoveTabPage("indents");
if( HTML_CFG_NS40 != nHtmlMode && HTML_CFG_WRITER != nHtmlMode) if( HTML_CFG_NS40 != nHtmlMode && HTML_CFG_WRITER != nHtmlMode)
RemoveTabPage(m_nColumnPageId); RemoveTabPage("columns");
} }
} }
...@@ -2150,20 +2150,20 @@ SwSectionPropertyTabDialog::~SwSectionPropertyTabDialog() ...@@ -2150,20 +2150,20 @@ SwSectionPropertyTabDialog::~SwSectionPropertyTabDialog()
{ {
} }
void SwSectionPropertyTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) void SwSectionPropertyTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
{ {
if (nId == m_nBackPageId) if (rId == "background")
{ {
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_SELECTOR))); aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_SELECTOR)));
rPage.PageCreated(aSet); rPage.PageCreated(aSet);
} }
else if (nId == m_nColumnPageId) else if (rId == "columns")
{ {
static_cast<SwColumnPage&>(rPage).ShowBalance(true); static_cast<SwColumnPage&>(rPage).ShowBalance(true);
static_cast<SwColumnPage&>(rPage).SetInSection(true); static_cast<SwColumnPage&>(rPage).SetInSection(true);
} }
else if (nId == m_nIndentPage) else if (rId == "indents")
static_cast<SwSectionIndentTabPage&>(rPage).SetWrtShell(rWrtSh); static_cast<SwSectionIndentTabPage&>(rPage).SetWrtShell(rWrtSh);
} }
......
sw/source/uibase/inc/regionsw.hxx
Dosyayı görüntüle @ 9bfdd19d
...@@ -257,19 +257,14 @@ public: ...@@ -257,19 +257,14 @@ public:
SwSectionData * GetSectionData() { return m_pSectionData.get(); } SwSectionData * GetSectionData() { return m_pSectionData.get(); }
}; };
class SwSectionPropertyTabDialog : public SfxTabDialog class SwSectionPropertyTabDialog : public SfxTabDialogController
{ {
SwWrtShell& rWrtSh; SwWrtShell& rWrtSh;
sal_uInt16 m_nColumnPageId;
sal_uInt16 m_nBackPageId;
sal_uInt16 m_nNotePageId;
sal_uInt16 m_nIndentPage;
protected: protected:
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
public: public:
SwSectionPropertyTabDialog(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); SwSectionPropertyTabDialog(weld::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh);
virtual ~SwSectionPropertyTabDialog() override; virtual ~SwSectionPropertyTabDialog() override;
}; };
......
sw/uiconfig/swriter/ui/formatsectiondialog.ui
Dosyayı görüntüle @ 9bfdd19d
<?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="sw"> <interface domain="sw">
<requires lib="gtk+" version="3.18"/> <requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="FormatSectionDialog"> <object class="GtkDialog" id="FormatSectionDialog">
...@@ -7,7 +7,13 @@ ...@@ -7,7 +7,13 @@
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="title" translatable="yes" context="formatsectiondialog|FormatSectionDialog">Options</property> <property name="title" translatable="yes" context="formatsectiondialog|FormatSectionDialog">Options</property>
<property name="resizable">False</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>
...@@ -100,6 +106,30 @@ ...@@ -100,6 +106,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">
...@@ -119,6 +149,30 @@ ...@@ -119,6 +149,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>
...@@ -142,6 +196,30 @@ ...@@ -142,6 +196,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,6 +243,30 @@ ...@@ -165,6 +243,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">3</property> <property name="position">3</property>
......
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