Skip to content

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

weld SvxSearchFormatDialog 

Change-Id: Iefe6c616dc5f6bd525ed9708785846626f43c9b6
Reviewed-on: https://gerrit.libreoffice.org/60579
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 88582ebe
Hide whitespace changes
Inline Side-by-side
Showing with 254 additions and 52 deletions
cui/source/dialogs/srchxtra.cxx
Dosyayı görüntüle @ c090d2fc
...@@ -33,22 +33,18 @@ ...@@ -33,22 +33,18 @@
#include <rtl/strbuf.hxx> #include <rtl/strbuf.hxx>
#include <svtools/treelistentry.hxx> #include <svtools/treelistentry.hxx>
SvxSearchFormatDialog::SvxSearchFormatDialog(vcl::Window* pParent, const SfxItemSet& rSet) SvxSearchFormatDialog::SvxSearchFormatDialog(weld::Window* pParent, const SfxItemSet& rSet)
: SfxTabDialog(pParent, "SearchFormatDialog", "cui/ui/searchformatdialog.ui", &rSet) : SfxTabDialogController(pParent, "cui/ui/searchformatdialog.ui", "SearchFormatDialog", &rSet)
, m_nNamePageId(0)
, m_nParaStdPageId(0)
, m_nParaAlignPageId(0)
, m_nBackPageId(0)
{ {
m_nNamePageId = AddTabPage("font", SvxCharNamePage::Create, nullptr); AddTabPage("font", SvxCharNamePage::Create, nullptr);
AddTabPage("fonteffects", SvxCharEffectsPage::Create, nullptr); AddTabPage("fonteffects", SvxCharEffectsPage::Create, nullptr);
AddTabPage("position", SvxCharPositionPage::Create, nullptr); AddTabPage("position", SvxCharPositionPage::Create, nullptr);
AddTabPage("asianlayout", SvxCharTwoLinesPage::Create, nullptr); AddTabPage("asianlayout", SvxCharTwoLinesPage::Create, nullptr);
m_nParaStdPageId = AddTabPage("labelTP_PARA_STD", SvxStdParagraphTabPage::Create, nullptr); AddTabPage("labelTP_PARA_STD", SvxStdParagraphTabPage::Create, nullptr);
m_nParaAlignPageId = AddTabPage("labelTP_PARA_ALIGN", SvxParaAlignTabPage::Create, nullptr); AddTabPage("labelTP_PARA_ALIGN", SvxParaAlignTabPage::Create, nullptr);
AddTabPage("labelTP_PARA_EXT", SvxExtParagraphTabPage::Create, nullptr); AddTabPage("labelTP_PARA_EXT", SvxExtParagraphTabPage::Create, nullptr);
AddTabPage("labelTP_PARA_ASIAN", SvxAsianTabPage::Create, nullptr ); AddTabPage("labelTP_PARA_ASIAN", SvxAsianTabPage::Create, nullptr );
m_nBackPageId = AddTabPage("background", SvxBackgroundTabPage::Create, nullptr); AddTabPage("background", SvxBackgroundTabPage::Create, nullptr);
// remove asian tabpages if necessary // remove asian tabpages if necessary
SvtCJKOptions aCJKOptions; SvtCJKOptions aCJKOptions;
...@@ -60,18 +56,11 @@ SvxSearchFormatDialog::SvxSearchFormatDialog(vcl::Window* pParent, const SfxItem ...@@ -60,18 +56,11 @@ SvxSearchFormatDialog::SvxSearchFormatDialog(vcl::Window* pParent, const SfxItem
SvxSearchFormatDialog::~SvxSearchFormatDialog() SvxSearchFormatDialog::~SvxSearchFormatDialog()
{ {
disposeOnce();
}
void SvxSearchFormatDialog::dispose()
{
m_pFontList.reset();
SfxTabDialog::dispose();
} }
void SvxSearchFormatDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) void SvxSearchFormatDialog::PageCreated(const OString& rId, SfxTabPage& rPage)
{ {
if (nId == m_nNamePageId) if (rId == "font")
{ {
const FontList* pApm_pFontList = nullptr; const FontList* pApm_pFontList = nullptr;
SfxObjectShell* pSh = SfxObjectShell::Current(); SfxObjectShell* pSh = SfxObjectShell::Current();
...@@ -89,7 +78,7 @@ void SvxSearchFormatDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) ...@@ -89,7 +78,7 @@ void SvxSearchFormatDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage )
if ( !pList ) if ( !pList )
{ {
if ( !m_pFontList ) if ( !m_pFontList )
m_pFontList.reset( new FontList( this ) ); m_pFontList.reset(new FontList(Application::GetDefaultDevice()));
pList = m_pFontList.get(); pList = m_pFontList.get();
} }
...@@ -98,15 +87,15 @@ void SvxSearchFormatDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) ...@@ -98,15 +87,15 @@ void SvxSearchFormatDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage )
SetFontList( SvxFontListItem( pList, SID_ATTR_CHAR_FONTLIST ) ); SetFontList( SvxFontListItem( pList, SID_ATTR_CHAR_FONTLIST ) );
static_cast<SvxCharNamePage&>(rPage).EnableSearchMode(); static_cast<SvxCharNamePage&>(rPage).EnableSearchMode();
} }
else if (nId == m_nParaStdPageId) else if (rId == "labelTP_PARA_STD")
{ {
static_cast<SvxStdParagraphTabPage&>(rPage).EnableAutoFirstLine(); static_cast<SvxStdParagraphTabPage&>(rPage).EnableAutoFirstLine();
} }
else if (nId == m_nParaAlignPageId) else if (rId == "labelTP_PARA_ALIGN")
{ {
static_cast<SvxParaAlignTabPage&>(rPage).EnableJustifyExt(); static_cast<SvxParaAlignTabPage&>(rPage).EnableJustifyExt();
} }
else if (nId == m_nBackPageId) else if (rId == "background")
{ {
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_HIGHLIGHTING))); aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_HIGHLIGHTING)));
......
cui/source/factory/dlgfact.cxx
Dosyayı görüntüle @ c090d2fc
...@@ -1143,11 +1143,11 @@ VclPtr<AbstractURLDlg> AbstractDialogFactory_Impl::CreateURLDialog( vcl::Window* ...@@ -1143,11 +1143,11 @@ VclPtr<AbstractURLDlg> AbstractDialogFactory_Impl::CreateURLDialog( vcl::Window*
return VclPtr<AbstractURLDlg_Impl>::Create( pDlg ); return VclPtr<AbstractURLDlg_Impl>::Create( pDlg );
} }
VclPtr<SfxAbstractTabDialog> AbstractDialogFactory_Impl::CreateTabItemDialog(vcl::Window* pParent, VclPtr<SfxAbstractTabDialog> AbstractDialogFactory_Impl::CreateTabItemDialog(weld::Window* pParent,
const SfxItemSet& rSet) const SfxItemSet& rSet)
{ {
VclPtrInstance<SvxSearchFormatDialog> pDlg(pParent, rSet); return VclPtr<CuiAbstractTabController_Impl>::Create(o3tl::make_unique<SvxSearchFormatDialog>(
return VclPtr<CuiAbstractTabDialog_Impl>::Create(pDlg); pParent, rSet));
} }
VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateSvxSearchAttributeDialog( vcl::Window* pParent, VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateSvxSearchAttributeDialog( vcl::Window* pParent,
......
cui/source/factory/dlgfact.hxx
Dosyayı görüntüle @ c090d2fc
...@@ -652,8 +652,7 @@ public: ...@@ -652,8 +652,7 @@ public:
virtual VclPtr<SfxAbstractTabDialog> CreateTextTabDialog( weld::Window* pParent, virtual VclPtr<SfxAbstractTabDialog> CreateTextTabDialog( weld::Window* pParent,
const SfxItemSet* pAttrSet, const SfxItemSet* pAttrSet,
SdrView* pView ) override; SdrView* pView ) override;
virtual VclPtr<SfxAbstractTabDialog> CreateTabItemDialog(vcl::Window* pParent, virtual VclPtr<SfxAbstractTabDialog> CreateTabItemDialog(weld::Window* pParent, const SfxItemSet& rSet) override;
const SfxItemSet& rSet) override;
virtual VclPtr<AbstractSvxCaptionDialog> virtual VclPtr<AbstractSvxCaptionDialog>
CreateCaptionDialog(weld::Window* pParent, CreateCaptionDialog(weld::Window* pParent,
const SdrView* pView, const SdrView* pView,
......
cui/source/inc/srchxtra.hxx
Dosyayı görüntüle @ c090d2fc
...@@ -27,22 +27,17 @@ ...@@ -27,22 +27,17 @@
#include <svx/checklbx.hxx> #include <svx/checklbx.hxx>
#include <svx/srchdlg.hxx> #include <svx/srchdlg.hxx>
class SvxSearchFormatDialog : public SfxTabDialog class SvxSearchFormatDialog : public SfxTabDialogController
{ {
public: public:
SvxSearchFormatDialog( vcl::Window* pParent, const SfxItemSet& rSet ); SvxSearchFormatDialog(weld::Window* pParent, const SfxItemSet& rSet);
virtual ~SvxSearchFormatDialog() override; virtual ~SvxSearchFormatDialog() override;
virtual void dispose() override;
protected: protected:
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
private: private:
std::unique_ptr<FontList> m_pFontList; std::unique_ptr<FontList> m_pFontList;
sal_uInt16 m_nNamePageId;
sal_uInt16 m_nParaStdPageId;
sal_uInt16 m_nParaAlignPageId;
sal_uInt16 m_nBackPageId;
}; };
// class SvxSearchFormatDialog ------------------------------------------- // class SvxSearchFormatDialog -------------------------------------------
......
cui/uiconfig/ui/searchformatdialog.ui
Dosyayı görüntüle @ c090d2fc
<?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="SearchFormatDialog"> <object class="GtkDialog" id="SearchFormatDialog">
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
<property name="title" translatable="yes" context="searchformatdialog|SearchFormatDialog">Text Format </property> <property name="title" translatable="yes" context="searchformatdialog|SearchFormatDialog">Text Format </property>
<property name="resizable">False</property> <property name="resizable">False</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 +21,10 @@ ...@@ -18,12 +21,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 +35,12 @@ ...@@ -34,10 +35,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 +51,8 @@ ...@@ -48,8 +51,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 +62,11 @@ ...@@ -59,12 +62,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 +76,7 @@ ...@@ -74,6 +76,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>
...@@ -90,6 +93,7 @@ ...@@ -90,6 +93,7 @@
<property name="can_focus">True</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>
<property name="scrollable">True</property>
<child> <child>
<object class="GtkGrid"> <object class="GtkGrid">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -97,6 +101,30 @@ ...@@ -97,6 +101,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 +144,30 @@ ...@@ -116,6 +144,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 +191,30 @@ ...@@ -139,6 +191,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>
...@@ -162,6 +238,30 @@ ...@@ -162,6 +238,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>
...@@ -185,6 +285,30 @@ ...@@ -185,6 +285,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">4</property> <property name="position">4</property>
...@@ -208,6 +332,30 @@ ...@@ -208,6 +332,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">5</property> <property name="position">5</property>
...@@ -232,6 +380,30 @@ ...@@ -232,6 +380,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">6</property> <property name="position">6</property>
...@@ -256,6 +428,30 @@ ...@@ -256,6 +428,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">7</property> <property name="position">7</property>
...@@ -279,6 +475,30 @@ ...@@ -279,6 +475,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">8</property> <property name="position">8</property>
...@@ -305,10 +525,10 @@ ...@@ -305,10 +525,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>
include/svx/svxdlg.hxx
Dosyayı görüntüle @ c090d2fc
...@@ -367,8 +367,7 @@ public: ...@@ -367,8 +367,7 @@ public:
const OUString& rTarget, const OUString& rName, const OUString& rTarget, const OUString& rName,
TargetList& rTargetList ) = 0; TargetList& rTargetList ) = 0;
virtual VclPtr<SfxAbstractTabDialog> CreateTabItemDialog(vcl::Window* pParent, virtual VclPtr<SfxAbstractTabDialog> CreateTabItemDialog(weld::Window* pParent, const SfxItemSet& rSet) = 0;
const SfxItemSet& rSet) = 0;
virtual VclPtr<VclAbstractDialog> CreateSvxSearchAttributeDialog( vcl::Window* pParent, virtual VclPtr<VclAbstractDialog> CreateSvxSearchAttributeDialog( vcl::Window* pParent,
SearchAttrItemList& rLst, SearchAttrItemList& rLst,
const sal_uInt16* pWhRanges)=0; const sal_uInt16* pWhRanges)=0;
......
svx/source/dialog/srchdlg.cxx
Dosyayı görüntüle @ c090d2fc
...@@ -2019,7 +2019,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl, Button*, void) ...@@ -2019,7 +2019,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl, Button*, void)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateTabItemDialog(this, aSet)); ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateTabItemDialog(GetFrameWeld(), aSet));
pDlg->SetText( aTxt ); pDlg->SetText( aTxt );
if ( pDlg->Execute() == RET_OK ) if ( pDlg->Execute() == RET_OK )
......
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