[Libreoffice-commits] core.git: sc/inc sc/qa sc/source sc/uiconfig
Caolán McNamara
caolanm at redhat.com
Fri May 18 13:12:47 UTC 2018
sc/inc/scabstdlg.hxx | 6 -
sc/qa/unit/screenshots/screenshots.cxx | 2
sc/source/ui/attrdlg/scdlgfact.cxx | 44 ++++++------
sc/source/ui/attrdlg/scdlgfact.hxx | 22 ++++--
sc/source/ui/dbgui/dapitype.cxx | 108 +++++++++++-------------------
sc/source/ui/inc/dapitype.hxx | 41 ++++-------
sc/source/ui/view/cellsh1.cxx | 4 -
sc/uiconfig/scalc/ui/dapiservicedialog.ui | 49 ++++---------
sc/uiconfig/scalc/ui/selectsource.ui | 13 ++-
9 files changed, 132 insertions(+), 157 deletions(-)
New commits:
commit 74c8bc3c7db2bdc5811f0c9ea535a73ddaf6f3ad
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri May 18 11:17:40 2018 +0100
weld ScDataPilotSourceTypeDlg and ScDataPilotServiceDlg
Change-Id: I03ef6f1994e8e1a801e4515586a6a73d3748f13b
Reviewed-on: https://gerrit.libreoffice.org/54528
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index aaba06323367..979876d88c77 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -416,11 +416,11 @@ public:
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;
- virtual VclPtr<AbstractScDataPilotServiceDlg> CreateScDataPilotServiceDlg( vcl::Window* pParent,
- const std::vector<OUString>& rServices ) = 0;
+ virtual VclPtr<AbstractScDataPilotServiceDlg> CreateScDataPilotServiceDlg(weld::Window* pParent,
+ const std::vector<OUString>& rServices) = 0;
virtual VclPtr<AbstractScDeleteCellDlg> CreateScDeleteCellDlg(weld::Window* pParent, bool bDisallowCellMove) = 0 ;
diff --git a/sc/qa/unit/screenshots/screenshots.cxx b/sc/qa/unit/screenshots/screenshots.cxx
index f3ddbbdbeeec..08965de0af80 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -183,7 +183,7 @@ VclPtr<VclAbstractDialog> ScScreenshotTest::createDialogByID(sal_uInt32 nID)
}
case 5: // "modules/scalc/ui/selectsource.ui"
{
- pReturnDialog = mpFact->CreateScDataPilotSourceTypeDlg(mpViewShell->GetDialogParent(), true);
+ pReturnDialog = mpFact->CreateScDataPilotSourceTypeDlg(mpViewShell->GetFrameWeld(), true);
break;
}
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index a810883911bf..b5a434272149 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -80,8 +80,16 @@ IMPL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScColRowLabelDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScCondFormatManagerDlg_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()
{
@@ -235,52 +243,52 @@ void AbstractScDataPilotDatabaseDlg_Impl::GetValues( ScImportSourceDesc& rDesc )
bool AbstractScDataPilotSourceTypeDlg_Impl::IsDatabase() const
{
- return pDlg->IsDatabase();
+ return m_xDlg->IsDatabase();
}
bool AbstractScDataPilotSourceTypeDlg_Impl::IsExternal() const
{
- return pDlg->IsExternal();
+ return m_xDlg->IsExternal();
}
bool AbstractScDataPilotSourceTypeDlg_Impl::IsNamedRange() const
{
- return pDlg->IsNamedRange();
+ return m_xDlg->IsNamedRange();
}
OUString AbstractScDataPilotSourceTypeDlg_Impl::GetSelectedNamedRange() const
{
- return pDlg->GetSelectedNamedRange();
+ return m_xDlg->GetSelectedNamedRange();
}
void AbstractScDataPilotSourceTypeDlg_Impl::AppendNamedRange(const OUString& rName)
{
- pDlg->AppendNamedRange(rName);
+ m_xDlg->AppendNamedRange(rName);
}
OUString AbstractScDataPilotServiceDlg_Impl::GetServiceName() const
{
- return pDlg->GetServiceName();
+ return m_xDlg->GetServiceName();
}
OUString AbstractScDataPilotServiceDlg_Impl::GetParSource() const
{
- return pDlg->GetParSource();
+ return m_xDlg->GetParSource();
}
OUString AbstractScDataPilotServiceDlg_Impl::GetParName() const
{
- return pDlg->GetParName();
+ return m_xDlg->GetParName();
}
OUString AbstractScDataPilotServiceDlg_Impl::GetParUser() const
{
- return pDlg->GetParUser();
+ return m_xDlg->GetParUser();
}
OUString AbstractScDataPilotServiceDlg_Impl::GetParPass() const
{
- return pDlg->GetParPass();
+ return m_xDlg->GetParPass();
}
DelCellCmd AbstractScDeleteCellDlg_Impl::GetDelCellCmd() const
@@ -704,17 +712,15 @@ VclPtr<AbstractScDataPilotDatabaseDlg> ScAbstractDialogFactory_Impl::CreateScDat
}
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(pDlg);
+ return VclPtr<AbstractScDataPilotSourceTypeDlg_Impl>::Create(new ScDataPilotSourceTypeDlg(pParent, bEnableExternal));
}
-VclPtr<AbstractScDataPilotServiceDlg> ScAbstractDialogFactory_Impl::CreateScDataPilotServiceDlg( vcl::Window* pParent,
- const std::vector<OUString>& rServices )
+VclPtr<AbstractScDataPilotServiceDlg> ScAbstractDialogFactory_Impl::CreateScDataPilotServiceDlg(weld::Window* pParent,
+ const std::vector<OUString>& rServices)
{
- VclPtr<ScDataPilotServiceDlg> pDlg = VclPtr<ScDataPilotServiceDlg>::Create( pParent, rServices );
- return VclPtr<AbstractScDataPilotServiceDlg_Impl>::Create( pDlg );
+ return VclPtr<AbstractScDataPilotServiceDlg_Impl>::Create(new ScDataPilotServiceDlg(pParent, rServices));
}
VclPtr<AbstractScDeleteCellDlg> ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg(weld::Window* pParent,
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 998bf0926eba..d2a1a694c6aa 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -142,7 +142,13 @@ class AbstractScDataPilotDatabaseDlg_Impl :public AbstractScDataPilotDatabaseDl
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 IsExternal() const override;
virtual bool IsNamedRange() const override;
@@ -152,7 +158,13 @@ class AbstractScDataPilotSourceTypeDlg_Impl :public AbstractScDataPilotSourceTy
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 GetParSource() const override;
virtual OUString GetParName() const override;
@@ -490,11 +502,11 @@ public:
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;
- virtual VclPtr<AbstractScDataPilotServiceDlg> CreateScDataPilotServiceDlg( vcl::Window* pParent,
- const std::vector<OUString>& rServices ) override;
+ virtual VclPtr<AbstractScDataPilotServiceDlg> CreateScDataPilotServiceDlg(weld::Window* pParent,
+ const std::vector<OUString>& rServices) override;
virtual VclPtr<AbstractScDeleteCellDlg> CreateScDeleteCellDlg(weld::Window* pParent, bool bDisallowCellMove ) override;
//for dataform
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index 9ac30f715f78..b51d27bc3849 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -24,140 +24,114 @@
using namespace com::sun::star;
-ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(vcl::Window* pParent, bool bEnableExternal)
- : ModalDialog( pParent, "SelectSourceDialog", "modules/scalc/ui/selectsource.ui" )
-{
- get(m_pBtnSelection, "selection");
- get(m_pBtnNamedRange, "namedrange");
- get(m_pBtnDatabase, "database");
- get(m_pBtnExternal, "external");
- get(m_pLbNamedRange, "rangelb");
- m_pBtnSelection->SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
- m_pBtnNamedRange->SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
- m_pBtnDatabase->SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
- m_pBtnExternal->SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
+ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(weld::Window* pParent, bool bEnableExternal)
+ : GenericDialogController(pParent, "modules/scalc/ui/selectsource.ui", "SelectSourceDialog")
+ , m_xBtnSelection(m_xBuilder->weld_radio_button("selection"))
+ , m_xBtnNamedRange(m_xBuilder->weld_radio_button("namedrange"))
+ , m_xBtnDatabase(m_xBuilder->weld_radio_button("database"))
+ , m_xBtnExternal(m_xBuilder->weld_radio_button("external"))
+ , m_xLbNamedRange(m_xBuilder->weld_combo_box_text("rangelb"))
+{
+ m_xBtnSelection->connect_toggled( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
+ m_xBtnNamedRange->connect_toggled( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
+ m_xBtnDatabase->connect_toggled( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
+ m_xBtnExternal->connect_toggled( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
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.
- m_pLbNamedRange->Disable();
- m_pBtnNamedRange->Disable();
+ m_xLbNamedRange->set_sensitive(false);
+ m_xBtnNamedRange->set_sensitive(false);
// Intentionally hide this button to see if anyone complains.
- m_pBtnExternal->Show(false);
+ m_xBtnExternal->show(false);
}
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
{
- return m_pBtnDatabase->IsChecked();
+ return m_xBtnDatabase->get_active();
}
bool ScDataPilotSourceTypeDlg::IsExternal() const
{
- return m_pBtnExternal->IsChecked();
+ return m_xBtnExternal->get_active();
}
bool ScDataPilotSourceTypeDlg::IsNamedRange() const
{
- return m_pBtnNamedRange->IsChecked();
+ return m_xBtnNamedRange->get_active();
}
OUString ScDataPilotSourceTypeDlg::GetSelectedNamedRange() const
{
- const sal_Int32 nPos = m_pLbNamedRange->GetSelectedEntryPos();
- return m_pLbNamedRange->GetEntry(nPos);
+ return m_xLbNamedRange->get_active_text();
}
void ScDataPilotSourceTypeDlg::AppendNamedRange(const OUString& rName)
{
- m_pLbNamedRange->InsertEntry(rName);
- if (m_pLbNamedRange->GetEntryCount() == 1)
+ m_xLbNamedRange->append_text(rName);
+ if (m_xLbNamedRange->get_count() == 1)
{
// Select position 0 only for the first time.
- m_pLbNamedRange->SelectEntryPos(0);
- m_pBtnNamedRange->Enable();
+ m_xLbNamedRange->set_active(0);
+ 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,
- const std::vector<OUString>& rServices ) :
- ModalDialog ( pParent, "DapiserviceDialog", "modules/scalc/ui/dapiservicedialog.ui" )
+ScDataPilotServiceDlg::ScDataPilotServiceDlg(weld::Window* pParent, const std::vector<OUString>& rServices)
+ : GenericDialogController(pParent, "modules/scalc/ui/dapiservicedialog.ui", "DapiserviceDialog")
+ , 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)
{
- m_pLbService->InsertEntry( aName );
+ m_xLbService->append_text(aName);
}
- m_pLbService->SelectEntryPos( 0 );
+ m_xLbService->set_active(0);
}
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
{
- return m_pLbService->GetSelectedEntry();
+ return m_xLbService->get_active_text();
}
OUString ScDataPilotServiceDlg::GetParSource() const
{
- return m_pEdSource->GetText();
+ return m_xEdSource->get_text();
}
OUString ScDataPilotServiceDlg::GetParName() const
{
- return m_pEdName->GetText();
+ return m_xEdName->get_text();
}
OUString ScDataPilotServiceDlg::GetParUser() const
{
- return m_pEdUser->GetText();
+ return m_xEdUser->get_text();
}
OUString ScDataPilotServiceDlg::GetParPass() const
{
- return m_pEdPasswd->GetText();
+ return m_xEdPasswd->get_text();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx
index dce9670d757f..3c1fa4790d3f 100644
--- a/sc/source/ui/inc/dapitype.hxx
+++ b/sc/source/ui/inc/dapitype.hxx
@@ -20,25 +20,20 @@
#ifndef INCLUDED_SC_SOURCE_UI_INC_DAPITYPE_HXX
#define INCLUDED_SC_SOURCE_UI_INC_DAPITYPE_HXX
-#include <vcl/button.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
+#include <vcl/weld.hxx>
-class ScDataPilotSourceTypeDlg : public ModalDialog
+class ScDataPilotSourceTypeDlg : public weld::GenericDialogController
{
private:
- VclPtr<RadioButton> m_pBtnSelection;
- VclPtr<RadioButton> m_pBtnNamedRange;
- VclPtr<RadioButton> m_pBtnDatabase;
- VclPtr<RadioButton> m_pBtnExternal;
- VclPtr<ListBox> m_pLbNamedRange;
+ std::unique_ptr<weld::RadioButton> m_xBtnSelection;
+ std::unique_ptr<weld::RadioButton> m_xBtnNamedRange;
+ std::unique_ptr<weld::RadioButton> m_xBtnDatabase;
+ std::unique_ptr<weld::RadioButton> m_xBtnExternal;
+ std::unique_ptr<weld::ComboBoxText> m_xLbNamedRange;
public:
- ScDataPilotSourceTypeDlg(vcl::Window* pParent, bool bEnableExternal);
+ ScDataPilotSourceTypeDlg(weld::Window* pParent, bool bEnableExternal);
virtual ~ScDataPilotSourceTypeDlg() override;
- virtual void dispose() override;
bool IsDatabase() const;
bool IsExternal() const;
bool IsNamedRange() const;
@@ -46,23 +41,21 @@ public:
void AppendNamedRange(const OUString& rNames);
private:
- DECL_LINK( RadioClickHdl, Button *, void );
+ DECL_LINK(RadioClickHdl, weld::ToggleButton&, void);
};
-class ScDataPilotServiceDlg : public ModalDialog
+class ScDataPilotServiceDlg : public weld::GenericDialogController
{
private:
- VclPtr<ListBox> m_pLbService;
- VclPtr<Edit> m_pEdSource;
- VclPtr<Edit> m_pEdName;
- VclPtr<Edit> m_pEdUser;
- VclPtr<Edit> m_pEdPasswd;
+ std::unique_ptr<weld::ComboBoxText> m_xLbService;
+ std::unique_ptr<weld::Entry> m_xEdSource;
+ std::unique_ptr<weld::Entry> m_xEdName;
+ std::unique_ptr<weld::Entry> m_xEdUser;
+ std::unique_ptr<weld::Entry> m_xEdPasswd;
public:
- ScDataPilotServiceDlg( vcl::Window* pParent,
- const std::vector<OUString>& rServices );
- virtual ~ScDataPilotServiceDlg() override;
- virtual void dispose() override;
+ ScDataPilotServiceDlg(weld::Window* pParent, const std::vector<OUString>& rServices);
+ virtual ~ScDataPilotServiceDlg() override;
OUString GetServiceName() const;
OUString GetParSource() const;
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 9300fda62916..697d52cd8a0f 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2826,7 +2826,7 @@ void ScCellShell::ExecuteDataPilotDialog()
ScopedVclPtr<AbstractScDataPilotSourceTypeDlg> pTypeDlg(
pFact->CreateScDataPilotSourceTypeDlg(
- pTabViewShell->GetDialogParent(), bEnableExt));
+ pTabViewShell->GetFrameWeld(), bEnableExt));
// Populate named ranges (if any).
ScRangeName* pRangeName = pDoc->GetRangeName();
@@ -2845,7 +2845,7 @@ void ScCellShell::ExecuteDataPilotDialog()
std::vector<OUString> aSources = ScDPObject::GetRegisteredSources();
ScopedVclPtr<AbstractScDataPilotServiceDlg> pServDlg(
pFact->CreateScDataPilotServiceDlg(
- pTabViewShell->GetDialogParent(), aSources));
+ pTabViewShell->GetFrameWeld(), aSources));
OSL_ENSURE(pServDlg, "Dialog create fail!");
if ( pServDlg->Execute() == RET_OK )
diff --git a/sc/uiconfig/scalc/ui/dapiservicedialog.ui b/sc/uiconfig/scalc/ui/dapiservicedialog.ui
index 48fd5ff33062..ec31f4174592 100644
--- a/sc/uiconfig/scalc/ui/dapiservicedialog.ui
+++ b/sc/uiconfig/scalc/ui/dapiservicedialog.ui
@@ -1,24 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
<interface domain="sc">
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="DapiserviceDialog">
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</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>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="layout_style">start</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
@@ -26,7 +33,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -42,7 +48,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -58,13 +63,13 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
+ <property name="secondary">True</property>
</packing>
</child>
</object>
@@ -104,15 +109,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="dapiservicedialog|label2">_Service</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -120,15 +123,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="dapiservicedialog|label3">So_urce</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -136,15 +137,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="dapiservicedialog|label4">_Name</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -152,15 +151,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="dapiservicedialog|label5">Us_er</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -168,15 +165,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="dapiservicedialog|label6">_Password</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -188,8 +183,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -201,8 +194,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -214,8 +205,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -227,12 +216,10 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="service">
+ <object class="GtkComboBoxText" id="service">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
@@ -240,8 +227,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/sc/uiconfig/scalc/ui/selectsource.ui b/sc/uiconfig/scalc/ui/selectsource.ui
index 56000f520a8a..84484a1a2f19 100644
--- a/sc/uiconfig/scalc/ui/selectsource.ui
+++ b/sc/uiconfig/scalc/ui/selectsource.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sc">
<requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="SelectSourceDialog">
@@ -7,7 +7,13 @@
<property name="border_width">6</property>
<property name="title" translatable="yes" context="selectsource|SelectSourceDialog">Select Source</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>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox3">
<property name="can_focus">False</property>
@@ -99,7 +105,6 @@
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">namedrange</property>
</object>
<packing>
<property name="expand">False</property>
@@ -121,7 +126,7 @@
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <property name="group">database</property>
+ <property name="group">selection</property>
<accessibility>
<relation type="label-for" target="rangelb"/>
</accessibility>
@@ -162,7 +167,7 @@
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <property name="group">external</property>
+ <property name="group">selection</property>
</object>
<packing>
<property name="expand">False</property>
More information about the Libreoffice-commits
mailing list