[Libreoffice-commits] core.git: 2 commits - dbaccess/source dbaccess/uiconfig
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Aug 1 20:19:00 UTC 2019
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 80 ++++++++--------------
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 25 +++---
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 2
dbaccess/source/ui/dlg/adminpages.hxx | 6 -
dbaccess/source/ui/dlg/advancedsettings.cxx | 4 -
dbaccess/source/ui/dlg/detailpages.cxx | 4 -
dbaccess/uiconfig/ui/finalpagewizard.ui | 14 +--
7 files changed, 58 insertions(+), 77 deletions(-)
New commits:
commit ded2045789001479609249cf8afe2fc6828046f8
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Aug 1 17:56:20 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Aug 1 22:18:17 2019 +0200
some missed vcl::Window->TabPageParent opportunities
Change-Id: Ie5e66723ad497f927bc26bbe01c8194712455caf
Reviewed-on: https://gerrit.libreoffice.org/76821
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 5761ef44e6a4..24cae55f638b 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -684,12 +684,11 @@ using namespace ::com::sun::star;
callModifiedHdl();
}
- VclPtr<OGenericAdministrationPage> OSpreadSheetConnectionPageSetup::CreateDocumentOrSpreadSheetTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet )
+ VclPtr<OGenericAdministrationPage> OSpreadSheetConnectionPageSetup::CreateDocumentOrSpreadSheetTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
{
return VclPtr<OSpreadSheetConnectionPageSetup>::Create( pParent, _rAttrSet );
}
-
OSpreadSheetConnectionPageSetup::OSpreadSheetConnectionPageSetup(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
: OConnectionTabPageSetup(pParent, "dbaccess/ui/dbwizspreadsheetpage.ui", "DBWizSpreadsheetPage",
rCoreAttrs, STR_SPREADSHEET_HELPTEXT, STR_SPREADSHEET_HEADERTEXT, STR_SPREADSHEETPATH)
@@ -798,7 +797,7 @@ using namespace ::com::sun::star;
return bChangedSomething;
}
- VclPtr<OGenericAdministrationPage> OFinalDBPageSetup::CreateFinalDBTabPageSetup(vcl::Window* pParent, const SfxItemSet& _rAttrSet)
+ VclPtr<OGenericAdministrationPage> OFinalDBPageSetup::CreateFinalDBTabPageSetup(TabPageParent pParent, const SfxItemSet& _rAttrSet)
{
return VclPtr<OFinalDBPageSetup>::Create( pParent, _rAttrSet);
}
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index 93a44e9db391..099af83ba54a 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -40,7 +40,7 @@ namespace dbaui
{
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
- static VclPtr<OGenericAdministrationPage> CreateDocumentOrSpreadSheetTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet );
+ static VclPtr<OGenericAdministrationPage> CreateDocumentOrSpreadSheetTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet);
OSpreadSheetConnectionPageSetup(TabPageParent pParent, const SfxItemSet& _rCoreAttrs);
virtual ~OSpreadSheetConnectionPageSetup() override;
@@ -251,7 +251,7 @@ namespace dbaui
{
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
- static VclPtr<OGenericAdministrationPage> CreateFinalDBTabPageSetup( vcl::Window* pParent, const SfxItemSet& _rAttrSet);
+ static VclPtr<OGenericAdministrationPage> CreateFinalDBTabPageSetup(TabPageParent pParent, const SfxItemSet& _rAttrSet);
OFinalDBPageSetup(TabPageParent pParent, const SfxItemSet& _rCoreAttrs);
virtual ~OFinalDBPageSetup() override;
commit 1edbdcda1d04def963a5d92ef0c731214ff9574d
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Aug 1 17:34:14 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Aug 1 22:18:01 2019 +0200
weld OFinalDBPageSetup
Change-Id: Ie05e086c393ef6572c92e7c4975b1c9dd9e3ad48
Reviewed-on: https://gerrit.libreoffice.org/76818
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 750f37cf4b42..5761ef44e6a4 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -710,7 +710,7 @@ using namespace ::com::sun::star;
void OSpreadSheetConnectionPageSetup::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{
OConnectionTabPageSetup::fillControls(_rControlList);
- _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::CheckButton>(m_xPasswordrequired.get()));
+ _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xPasswordrequired.get()));
}
@@ -798,87 +798,70 @@ using namespace ::com::sun::star;
return bChangedSomething;
}
- VclPtr<OGenericAdministrationPage> OFinalDBPageSetup::CreateFinalDBTabPageSetup( vcl::Window* pParent, const SfxItemSet& _rAttrSet)
+ VclPtr<OGenericAdministrationPage> OFinalDBPageSetup::CreateFinalDBTabPageSetup(vcl::Window* pParent, const SfxItemSet& _rAttrSet)
{
return VclPtr<OFinalDBPageSetup>::Create( pParent, _rAttrSet);
}
-
- OFinalDBPageSetup::OFinalDBPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs)
- : OGenericAdministrationPage(pParent, "PageFinal",
- "dbaccess/ui/finalpagewizard.ui", _rCoreAttrs)
+ OFinalDBPageSetup::OFinalDBPageSetup(TabPageParent pParent, const SfxItemSet& _rCoreAttrs)
+ : OGenericAdministrationPage(pParent, "dbaccess/ui/finalpagewizard.ui", "PageFinal", _rCoreAttrs)
+ , m_xFTFinalHeader(m_xBuilder->weld_label("headerText"))
+ , m_xFTFinalHelpText(m_xBuilder->weld_label("helpText"))
+ , m_xRBRegisterDataSource(m_xBuilder->weld_radio_button("yesregister"))
+ , m_xRBDontregisterDataSource(m_xBuilder->weld_radio_button("noregister"))
+ , m_xFTAdditionalSettings(m_xBuilder->weld_label("additionalText"))
+ , m_xCBOpenAfterwards(m_xBuilder->weld_check_button("openediting"))
+ , m_xCBStartTableWizard(m_xBuilder->weld_check_button("usewizard"))
+ , m_xFTFinalText(m_xBuilder->weld_label("finishText"))
{
- get(m_pFTFinalHeader, "headerText");
- get(m_pFTFinalHelpText, "helpText");
- get(m_pRBRegisterDataSource, "yesregister");
- get(m_pRBDontregisterDataSource, "noregister");
- get(m_pFTAdditionalSettings, "additionalText");
- get(m_pCBOpenAfterwards, "openediting");
- get(m_pCBStartTableWizard, "usewizard");
- get(m_pFTFinalText, "finishText");
-
- m_pCBOpenAfterwards->SetClickHdl(LINK(this, OFinalDBPageSetup, OnOpenSelected));
- m_pCBStartTableWizard->SetClickHdl(LINK(this,OGenericAdministrationPage,OnControlModifiedClick));
- m_pRBRegisterDataSource->SetState(true);
+ m_xCBOpenAfterwards->connect_toggled(LINK(this, OFinalDBPageSetup, OnOpenSelected));
+ m_xCBStartTableWizard->connect_toggled(LINK(this,OGenericAdministrationPage,OnControlModifiedButtonClick));
+ m_xRBRegisterDataSource->set_active(true);
}
OFinalDBPageSetup::~OFinalDBPageSetup()
{
- disposeOnce();
- }
-
- void OFinalDBPageSetup::dispose()
- {
- m_pFTFinalHeader.clear();
- m_pFTFinalHelpText.clear();
- m_pRBRegisterDataSource.clear();
- m_pRBDontregisterDataSource.clear();
- m_pFTAdditionalSettings.clear();
- m_pCBOpenAfterwards.clear();
- m_pCBStartTableWizard.clear();
- m_pFTFinalText.clear();
- OGenericAdministrationPage::dispose();
}
bool OFinalDBPageSetup::IsDatabaseDocumentToBeRegistered()
{
- return m_pRBRegisterDataSource->IsChecked() && m_pRBRegisterDataSource->IsEnabled();
+ return m_xRBRegisterDataSource->get_active() && m_xRBRegisterDataSource->get_sensitive();
}
bool OFinalDBPageSetup::IsDatabaseDocumentToBeOpened()
{
- return m_pCBOpenAfterwards->IsChecked() && m_pCBOpenAfterwards->IsEnabled();
+ return m_xCBOpenAfterwards->get_active() && m_xCBOpenAfterwards->get_sensitive();
}
bool OFinalDBPageSetup::IsTableWizardToBeStarted()
{
- return m_pCBStartTableWizard->IsChecked() && m_pCBStartTableWizard->IsEnabled();
+ return m_xCBStartTableWizard->get_active() && m_xCBStartTableWizard->get_sensitive();
}
void OFinalDBPageSetup::fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{
- _rControlList.emplace_back(new ODisableWrapper<FixedText>(m_pFTFinalHeader));
- _rControlList.emplace_back(new ODisableWrapper<FixedText>(m_pFTFinalHelpText));
- _rControlList.emplace_back(new ODisableWrapper<FixedText>(m_pFTAdditionalSettings));
- _rControlList.emplace_back(new ODisableWrapper<FixedText>(m_pFTFinalText));
+ _rControlList.emplace_back(new ODisableWidgetWrapper<weld::Label>(m_xFTFinalHeader.get()));
+ _rControlList.emplace_back(new ODisableWidgetWrapper<weld::Label>(m_xFTFinalHelpText.get()));
+ _rControlList.emplace_back(new ODisableWidgetWrapper<weld::Label>(m_xFTAdditionalSettings.get()));
+ _rControlList.emplace_back(new ODisableWidgetWrapper<weld::Label>(m_xFTFinalText.get()));
}
void OFinalDBPageSetup::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
{
- _rControlList.emplace_back(new OSaveValueWrapper<CheckBox>(m_pCBOpenAfterwards));
- _rControlList.emplace_back(new OSaveValueWrapper<CheckBox>(m_pCBStartTableWizard));
- _rControlList.emplace_back(new OSaveValueWrapper<RadioButton>(m_pRBRegisterDataSource));
- _rControlList.emplace_back(new OSaveValueWrapper<RadioButton>(m_pRBDontregisterDataSource));
+ _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xCBOpenAfterwards.get()));
+ _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xCBStartTableWizard.get()));
+ _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xRBRegisterDataSource.get()));
+ _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xRBDontregisterDataSource.get()));
}
void OFinalDBPageSetup::implInitControls(const SfxItemSet& /*_rSet*/, bool /*_bSaveValue*/)
{
- m_pCBOpenAfterwards->Check();
+ m_xCBOpenAfterwards->set_active(true);
}
void OFinalDBPageSetup::enableTableWizardCheckBox( bool _bSupportsTableCreation)
{
- m_pCBStartTableWizard->Enable(_bSupportsTableCreation);
+ m_xCBStartTableWizard->set_sensitive(_bSupportsTableCreation);
}
bool OFinalDBPageSetup::FillItemSet( SfxItemSet* /*_rSet*/ )
@@ -886,9 +869,9 @@ using namespace ::com::sun::star;
return true;
}
- IMPL_LINK(OFinalDBPageSetup, OnOpenSelected, Button*, _pBox, void)
+ IMPL_LINK(OFinalDBPageSetup, OnOpenSelected, weld::ToggleButton&, rBox, void)
{
- m_pCBStartTableWizard->Enable( _pBox->IsEnabled() && static_cast<CheckBox*>(_pBox)->IsChecked() );
+ m_xCBStartTableWizard->set_sensitive(rBox.get_sensitive() && rBox.get_active());
callModifiedHdl();
}
}
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index b5fbbb8e5a9b..93a44e9db391 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -253,28 +253,27 @@ namespace dbaui
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
static VclPtr<OGenericAdministrationPage> CreateFinalDBTabPageSetup( vcl::Window* pParent, const SfxItemSet& _rAttrSet);
- OFinalDBPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs);
+ OFinalDBPageSetup(TabPageParent pParent, const SfxItemSet& _rCoreAttrs);
virtual ~OFinalDBPageSetup() override;
- virtual void dispose() override;
bool IsDatabaseDocumentToBeRegistered();
bool IsDatabaseDocumentToBeOpened();
bool IsTableWizardToBeStarted();
void enableTableWizardCheckBox( bool _bSupportsTableCreation);
- DECL_LINK(OnOpenSelected, Button*, void);
+ DECL_LINK(OnOpenSelected, weld::ToggleButton&, void);
protected:
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override;
private:
- VclPtr<FixedText> m_pFTFinalHeader;
- VclPtr<FixedText> m_pFTFinalHelpText;
- VclPtr<RadioButton> m_pRBRegisterDataSource;
- VclPtr<RadioButton> m_pRBDontregisterDataSource;
- VclPtr<FixedText> m_pFTAdditionalSettings;
- VclPtr<CheckBox> m_pCBOpenAfterwards;
- VclPtr<CheckBox> m_pCBStartTableWizard;
- VclPtr<FixedText> m_pFTFinalText;
+ std::unique_ptr<weld::Label> m_xFTFinalHeader;
+ std::unique_ptr<weld::Label> m_xFTFinalHelpText;
+ std::unique_ptr<weld::RadioButton> m_xRBRegisterDataSource;
+ std::unique_ptr<weld::RadioButton> m_xRBDontregisterDataSource;
+ std::unique_ptr<weld::Label> m_xFTAdditionalSettings;
+ std::unique_ptr<weld::CheckButton> m_xCBOpenAfterwards;
+ std::unique_ptr<weld::CheckButton> m_xCBStartTableWizard;
+ std::unique_ptr<weld::Label> m_xFTFinalText;
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 1f83fe06c10e..e2d7989b0234 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -158,7 +158,7 @@ namespace dbaui
_rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ComboBox>(m_xTextSeparator.get()));
_rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ComboBox>(m_xDecimalSeparator.get()));
_rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ComboBox>(m_xThousandsSeparator.get()));
- _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::CheckButton>(m_xRowHeader.get()));
+ _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xRowHeader.get()));
_rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ComboBox>(m_xCharSet->get_widget()));
}
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index feabe5fb8c47..9e1106ae1a07 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -63,11 +63,11 @@ namespace dbaui
virtual void Disable() override { m_pSaveValue->set_sensitive(false); }
};
- template <> class OSaveValueWidgetWrapper<weld::CheckButton> : public ISaveValueWrapper
+ template <> class OSaveValueWidgetWrapper<weld::ToggleButton> : public ISaveValueWrapper
{
- weld::CheckButton* m_pSaveValue;
+ weld::ToggleButton* m_pSaveValue;
public:
- explicit OSaveValueWidgetWrapper(weld::CheckButton* _pSaveValue) : m_pSaveValue(_pSaveValue)
+ explicit OSaveValueWidgetWrapper(weld::ToggleButton* _pSaveValue) : m_pSaveValue(_pSaveValue)
{ OSL_ENSURE(m_pSaveValue,"Illegal argument!"); }
virtual void SaveValue() override { m_pSaveValue->save_state(); }
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 9815468d94e6..ccbc88c96371 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -172,7 +172,7 @@ namespace dbaui
{
if (booleanSetting.xControl)
{
- _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::CheckButton>(booleanSetting.xControl.get()));
+ _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(booleanSetting.xControl.get()));
}
}
@@ -317,7 +317,7 @@ namespace dbaui
void GeneratedValuesPage::fillControls( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList )
{
- _rControlList.emplace_back( new OSaveValueWidgetWrapper<weld::CheckButton>( m_xAutoRetrievingEnabled.get() ) );
+ _rControlList.emplace_back( new OSaveValueWidgetWrapper<weld::ToggleButton>( m_xAutoRetrievingEnabled.get() ) );
_rControlList.emplace_back( new OSaveValueWidgetWrapper<weld::Entry>( m_xAutoIncrement.get() ) );
_rControlList.emplace_back( new OSaveValueWidgetWrapper<weld::Entry>( m_xAutoRetrieving.get() ) );
}
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index a9c19e8d2e27..aab7e8d8d80f 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -322,7 +322,7 @@ namespace dbaui
{
OCommonBehaviourTabPage::fillControls(_rControlList);
_rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Entry>(m_xEDHostname.get()));
- _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::CheckButton>(m_xUseCatalog.get()));
+ _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xUseCatalog.get()));
_rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::SpinButton>(m_xNFPortNumber.get()));
}
void OUserDriverDetailsPage::fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
@@ -523,7 +523,7 @@ namespace dbaui
m_aMySQLSettings.fillControls( _rControlList );
_rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Entry>(m_xUserName.get()));
- _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::CheckButton>(m_xPasswordRequired.get()));
+ _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xPasswordRequired.get()));
}
void MySQLNativePage::fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
diff --git a/dbaccess/uiconfig/ui/finalpagewizard.ui b/dbaccess/uiconfig/ui/finalpagewizard.ui
index 0c474e2884cf..919421029fa1 100644
--- a/dbaccess/uiconfig/ui/finalpagewizard.ui
+++ b/dbaccess/uiconfig/ui/finalpagewizard.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="dba">
<requires lib="gtk+" version="3.18"/>
<object class="GtkBox" id="PageFinal">
@@ -13,9 +13,9 @@
<object class="GtkLabel" id="headerText">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="finalpagewizard|headerText">Decide How to Proceed After Saving the Database</property>
<property name="wrap">True</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -40,11 +40,12 @@
<object class="GtkLabel" id="helpText">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="finalpagewizard|helpText">Do you want the wizard to register the database in %PRODUCTNAME?</property>
<property name="wrap">True</property>
<property name="wrap_mode">word-char</property>
+ <property name="width_chars">72</property>
<property name="max_width_chars">72</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -62,7 +63,6 @@
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">noregister</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -101,10 +101,10 @@
<object class="GtkLabel" id="additionalText">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="finalpagewizard|additionalText">After the database file has been saved, what do you want to do?</property>
<property name="wrap">True</property>
<property name="max_width_chars">72</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -133,8 +133,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_underline">True</property>
<property name="margin_left">12</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -153,8 +153,8 @@
<object class="GtkLabel" id="finishText">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="finalpagewizard|finishText">Click 'Finish' to save the database.</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
More information about the Libreoffice-commits
mailing list