Kaydet (Commit) 74c8bc3c authored tarafından Caolán McNamara's avatar Caolán McNamara

weld ScDataPilotSourceTypeDlg and ScDataPilotServiceDlg

Change-Id: I03ef6f1994e8e1a801e4515586a6a73d3748f13b
Reviewed-on: https://gerrit.libreoffice.org/54528Tested-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 201321f6
...@@ -416,11 +416,11 @@ public: ...@@ -416,11 +416,11 @@ public:
virtual VclPtr<AbstractScDataPilotDatabaseDlg> CreateScDataPilotDatabaseDlg(vcl::Window* pParent) = 0; virtual VclPtr<AbstractScDataPilotDatabaseDlg> CreateScDataPilotDatabaseDlg(vcl::Window* pParent) = 0;
virtual VclPtr<AbstractScDataPilotSourceTypeDlg> CreateScDataPilotSourceTypeDlg(vcl::Window* pParent, virtual VclPtr<AbstractScDataPilotSourceTypeDlg> CreateScDataPilotSourceTypeDlg(weld::Window* pParent,
bool bEnableExternal) = 0; bool bEnableExternal) = 0;
virtual VclPtr<AbstractScDataPilotServiceDlg> CreateScDataPilotServiceDlg( vcl::Window* pParent, virtual VclPtr<AbstractScDataPilotServiceDlg> CreateScDataPilotServiceDlg(weld::Window* pParent,
const std::vector<OUString>& rServices ) = 0; const std::vector<OUString>& rServices) = 0;
virtual VclPtr<AbstractScDeleteCellDlg> CreateScDeleteCellDlg(weld::Window* pParent, bool bDisallowCellMove) = 0 ; virtual VclPtr<AbstractScDeleteCellDlg> CreateScDeleteCellDlg(weld::Window* pParent, bool bDisallowCellMove) = 0 ;
......
...@@ -183,7 +183,7 @@ VclPtr<VclAbstractDialog> ScScreenshotTest::createDialogByID(sal_uInt32 nID) ...@@ -183,7 +183,7 @@ VclPtr<VclAbstractDialog> ScScreenshotTest::createDialogByID(sal_uInt32 nID)
} }
case 5: // "modules/scalc/ui/selectsource.ui" case 5: // "modules/scalc/ui/selectsource.ui"
{ {
pReturnDialog = mpFact->CreateScDataPilotSourceTypeDlg(mpViewShell->GetDialogParent(), true); pReturnDialog = mpFact->CreateScDataPilotSourceTypeDlg(mpViewShell->GetFrameWeld(), true);
break; break;
} }
......
...@@ -80,8 +80,16 @@ IMPL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl); ...@@ -80,8 +80,16 @@ IMPL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScColRowLabelDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScColRowLabelDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScCondFormatManagerDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScCondFormatManagerDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScDataPilotDatabaseDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScDataPilotDatabaseDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScDataPilotSourceTypeDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScDataPilotServiceDlg_Impl); short AbstractScDataPilotSourceTypeDlg_Impl::Execute()
{
return m_xDlg->run();
}
short AbstractScDataPilotServiceDlg_Impl::Execute()
{
return m_xDlg->run();
}
short AbstractScDeleteCellDlg_Impl::Execute() short AbstractScDeleteCellDlg_Impl::Execute()
{ {
...@@ -235,52 +243,52 @@ void AbstractScDataPilotDatabaseDlg_Impl::GetValues( ScImportSourceDesc& rDesc ) ...@@ -235,52 +243,52 @@ void AbstractScDataPilotDatabaseDlg_Impl::GetValues( ScImportSourceDesc& rDesc )
bool AbstractScDataPilotSourceTypeDlg_Impl::IsDatabase() const bool AbstractScDataPilotSourceTypeDlg_Impl::IsDatabase() const
{ {
return pDlg->IsDatabase(); return m_xDlg->IsDatabase();
} }
bool AbstractScDataPilotSourceTypeDlg_Impl::IsExternal() const bool AbstractScDataPilotSourceTypeDlg_Impl::IsExternal() const
{ {
return pDlg->IsExternal(); return m_xDlg->IsExternal();
} }
bool AbstractScDataPilotSourceTypeDlg_Impl::IsNamedRange() const bool AbstractScDataPilotSourceTypeDlg_Impl::IsNamedRange() const
{ {
return pDlg->IsNamedRange(); return m_xDlg->IsNamedRange();
} }
OUString AbstractScDataPilotSourceTypeDlg_Impl::GetSelectedNamedRange() const OUString AbstractScDataPilotSourceTypeDlg_Impl::GetSelectedNamedRange() const
{ {
return pDlg->GetSelectedNamedRange(); return m_xDlg->GetSelectedNamedRange();
} }
void AbstractScDataPilotSourceTypeDlg_Impl::AppendNamedRange(const OUString& rName) void AbstractScDataPilotSourceTypeDlg_Impl::AppendNamedRange(const OUString& rName)
{ {
pDlg->AppendNamedRange(rName); m_xDlg->AppendNamedRange(rName);
} }
OUString AbstractScDataPilotServiceDlg_Impl::GetServiceName() const OUString AbstractScDataPilotServiceDlg_Impl::GetServiceName() const
{ {
return pDlg->GetServiceName(); return m_xDlg->GetServiceName();
} }
OUString AbstractScDataPilotServiceDlg_Impl::GetParSource() const OUString AbstractScDataPilotServiceDlg_Impl::GetParSource() const
{ {
return pDlg->GetParSource(); return m_xDlg->GetParSource();
} }
OUString AbstractScDataPilotServiceDlg_Impl::GetParName() const OUString AbstractScDataPilotServiceDlg_Impl::GetParName() const
{ {
return pDlg->GetParName(); return m_xDlg->GetParName();
} }
OUString AbstractScDataPilotServiceDlg_Impl::GetParUser() const OUString AbstractScDataPilotServiceDlg_Impl::GetParUser() const
{ {
return pDlg->GetParUser(); return m_xDlg->GetParUser();
} }
OUString AbstractScDataPilotServiceDlg_Impl::GetParPass() const OUString AbstractScDataPilotServiceDlg_Impl::GetParPass() const
{ {
return pDlg->GetParPass(); return m_xDlg->GetParPass();
} }
DelCellCmd AbstractScDeleteCellDlg_Impl::GetDelCellCmd() const DelCellCmd AbstractScDeleteCellDlg_Impl::GetDelCellCmd() const
...@@ -704,17 +712,15 @@ VclPtr<AbstractScDataPilotDatabaseDlg> ScAbstractDialogFactory_Impl::CreateScDat ...@@ -704,17 +712,15 @@ VclPtr<AbstractScDataPilotDatabaseDlg> ScAbstractDialogFactory_Impl::CreateScDat
} }
VclPtr<AbstractScDataPilotSourceTypeDlg> ScAbstractDialogFactory_Impl::CreateScDataPilotSourceTypeDlg( VclPtr<AbstractScDataPilotSourceTypeDlg> ScAbstractDialogFactory_Impl::CreateScDataPilotSourceTypeDlg(
vcl::Window* pParent, bool bEnableExternal) weld::Window* pParent, bool bEnableExternal)
{ {
VclPtr<ScDataPilotSourceTypeDlg> pDlg = VclPtr<ScDataPilotSourceTypeDlg>::Create(pParent, bEnableExternal); return VclPtr<AbstractScDataPilotSourceTypeDlg_Impl>::Create(new ScDataPilotSourceTypeDlg(pParent, bEnableExternal));
return VclPtr<AbstractScDataPilotSourceTypeDlg_Impl>::Create(pDlg);
} }
VclPtr<AbstractScDataPilotServiceDlg> ScAbstractDialogFactory_Impl::CreateScDataPilotServiceDlg( vcl::Window* pParent, VclPtr<AbstractScDataPilotServiceDlg> ScAbstractDialogFactory_Impl::CreateScDataPilotServiceDlg(weld::Window* pParent,
const std::vector<OUString>& rServices ) const std::vector<OUString>& rServices)
{ {
VclPtr<ScDataPilotServiceDlg> pDlg = VclPtr<ScDataPilotServiceDlg>::Create( pParent, rServices ); return VclPtr<AbstractScDataPilotServiceDlg_Impl>::Create(new ScDataPilotServiceDlg(pParent, rServices));
return VclPtr<AbstractScDataPilotServiceDlg_Impl>::Create( pDlg );
} }
VclPtr<AbstractScDeleteCellDlg> ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg(weld::Window* pParent, VclPtr<AbstractScDeleteCellDlg> ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg(weld::Window* pParent,
......
...@@ -142,7 +142,13 @@ class AbstractScDataPilotDatabaseDlg_Impl :public AbstractScDataPilotDatabaseDl ...@@ -142,7 +142,13 @@ class AbstractScDataPilotDatabaseDlg_Impl :public AbstractScDataPilotDatabaseDl
class AbstractScDataPilotSourceTypeDlg_Impl :public AbstractScDataPilotSourceTypeDlg class AbstractScDataPilotSourceTypeDlg_Impl :public AbstractScDataPilotSourceTypeDlg
{ {
DECL_ABSTDLG_BASE(AbstractScDataPilotSourceTypeDlg_Impl, ScDataPilotSourceTypeDlg) std::unique_ptr<ScDataPilotSourceTypeDlg> m_xDlg;
public:
explicit AbstractScDataPilotSourceTypeDlg_Impl(ScDataPilotSourceTypeDlg* p)
: m_xDlg(p)
{
}
virtual short Execute() override;
virtual bool IsDatabase() const override; virtual bool IsDatabase() const override;
virtual bool IsExternal() const override; virtual bool IsExternal() const override;
virtual bool IsNamedRange() const override; virtual bool IsNamedRange() const override;
...@@ -152,7 +158,13 @@ class AbstractScDataPilotSourceTypeDlg_Impl :public AbstractScDataPilotSourceTy ...@@ -152,7 +158,13 @@ class AbstractScDataPilotSourceTypeDlg_Impl :public AbstractScDataPilotSourceTy
class AbstractScDataPilotServiceDlg_Impl : public AbstractScDataPilotServiceDlg class AbstractScDataPilotServiceDlg_Impl : public AbstractScDataPilotServiceDlg
{ {
DECL_ABSTDLG_BASE(AbstractScDataPilotServiceDlg_Impl, ScDataPilotServiceDlg) std::unique_ptr<ScDataPilotServiceDlg> m_xDlg;
public:
explicit AbstractScDataPilotServiceDlg_Impl(ScDataPilotServiceDlg* p)
: m_xDlg(p)
{
}
virtual short Execute() override;
virtual OUString GetServiceName() const override; virtual OUString GetServiceName() const override;
virtual OUString GetParSource() const override; virtual OUString GetParSource() const override;
virtual OUString GetParName() const override; virtual OUString GetParName() const override;
...@@ -490,11 +502,11 @@ public: ...@@ -490,11 +502,11 @@ public:
virtual VclPtr<AbstractScDataPilotDatabaseDlg> CreateScDataPilotDatabaseDlg(vcl::Window* pParent) override; virtual VclPtr<AbstractScDataPilotDatabaseDlg> CreateScDataPilotDatabaseDlg(vcl::Window* pParent) override;
virtual VclPtr<AbstractScDataPilotSourceTypeDlg> CreateScDataPilotSourceTypeDlg(vcl::Window* pParent, virtual VclPtr<AbstractScDataPilotSourceTypeDlg> CreateScDataPilotSourceTypeDlg(weld::Window* pParent,
bool bEnableExternal) override; bool bEnableExternal) override;
virtual VclPtr<AbstractScDataPilotServiceDlg> CreateScDataPilotServiceDlg( vcl::Window* pParent, virtual VclPtr<AbstractScDataPilotServiceDlg> CreateScDataPilotServiceDlg(weld::Window* pParent,
const std::vector<OUString>& rServices ) override; const std::vector<OUString>& rServices) override;
virtual VclPtr<AbstractScDeleteCellDlg> CreateScDeleteCellDlg(weld::Window* pParent, bool bDisallowCellMove ) override; virtual VclPtr<AbstractScDeleteCellDlg> CreateScDeleteCellDlg(weld::Window* pParent, bool bDisallowCellMove ) override;
//for dataform //for dataform
......
...@@ -24,140 +24,114 @@ ...@@ -24,140 +24,114 @@
using namespace com::sun::star; using namespace com::sun::star;
ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(vcl::Window* pParent, bool bEnableExternal) ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(weld::Window* pParent, bool bEnableExternal)
: ModalDialog( pParent, "SelectSourceDialog", "modules/scalc/ui/selectsource.ui" ) : GenericDialogController(pParent, "modules/scalc/ui/selectsource.ui", "SelectSourceDialog")
{ , m_xBtnSelection(m_xBuilder->weld_radio_button("selection"))
get(m_pBtnSelection, "selection"); , m_xBtnNamedRange(m_xBuilder->weld_radio_button("namedrange"))
get(m_pBtnNamedRange, "namedrange"); , m_xBtnDatabase(m_xBuilder->weld_radio_button("database"))
get(m_pBtnDatabase, "database"); , m_xBtnExternal(m_xBuilder->weld_radio_button("external"))
get(m_pBtnExternal, "external"); , m_xLbNamedRange(m_xBuilder->weld_combo_box_text("rangelb"))
get(m_pLbNamedRange, "rangelb"); {
m_pBtnSelection->SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) ); m_xBtnSelection->connect_toggled( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
m_pBtnNamedRange->SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) ); m_xBtnNamedRange->connect_toggled( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
m_pBtnDatabase->SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) ); m_xBtnDatabase->connect_toggled( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
m_pBtnExternal->SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) ); m_xBtnExternal->connect_toggled( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
if (!bEnableExternal) if (!bEnableExternal)
m_pBtnExternal->Disable(); m_xBtnExternal->set_sensitive(false);
m_pBtnSelection->Check(); m_xBtnSelection->set_active(true);
// Disabled unless at least one named range exists. // Disabled unless at least one named range exists.
m_pLbNamedRange->Disable(); m_xLbNamedRange->set_sensitive(false);
m_pBtnNamedRange->Disable(); m_xBtnNamedRange->set_sensitive(false);
// Intentionally hide this button to see if anyone complains. // Intentionally hide this button to see if anyone complains.
m_pBtnExternal->Show(false); m_xBtnExternal->show(false);
} }
ScDataPilotSourceTypeDlg::~ScDataPilotSourceTypeDlg() ScDataPilotSourceTypeDlg::~ScDataPilotSourceTypeDlg()
{ {
disposeOnce();
}
void ScDataPilotSourceTypeDlg::dispose()
{
m_pBtnSelection.clear();
m_pBtnNamedRange.clear();
m_pBtnDatabase.clear();
m_pBtnExternal.clear();
m_pLbNamedRange.clear();
ModalDialog::dispose();
} }
bool ScDataPilotSourceTypeDlg::IsDatabase() const bool ScDataPilotSourceTypeDlg::IsDatabase() const
{ {
return m_pBtnDatabase->IsChecked(); return m_xBtnDatabase->get_active();
} }
bool ScDataPilotSourceTypeDlg::IsExternal() const bool ScDataPilotSourceTypeDlg::IsExternal() const
{ {
return m_pBtnExternal->IsChecked(); return m_xBtnExternal->get_active();
} }
bool ScDataPilotSourceTypeDlg::IsNamedRange() const bool ScDataPilotSourceTypeDlg::IsNamedRange() const
{ {
return m_pBtnNamedRange->IsChecked(); return m_xBtnNamedRange->get_active();
} }
OUString ScDataPilotSourceTypeDlg::GetSelectedNamedRange() const OUString ScDataPilotSourceTypeDlg::GetSelectedNamedRange() const
{ {
const sal_Int32 nPos = m_pLbNamedRange->GetSelectedEntryPos(); return m_xLbNamedRange->get_active_text();
return m_pLbNamedRange->GetEntry(nPos);
} }
void ScDataPilotSourceTypeDlg::AppendNamedRange(const OUString& rName) void ScDataPilotSourceTypeDlg::AppendNamedRange(const OUString& rName)
{ {
m_pLbNamedRange->InsertEntry(rName); m_xLbNamedRange->append_text(rName);
if (m_pLbNamedRange->GetEntryCount() == 1) if (m_xLbNamedRange->get_count() == 1)
{ {
// Select position 0 only for the first time. // Select position 0 only for the first time.
m_pLbNamedRange->SelectEntryPos(0); m_xLbNamedRange->set_active(0);
m_pBtnNamedRange->Enable(); m_xBtnNamedRange->set_sensitive(true);
} }
} }
IMPL_LINK( ScDataPilotSourceTypeDlg, RadioClickHdl, Button*, pBtn, void ) IMPL_LINK_NOARG(ScDataPilotSourceTypeDlg, RadioClickHdl, weld::ToggleButton&, void)
{ {
m_pLbNamedRange->Enable(pBtn == m_pBtnNamedRange); m_xLbNamedRange->set_sensitive(m_xBtnNamedRange->get_active());
} }
ScDataPilotServiceDlg::ScDataPilotServiceDlg( vcl::Window* pParent, ScDataPilotServiceDlg::ScDataPilotServiceDlg(weld::Window* pParent, const std::vector<OUString>& rServices)
const std::vector<OUString>& rServices ) : : GenericDialogController(pParent, "modules/scalc/ui/dapiservicedialog.ui", "DapiserviceDialog")
ModalDialog ( pParent, "DapiserviceDialog", "modules/scalc/ui/dapiservicedialog.ui" ) , m_xLbService(m_xBuilder->weld_combo_box_text("service"))
, m_xEdSource(m_xBuilder->weld_entry("source"))
, m_xEdName(m_xBuilder->weld_entry("name"))
, m_xEdUser(m_xBuilder->weld_entry("user"))
, m_xEdPasswd(m_xBuilder->weld_entry("password"))
{ {
get(m_pLbService, "service");
get(m_pEdSource, "source");
get(m_pEdName, "name");
get(m_pEdUser, "user");
get(m_pEdPasswd, "password");
for (const OUString& aName : rServices) for (const OUString& aName : rServices)
{ {
m_pLbService->InsertEntry( aName ); m_xLbService->append_text(aName);
} }
m_pLbService->SelectEntryPos( 0 ); m_xLbService->set_active(0);
} }
ScDataPilotServiceDlg::~ScDataPilotServiceDlg() ScDataPilotServiceDlg::~ScDataPilotServiceDlg()
{ {
disposeOnce();
} }
void ScDataPilotServiceDlg::dispose()
{
m_pLbService.clear();
m_pEdSource.clear();
m_pEdName.clear();
m_pEdUser.clear();
m_pEdPasswd.clear();
ModalDialog::dispose();
}
OUString ScDataPilotServiceDlg::GetServiceName() const OUString ScDataPilotServiceDlg::GetServiceName() const
{ {
return m_pLbService->GetSelectedEntry(); return m_xLbService->get_active_text();
} }
OUString ScDataPilotServiceDlg::GetParSource() const OUString ScDataPilotServiceDlg::GetParSource() const
{ {
return m_pEdSource->GetText(); return m_xEdSource->get_text();
} }
OUString ScDataPilotServiceDlg::GetParName() const OUString ScDataPilotServiceDlg::GetParName() const
{ {
return m_pEdName->GetText(); return m_xEdName->get_text();
} }
OUString ScDataPilotServiceDlg::GetParUser() const OUString ScDataPilotServiceDlg::GetParUser() const
{ {
return m_pEdUser->GetText(); return m_xEdUser->get_text();
} }
OUString ScDataPilotServiceDlg::GetParPass() const OUString ScDataPilotServiceDlg::GetParPass() const
{ {
return m_pEdPasswd->GetText(); return m_xEdPasswd->get_text();
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -20,25 +20,20 @@ ...@@ -20,25 +20,20 @@
#ifndef INCLUDED_SC_SOURCE_UI_INC_DAPITYPE_HXX #ifndef INCLUDED_SC_SOURCE_UI_INC_DAPITYPE_HXX
#define INCLUDED_SC_SOURCE_UI_INC_DAPITYPE_HXX #define INCLUDED_SC_SOURCE_UI_INC_DAPITYPE_HXX
#include <vcl/button.hxx> #include <vcl/weld.hxx>
#include <vcl/dialog.hxx>
#include <vcl/edit.hxx>
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
class ScDataPilotSourceTypeDlg : public ModalDialog class ScDataPilotSourceTypeDlg : public weld::GenericDialogController
{ {
private: private:
VclPtr<RadioButton> m_pBtnSelection; std::unique_ptr<weld::RadioButton> m_xBtnSelection;
VclPtr<RadioButton> m_pBtnNamedRange; std::unique_ptr<weld::RadioButton> m_xBtnNamedRange;
VclPtr<RadioButton> m_pBtnDatabase; std::unique_ptr<weld::RadioButton> m_xBtnDatabase;
VclPtr<RadioButton> m_pBtnExternal; std::unique_ptr<weld::RadioButton> m_xBtnExternal;
VclPtr<ListBox> m_pLbNamedRange; std::unique_ptr<weld::ComboBoxText> m_xLbNamedRange;
public: public:
ScDataPilotSourceTypeDlg(vcl::Window* pParent, bool bEnableExternal); ScDataPilotSourceTypeDlg(weld::Window* pParent, bool bEnableExternal);
virtual ~ScDataPilotSourceTypeDlg() override; virtual ~ScDataPilotSourceTypeDlg() override;
virtual void dispose() override;
bool IsDatabase() const; bool IsDatabase() const;
bool IsExternal() const; bool IsExternal() const;
bool IsNamedRange() const; bool IsNamedRange() const;
...@@ -46,23 +41,21 @@ public: ...@@ -46,23 +41,21 @@ public:
void AppendNamedRange(const OUString& rNames); void AppendNamedRange(const OUString& rNames);
private: private:
DECL_LINK( RadioClickHdl, Button *, void ); DECL_LINK(RadioClickHdl, weld::ToggleButton&, void);
}; };
class ScDataPilotServiceDlg : public ModalDialog class ScDataPilotServiceDlg : public weld::GenericDialogController
{ {
private: private:
VclPtr<ListBox> m_pLbService; std::unique_ptr<weld::ComboBoxText> m_xLbService;
VclPtr<Edit> m_pEdSource; std::unique_ptr<weld::Entry> m_xEdSource;
VclPtr<Edit> m_pEdName; std::unique_ptr<weld::Entry> m_xEdName;
VclPtr<Edit> m_pEdUser; std::unique_ptr<weld::Entry> m_xEdUser;
VclPtr<Edit> m_pEdPasswd; std::unique_ptr<weld::Entry> m_xEdPasswd;
public: public:
ScDataPilotServiceDlg( vcl::Window* pParent, ScDataPilotServiceDlg(weld::Window* pParent, const std::vector<OUString>& rServices);
const std::vector<OUString>& rServices ); virtual ~ScDataPilotServiceDlg() override;
virtual ~ScDataPilotServiceDlg() override;
virtual void dispose() override;
OUString GetServiceName() const; OUString GetServiceName() const;
OUString GetParSource() const; OUString GetParSource() const;
......
...@@ -2826,7 +2826,7 @@ void ScCellShell::ExecuteDataPilotDialog() ...@@ -2826,7 +2826,7 @@ void ScCellShell::ExecuteDataPilotDialog()
ScopedVclPtr<AbstractScDataPilotSourceTypeDlg> pTypeDlg( ScopedVclPtr<AbstractScDataPilotSourceTypeDlg> pTypeDlg(
pFact->CreateScDataPilotSourceTypeDlg( pFact->CreateScDataPilotSourceTypeDlg(
pTabViewShell->GetDialogParent(), bEnableExt)); pTabViewShell->GetFrameWeld(), bEnableExt));
// Populate named ranges (if any). // Populate named ranges (if any).
ScRangeName* pRangeName = pDoc->GetRangeName(); ScRangeName* pRangeName = pDoc->GetRangeName();
...@@ -2845,7 +2845,7 @@ void ScCellShell::ExecuteDataPilotDialog() ...@@ -2845,7 +2845,7 @@ void ScCellShell::ExecuteDataPilotDialog()
std::vector<OUString> aSources = ScDPObject::GetRegisteredSources(); std::vector<OUString> aSources = ScDPObject::GetRegisteredSources();
ScopedVclPtr<AbstractScDataPilotServiceDlg> pServDlg( ScopedVclPtr<AbstractScDataPilotServiceDlg> pServDlg(
pFact->CreateScDataPilotServiceDlg( pFact->CreateScDataPilotServiceDlg(
pTabViewShell->GetDialogParent(), aSources)); pTabViewShell->GetFrameWeld(), aSources));
OSL_ENSURE(pServDlg, "Dialog create fail!"); OSL_ENSURE(pServDlg, "Dialog create fail!");
if ( pServDlg->Execute() == RET_OK ) if ( pServDlg->Execute() == RET_OK )
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface domain="sc"> <interface domain="sc">
<!-- interface-requires gtk+ 3.0 --> <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="DapiserviceDialog"> <object class="GtkDialog" id="DapiserviceDialog">
<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="border_width">6</property> <property name="border_width">6</property>
<property name="title" translatable="yes" context="dapiservicedialog|DapiserviceDialog">External Source</property> <property name="title" translatable="yes" context="dapiservicedialog|DapiserviceDialog">External Source</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>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<child internal-child="action_area"> <child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1"> <object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="layout_style">end</property>
<property name="layout_style">start</property>
<child> <child>
<object class="GtkButton" id="ok"> <object class="GtkButton" id="ok">
<property name="label">gtk-ok</property> <property name="label">gtk-ok</property>
...@@ -26,7 +33,6 @@ ...@@ -26,7 +33,6 @@
<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>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
</object> </object>
<packing> <packing>
...@@ -42,7 +48,6 @@ ...@@ -42,7 +48,6 @@
<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>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
</object> </object>
<packing> <packing>
...@@ -58,13 +63,13 @@ ...@@ -58,13 +63,13 @@
<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>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
</object> </object>
<packing> <packing>
<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>
</object> </object>
...@@ -104,15 +109,13 @@ ...@@ -104,15 +109,13 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="dapiservicedialog|label2">_Service</property> <property name="label" translatable="yes" context="dapiservicedialog|label2">_Service</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -120,15 +123,13 @@ ...@@ -120,15 +123,13 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="dapiservicedialog|label3">So_urce</property> <property name="label" translatable="yes" context="dapiservicedialog|label3">So_urce</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -136,15 +137,13 @@ ...@@ -136,15 +137,13 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="dapiservicedialog|label4">_Name</property> <property name="label" translatable="yes" context="dapiservicedialog|label4">_Name</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">2</property> <property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -152,15 +151,13 @@ ...@@ -152,15 +151,13 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="dapiservicedialog|label5">Us_er</property> <property name="label" translatable="yes" context="dapiservicedialog|label5">Us_er</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">3</property> <property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -168,15 +165,13 @@ ...@@ -168,15 +165,13 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="dapiservicedialog|label6">_Password</property> <property name="label" translatable="yes" context="dapiservicedialog|label6">_Password</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">4</property> <property name="top_attach">4</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -188,8 +183,6 @@ ...@@ -188,8 +183,6 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">4</property> <property name="top_attach">4</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -201,8 +194,6 @@ ...@@ -201,8 +194,6 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">3</property> <property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -214,8 +205,6 @@ ...@@ -214,8 +205,6 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">2</property> <property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -227,12 +216,10 @@ ...@@ -227,12 +216,10 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkComboBox" id="service"> <object class="GtkComboBoxText" id="service">
<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>
...@@ -240,8 +227,6 @@ ...@@ -240,8 +227,6 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
</object> </object>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 --> <!-- Generated with glade 3.22.1 -->
<interface domain="sc"> <interface domain="sc">
<requires lib="gtk+" version="3.18"/> <requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="SelectSourceDialog"> <object class="GtkDialog" id="SelectSourceDialog">
...@@ -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="selectsource|SelectSourceDialog">Select Source</property> <property name="title" translatable="yes" context="selectsource|SelectSourceDialog">Select Source</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-vbox3"> <object class="GtkBox" id="dialog-vbox3">
<property name="can_focus">False</property> <property name="can_focus">False</property>
...@@ -99,7 +105,6 @@ ...@@ -99,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">namedrange</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -121,7 +126,7 @@ ...@@ -121,7 +126,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">database</property> <property name="group">selection</property>
<accessibility> <accessibility>
<relation type="label-for" target="rangelb"/> <relation type="label-for" target="rangelb"/>
</accessibility> </accessibility>
...@@ -162,7 +167,7 @@ ...@@ -162,7 +167,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">external</property> <property name="group">selection</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</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