Skip to content

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

weld ScGroupDlg 

Change-Id: If62c664dbc068bde3fee552aabe35243eeb28a47
Reviewed-on: https://gerrit.libreoffice.org/53659Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 58c07ae9
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 52 deletions
sc/inc/scabstdlg.hxx
Dosyayı görüntüle @ 7c112da2
...@@ -440,8 +440,7 @@ public: ...@@ -440,8 +440,7 @@ public:
double fMax, double fMax,
sal_uInt16 nPossDir) = 0; sal_uInt16 nPossDir) = 0;
virtual VclPtr<AbstractScGroupDlg> CreateAbstractScGroupDlg( vcl::Window* pParent, virtual VclPtr<AbstractScGroupDlg> CreateAbstractScGroupDlg(weld::Window* pParent, bool bUnGroup = false) = 0;
bool bUnGroup = false ) = 0;
virtual VclPtr<AbstractScInsertCellDlg> CreateScInsertCellDlg(weld::Window* pParent, virtual VclPtr<AbstractScInsertCellDlg> CreateScInsertCellDlg(weld::Window* pParent,
bool bDisallowCellMove) = 0; bool bDisallowCellMove) = 0;
......
sc/source/ui/attrdlg/scdlgfact.cxx
Dosyayı görüntüle @ 7c112da2
...@@ -97,7 +97,11 @@ short AbstractScDeleteContentsDlg_Impl::Execute() ...@@ -97,7 +97,11 @@ short AbstractScDeleteContentsDlg_Impl::Execute()
} }
IMPL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScGroupDlg_Impl);
short AbstractScGroupDlg_Impl::Execute()
{
return m_xDlg->run();
}
short AbstractScInsertCellDlg_Impl::Execute() short AbstractScInsertCellDlg_Impl::Execute()
{ {
...@@ -307,7 +311,7 @@ void AbstractScFillSeriesDlg_Impl::SetEdStartValEnabled(bool bFlag) ...@@ -307,7 +311,7 @@ void AbstractScFillSeriesDlg_Impl::SetEdStartValEnabled(bool bFlag)
bool AbstractScGroupDlg_Impl::GetColsChecked() const bool AbstractScGroupDlg_Impl::GetColsChecked() const
{ {
return pDlg->GetColsChecked(); return m_xDlg->GetColsChecked();
} }
InsCellCmd AbstractScInsertCellDlg_Impl::GetInsCellCmd() const InsCellCmd AbstractScInsertCellDlg_Impl::GetInsCellCmd() const
...@@ -721,11 +725,9 @@ VclPtr<AbstractScFillSeriesDlg> ScAbstractDialogFactory_Impl::CreateScFillSeries ...@@ -721,11 +725,9 @@ VclPtr<AbstractScFillSeriesDlg> ScAbstractDialogFactory_Impl::CreateScFillSeries
return VclPtr<AbstractScFillSeriesDlg_Impl>::Create( pDlg ); return VclPtr<AbstractScFillSeriesDlg_Impl>::Create( pDlg );
} }
VclPtr<AbstractScGroupDlg> ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( vcl::Window* pParent, VclPtr<AbstractScGroupDlg> ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg(weld::Window* pParent, bool bUnGroup)
bool bUnGroup )
{ {
VclPtr<ScGroupDlg> pDlg = VclPtr<ScGroupDlg>::Create( pParent, bUnGroup, true/*bRows*/); return VclPtr<AbstractScGroupDlg_Impl>::Create(new ScGroupDlg(pParent, bUnGroup, true/*bRows*/));
return VclPtr<AbstractScGroupDlg_Impl>::Create( pDlg );
} }
VclPtr<AbstractScInsertCellDlg> ScAbstractDialogFactory_Impl::CreateScInsertCellDlg(weld::Window* pParent, VclPtr<AbstractScInsertCellDlg> ScAbstractDialogFactory_Impl::CreateScInsertCellDlg(weld::Window* pParent,
......
sc/source/ui/attrdlg/scdlgfact.hxx
Dosyayı görüntüle @ 7c112da2
...@@ -206,7 +206,13 @@ class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg ...@@ -206,7 +206,13 @@ class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg
class AbstractScGroupDlg_Impl : public AbstractScGroupDlg class AbstractScGroupDlg_Impl : public AbstractScGroupDlg
{ {
DECL_ABSTDLG_BASE( AbstractScGroupDlg_Impl, ScGroupDlg) std::unique_ptr<ScGroupDlg> m_xDlg;
public:
explicit AbstractScGroupDlg_Impl(ScGroupDlg* p)
: m_xDlg(p)
{
}
virtual short Execute() override;
virtual bool GetColsChecked() const override; virtual bool GetColsChecked() const override;
}; };
...@@ -469,8 +475,7 @@ public: ...@@ -469,8 +475,7 @@ public:
double fStep, double fStep,
double fMax, double fMax,
sal_uInt16 nPossDir) override; sal_uInt16 nPossDir) override;
virtual VclPtr<AbstractScGroupDlg> CreateAbstractScGroupDlg( vcl::Window* pParent, virtual VclPtr<AbstractScGroupDlg> CreateAbstractScGroupDlg(weld::Window* pParent, bool bUnGroup = false) override;
bool bUnGroup = false) override;
virtual VclPtr<AbstractScInsertCellDlg> CreateScInsertCellDlg(weld::Window* pParent, virtual VclPtr<AbstractScInsertCellDlg> CreateScInsertCellDlg(weld::Window* pParent,
bool bDisallowCellMove) override; bool bDisallowCellMove) override;
......
sc/source/ui/inc/groupdlg.hxx
Dosyayı görüntüle @ 7c112da2
...@@ -20,21 +20,18 @@ ...@@ -20,21 +20,18 @@
#ifndef INCLUDED_SC_SOURCE_UI_INC_GROUPDLG_HXX #ifndef INCLUDED_SC_SOURCE_UI_INC_GROUPDLG_HXX
#define INCLUDED_SC_SOURCE_UI_INC_GROUPDLG_HXX #define INCLUDED_SC_SOURCE_UI_INC_GROUPDLG_HXX
#include <vcl/dialog.hxx> #include <vcl/weld.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
class ScGroupDlg : public ModalDialog class ScGroupDlg : public weld::GenericDialogController
{ {
public: public:
ScGroupDlg(vcl::Window* pParent, bool bUnGroup, bool bRows); ScGroupDlg(weld::Window* pParent, bool bUnGroup, bool bRows);
virtual ~ScGroupDlg() override; virtual ~ScGroupDlg() override;
virtual void dispose() override;
bool GetColsChecked() const; bool GetColsChecked() const;
private: private:
VclPtr<RadioButton> m_pBtnRows; std::unique_ptr<weld::RadioButton> m_xBtnRows;
VclPtr<RadioButton> m_pBtnCols; std::unique_ptr<weld::RadioButton> m_xBtnCols;
}; };
#endif // INCLUDED_SC_SOURCE_UI_INC_GROUPDLG_HXX #endif // INCLUDED_SC_SOURCE_UI_INC_GROUPDLG_HXX
......
sc/source/ui/miscdlgs/groupdlg.cxx
Dosyayı görüntüle @ 7c112da2
...@@ -21,41 +21,32 @@ ...@@ -21,41 +21,32 @@
#include <groupdlg.hxx> #include <groupdlg.hxx>
ScGroupDlg::ScGroupDlg(vcl::Window* pParent, bool bUngroup, bool bRows) ScGroupDlg::ScGroupDlg(weld::Window* pParent, bool bUngroup, bool bRows)
: ModalDialog(pParent, : GenericDialogController(pParent,
bUngroup ?
OUString("UngroupDialog") :
OUString("GroupDialog"),
bUngroup ? bUngroup ?
OUString("modules/scalc/ui/ungroupdialog.ui") : OUString("modules/scalc/ui/ungroupdialog.ui") :
OUString("modules/scalc/ui/groupdialog.ui")) OUString("modules/scalc/ui/groupdialog.ui")
,
bUngroup ?
OString("UngroupDialog") :
OString("GroupDialog"))
, m_xBtnRows(m_xBuilder->weld_radio_button("rows"))
, m_xBtnCols(m_xBuilder->weld_radio_button("cols"))
{ {
get(m_pBtnRows, "rows"); if (bRows)
get(m_pBtnCols, "cols"); m_xBtnRows->set_active(true);
if ( bRows )
m_pBtnRows->Check();
else else
m_pBtnCols->Check(); m_xBtnCols->set_active(true);
m_xBtnRows->grab_focus();
m_pBtnRows->GrabFocus();
} }
ScGroupDlg::~ScGroupDlg() ScGroupDlg::~ScGroupDlg()
{ {
disposeOnce();
}
void ScGroupDlg::dispose()
{
m_pBtnRows.clear();
m_pBtnCols.clear();
ModalDialog::dispose();
} }
bool ScGroupDlg::GetColsChecked() const bool ScGroupDlg::GetColsChecked() const
{ {
return m_pBtnCols->IsChecked(); return m_xBtnCols->get_active();
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/source/ui/view/cellsh1.cxx
Dosyayı görüntüle @ 7c112da2
...@@ -1178,7 +1178,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) ...@@ -1178,7 +1178,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
ScopedVclPtr<AbstractScGroupDlg> pDlg(pFact->CreateAbstractScGroupDlg(pTabViewShell->GetDialogParent())); ScopedVclPtr<AbstractScGroupDlg> pDlg(pFact->CreateAbstractScGroupDlg(pTabViewShell->GetFrameWeld()));
OSL_ENSURE(pDlg, "Dialog create fail!"); OSL_ENSURE(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK ) if ( pDlg->Execute() == RET_OK )
bColumns = pDlg->GetColsChecked(); bColumns = pDlg->GetColsChecked();
...@@ -1238,7 +1238,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) ...@@ -1238,7 +1238,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
ScopedVclPtr<AbstractScGroupDlg> pDlg(pFact->CreateAbstractScGroupDlg(pTabViewShell->GetDialogParent(), true)); ScopedVclPtr<AbstractScGroupDlg> pDlg(pFact->CreateAbstractScGroupDlg(pTabViewShell->GetFrameWeld(), true));
OSL_ENSURE(pDlg, "Dialog create fail!"); OSL_ENSURE(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK ) if ( pDlg->Execute() == RET_OK )
bColumns = pDlg->GetColsChecked(); bColumns = pDlg->GetColsChecked();
......
sc/uiconfig/scalc/ui/groupdialog.ui
Dosyayı görüntüle @ 7c112da2
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 --> <!-- Generated with glade 3.20.4 -->
<interface domain="sc"> <interface domain="sc">
<requires lib="gtk+" version="3.18"/> <requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="GroupDialog"> <object class="GtkDialog" id="GroupDialog">
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="title" translatable="yes" context="groupdialog|GroupDialog">Group</property> <property name="title" translatable="yes" context="groupdialog|GroupDialog">Group</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 internal-child="vbox"> <child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1"> <object class="GtkBox" id="dialog-vbox1">
...@@ -61,7 +64,6 @@ ...@@ -61,7 +64,6 @@
<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> <property name="secondary">True</property>
<property name="non_homogeneous">True</property>
</packing> </packing>
</child> </child>
</object> </object>
...@@ -103,7 +105,6 @@ ...@@ -103,7 +105,6 @@
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="active">True</property> <property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">cols</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -137,8 +138,8 @@ ...@@ -137,8 +138,8 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="groupdialog|includeLabel">Include</property> <property name="label" translatable="yes" context="groupdialog|includeLabel">Include</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
...@@ -158,5 +159,8 @@ ...@@ -158,5 +159,8 @@
<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-widgets> </action-widgets>
<child>
<placeholder/>
</child>
</object> </object>
</interface> </interface>
sc/uiconfig/scalc/ui/ungroupdialog.ui
Dosyayı görüntüle @ 7c112da2
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 --> <!-- Generated with glade 3.20.4 -->
<interface domain="sc"> <interface domain="sc">
<requires lib="gtk+" version="3.18"/> <requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="UngroupDialog"> <object class="GtkDialog" id="UngroupDialog">
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="title" translatable="yes" context="ungroupdialog|UngroupDialog">Ungroup</property> <property name="title" translatable="yes" context="ungroupdialog|UngroupDialog">Ungroup</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 internal-child="vbox"> <child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1"> <object class="GtkBox" id="dialog-vbox1">
...@@ -61,7 +64,6 @@ ...@@ -61,7 +64,6 @@
<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> <property name="secondary">True</property>
<property name="non_homogeneous">True</property>
</packing> </packing>
</child> </child>
</object> </object>
...@@ -103,7 +105,6 @@ ...@@ -103,7 +105,6 @@
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="active">True</property> <property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">cols</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -137,8 +138,8 @@ ...@@ -137,8 +138,8 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="ungroupdialog|includeLabel">Deactivate for</property> <property name="label" translatable="yes" context="ungroupdialog|includeLabel">Deactivate for</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
...@@ -158,5 +159,8 @@ ...@@ -158,5 +159,8 @@
<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-widgets> </action-widgets>
<child>
<placeholder/>
</child>
</object> </object>
</interface> </interface>
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