Skip to content

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

weld SvxFormatCellsDialog 

Change-Id: I236ddc4f58b882e648512a99306440fa88a3aeeb
Reviewed-on: https://gerrit.libreoffice.org/61017
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 0b3ca6a1
Hide whitespace changes
Inline Side-by-side
Showing with 138 additions and 38 deletions
cui/source/dialogs/sdrcelldlg.cxx
Dosyayı görüntüle @ 1e6b6f03
...@@ -25,25 +25,24 @@ ...@@ -25,25 +25,24 @@
#include <border.hxx> #include <border.hxx>
#include <svx/dialogs.hrc> #include <svx/dialogs.hrc>
SvxFormatCellsDialog::SvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrModel& rModel ) SvxFormatCellsDialog::SvxFormatCellsDialog(weld::Window* pParent, const SfxItemSet* pAttr, const SdrModel& rModel)
: SfxTabDialog(pParent, "FormatCellsDialog", "cui/ui/formatcellsdialog.ui", pAttr) : SfxTabDialogController(pParent, "cui/ui/formatcellsdialog.ui", "FormatCellsDialog", pAttr)
, mrOutAttrs(*pAttr) , mrOutAttrs(*pAttr)
, mpColorTab(rModel.GetColorList()) , mpColorTab(rModel.GetColorList())
, mpGradientList(rModel.GetGradientList()) , mpGradientList(rModel.GetGradientList())
, mpHatchingList(rModel.GetHatchList()) , mpHatchingList(rModel.GetHatchList())
, mpBitmapList(rModel.GetBitmapList()) , mpBitmapList(rModel.GetBitmapList())
, mpPatternList(rModel.GetPatternList()) , mpPatternList(rModel.GetPatternList())
, m_nAreaPageId(0)
{ {
AddTabPage("name", RID_SVXPAGE_CHAR_NAME); AddTabPage("name", RID_SVXPAGE_CHAR_NAME);
AddTabPage("effects", RID_SVXPAGE_CHAR_EFFECTS); AddTabPage("effects", RID_SVXPAGE_CHAR_EFFECTS);
m_nBorderPageId = AddTabPage("border", RID_SVXPAGE_BORDER ); AddTabPage("border", RID_SVXPAGE_BORDER );
m_nAreaPageId = AddTabPage("area", RID_SVXPAGE_AREA); AddTabPage("area", RID_SVXPAGE_AREA);
} }
void SvxFormatCellsDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) void SvxFormatCellsDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
{ {
if (nId == m_nAreaPageId) if (rId == "area")
{ {
SvxAreaTabPage& rAreaPage = static_cast<SvxAreaTabPage&>(rPage); SvxAreaTabPage& rAreaPage = static_cast<SvxAreaTabPage&>(rPage);
rAreaPage.SetColorList( mpColorTab ); rAreaPage.SetColorList( mpColorTab );
...@@ -53,13 +52,13 @@ void SvxFormatCellsDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) ...@@ -53,13 +52,13 @@ void SvxFormatCellsDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
rAreaPage.SetPatternList( mpPatternList );; rAreaPage.SetPatternList( mpPatternList );;
rAreaPage.ActivatePage( mrOutAttrs ); rAreaPage.ActivatePage( mrOutAttrs );
} }
else if (nId == m_nBorderPageId) else if (rId == "border")
{ {
SvxBorderTabPage& rBorderPage = static_cast<SvxBorderTabPage&>(rPage); SvxBorderTabPage& rBorderPage = static_cast<SvxBorderTabPage&>(rPage);
rBorderPage.SetTableMode(); rBorderPage.SetTableMode();
} }
else else
SfxTabDialog::PageCreated( nId, rPage ); SfxTabDialogController::PageCreated(rId, rPage);
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
cui/source/factory/dlgfact.cxx
Dosyayı görüntüle @ 1e6b6f03
...@@ -1618,9 +1618,9 @@ VclPtr<SfxAbstractLinksDialog> AbstractDialogFactory_Impl::CreateLinksDialog( vc ...@@ -1618,9 +1618,9 @@ VclPtr<SfxAbstractLinksDialog> AbstractDialogFactory_Impl::CreateLinksDialog( vc
return VclPtr<AbstractLinksDialog_Impl>::Create( pLinkDlg ); return VclPtr<AbstractLinksDialog_Impl>::Create( pLinkDlg );
} }
VclPtr<SfxAbstractTabDialog> AbstractDialogFactory_Impl::CreateSvxFormatCellsDialog( const SfxItemSet* pAttr, const SdrModel& rModel, const SdrObject* /*pObj*/ ) VclPtr<SfxAbstractTabDialog> AbstractDialogFactory_Impl::CreateSvxFormatCellsDialog(weld::Window* pParent, const SfxItemSet* pAttr, const SdrModel& rModel, const SdrObject* /*pObj*/)
{ {
return VclPtr<CuiAbstractTabDialog_Impl>::Create( VclPtr<SvxFormatCellsDialog>::Create( nullptr, pAttr, rModel ) ); return VclPtr<CuiAbstractTabController_Impl>::Create(o3tl::make_unique<SvxFormatCellsDialog>(pParent, pAttr, rModel));
} }
VclPtr<SvxAbstractSplitTableDialog> AbstractDialogFactory_Impl::CreateSvxSplitTableDialog(weld::Window* pParent, bool bIsTableVertical, long nMaxVertical) VclPtr<SvxAbstractSplitTableDialog> AbstractDialogFactory_Impl::CreateSvxSplitTableDialog(weld::Window* pParent, bool bIsTableVertical, long nMaxVertical)
......
cui/source/factory/dlgfact.hxx
Dosyayı görüntüle @ 1e6b6f03
...@@ -824,7 +824,7 @@ public: ...@@ -824,7 +824,7 @@ public:
const sal_uInt16 _nInitiallySelectedEvent const sal_uInt16 _nInitiallySelectedEvent
) override; ) override;
virtual VclPtr<SfxAbstractTabDialog> CreateSvxFormatCellsDialog( const SfxItemSet* pAttr, const SdrModel& rModel, const SdrObject* pObj ) override; virtual VclPtr<SfxAbstractTabDialog> CreateSvxFormatCellsDialog(weld::Window* pParent, const SfxItemSet* pAttr, const SdrModel& rModel, const SdrObject* pObj) override;
virtual VclPtr<SvxAbstractSplitTableDialog> CreateSvxSplitTableDialog(weld::Window* pParent, bool bIsTableVertical, long nMaxVertical) override; virtual VclPtr<SvxAbstractSplitTableDialog> CreateSvxSplitTableDialog(weld::Window* pParent, bool bIsTableVertical, long nMaxVertical) override;
......
cui/source/inc/sdrcelldlg.hxx
Dosyayı görüntüle @ 1e6b6f03
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <svx/xtable.hxx> #include <svx/xtable.hxx>
class SdrModel; class SdrModel;
class SvxFormatCellsDialog : public SfxTabDialog class SvxFormatCellsDialog : public SfxTabDialogController
{ {
private: private:
const SfxItemSet& mrOutAttrs; const SfxItemSet& mrOutAttrs;
...@@ -36,13 +36,10 @@ private: ...@@ -36,13 +36,10 @@ private:
XBitmapListRef mpBitmapList; XBitmapListRef mpBitmapList;
XPatternListRef mpPatternList; XPatternListRef mpPatternList;
sal_uInt16 m_nAreaPageId;
sal_uInt16 m_nBorderPageId;
public: public:
SvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrModel& rModel ); SvxFormatCellsDialog(weld::Window* pParent, const SfxItemSet* pAttr, const SdrModel& rModel);
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
}; };
......
cui/uiconfig/ui/formatcellsdialog.ui
Dosyayı görüntüle @ 1e6b6f03
<?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="FormatCellsDialog"> <object class="GtkDialog" id="FormatCellsDialog">
...@@ -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="formatcellsdialog|FormatCellsDialog">Table Properties</property> <property name="title" translatable="yes" context="formatcellsdialog|FormatCellsDialog">Table Properties</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>
...@@ -18,12 +24,10 @@ ...@@ -18,12 +24,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 +38,12 @@ ...@@ -34,10 +38,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 +54,8 @@ ...@@ -48,8 +54,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 +65,11 @@ ...@@ -59,12 +65,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 +79,7 @@ ...@@ -74,6 +79,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 +96,7 @@ ...@@ -90,6 +96,7 @@
<property name="can_focus">False</property> <property name="can_focus">False</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 +104,30 @@ ...@@ -97,6 +104,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 +147,30 @@ ...@@ -116,6 +147,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 +194,30 @@ ...@@ -139,6 +194,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 +241,30 @@ ...@@ -162,6 +241,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>
...@@ -188,10 +291,10 @@ ...@@ -188,10 +291,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/sdr/table/tablecontroller.hxx
Dosyayı görüntüle @ 1e6b6f03
...@@ -72,9 +72,9 @@ public: ...@@ -72,9 +72,9 @@ public:
SVX_DLLPRIVATE void onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs = nullptr ); SVX_DLLPRIVATE void onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs = nullptr );
SVX_DLLPRIVATE void onDelete( sal_uInt16 nSId ); SVX_DLLPRIVATE void onDelete( sal_uInt16 nSId );
SVX_DLLPRIVATE void onSelect( sal_uInt16 nSId ); SVX_DLLPRIVATE void onSelect( sal_uInt16 nSId );
SVX_DLLPRIVATE void onFormatTable( SfxRequest const & rReq ); SVX_DLLPRIVATE void onFormatTable(const SfxRequest& rReq);
SVX_DLLPRIVATE void MergeMarkedCells(); SVX_DLLPRIVATE void MergeMarkedCells();
SVX_DLLPRIVATE void SplitMarkedCells(); SVX_DLLPRIVATE void SplitMarkedCells(const SfxRequest& rReq);
SVX_DLLPRIVATE void DistributeColumns( const bool bOptimize ); SVX_DLLPRIVATE void DistributeColumns( const bool bOptimize );
SVX_DLLPRIVATE void DistributeRows( const bool bOptimize ); SVX_DLLPRIVATE void DistributeRows( const bool bOptimize );
SVX_DLLPRIVATE void SetVertical( sal_uInt16 nSId ); SVX_DLLPRIVATE void SetVertical( sal_uInt16 nSId );
......
include/svx/svxdlg.hxx
Dosyayı görüntüle @ 1e6b6f03
...@@ -462,7 +462,7 @@ public: ...@@ -462,7 +462,7 @@ public:
const sal_uInt16 _nInitiallySelectedEvent const sal_uInt16 _nInitiallySelectedEvent
) = 0; ) = 0;
virtual VclPtr<SfxAbstractTabDialog> CreateSvxFormatCellsDialog( const SfxItemSet* pAttr, const SdrModel& rModel, const SdrObject* pObj )=0; virtual VclPtr<SfxAbstractTabDialog> CreateSvxFormatCellsDialog(weld::Window* pParent, const SfxItemSet* pAttr, const SdrModel& rModel, const SdrObject* pObj )=0;
virtual VclPtr<SvxAbstractSplitTableDialog> CreateSvxSplitTableDialog(weld::Window* pParent, bool bIsTableVertical, long nMaxVertical) = 0; virtual VclPtr<SvxAbstractSplitTableDialog> CreateSvxSplitTableDialog(weld::Window* pParent, bool bIsTableVertical, long nMaxVertical) = 0;
......
svx/source/table/tablecontroller.cxx
Dosyayı görüntüle @ 1e6b6f03
...@@ -887,7 +887,7 @@ namespace ...@@ -887,7 +887,7 @@ namespace
} }
} }
void SvxTableController::onFormatTable( SfxRequest const & rReq ) void SvxTableController::onFormatTable(const SfxRequest& rReq)
{ {
if(!mxTableObj.is()) if(!mxTableObj.is())
return; return;
...@@ -912,6 +912,7 @@ void SvxTableController::onFormatTable( SfxRequest const & rReq ) ...@@ -912,6 +912,7 @@ void SvxTableController::onFormatTable( SfxRequest const & rReq )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
ScopedVclPtr<SfxAbstractTabDialog> xDlg( pFact->CreateSvxFormatCellsDialog( ScopedVclPtr<SfxAbstractTabDialog> xDlg( pFact->CreateSvxFormatCellsDialog(
rReq.GetFrameWeld(),
&aNewAttr, &aNewAttr,
rModel, rModel,
&rTableObj) ); &rTableObj) );
...@@ -999,7 +1000,7 @@ void SvxTableController::Execute( SfxRequest& rReq ) ...@@ -999,7 +1000,7 @@ void SvxTableController::Execute( SfxRequest& rReq )
break; break;
case SID_TABLE_SPLIT_CELLS: case SID_TABLE_SPLIT_CELLS:
SplitMarkedCells(); SplitMarkedCells(rReq);
break; break;
case SID_TABLE_OPTIMAL_COLUMN_WIDTH: case SID_TABLE_OPTIMAL_COLUMN_WIDTH:
...@@ -1246,13 +1247,13 @@ void SvxTableController::MergeMarkedCells() ...@@ -1246,13 +1247,13 @@ void SvxTableController::MergeMarkedCells()
} }
} }
void SvxTableController::SplitMarkedCells() void SvxTableController::SplitMarkedCells(const SfxRequest& rReq)
{ {
if(!checkTableObject() || !mxTable.is()) if(!checkTableObject() || !mxTable.is())
return; return;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
ScopedVclPtr< SvxAbstractSplitTableDialog > xDlg( pFact->CreateSvxSplitTableDialog( nullptr, false, 99 ) ); ScopedVclPtr<SvxAbstractSplitTableDialog> xDlg(pFact->CreateSvxSplitTableDialog(rReq.GetFrameWeld(), false, 99));
if( xDlg->Execute() ) if( xDlg->Execute() )
{ {
......
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