[Libreoffice-commits] core.git: cui/source cui/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Mar 12 11:23:28 UTC 2019
cui/source/inc/cuioptgenrl.hxx | 23 ++----
cui/source/options/optgenrl.cxx | 144 ++++++++++++++++++----------------------
cui/uiconfig/ui/optuserpage.ui | 59 ++++++++++------
3 files changed, 113 insertions(+), 113 deletions(-)
New commits:
commit 3a15c034be9f557f350d0ba1f3a842151066eaae
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Mar 12 09:59:35 2019 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Mar 12 12:23:02 2019 +0100
weld SvxGeneralTabPage
Change-Id: I3b32a8f657078ba76d92bee7bff6bab1b226e31e
Reviewed-on: https://gerrit.libreoffice.org/69083
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 7e2c753d3b59..2ea91a19eb3d 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -23,16 +23,10 @@
#include <svx/optgenrl.hxx>
#include <sfx2/tabdlg.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/layout.hxx>
+#include <vcl/weld.hxx>
#include <vector>
-// forward ---------------------------------------------------------------
-
-class Edit;
-
-
// class SvxGeneralTabPage -----------------------------------------------
class SvxGeneralTabPage : public SfxTabPage
@@ -40,11 +34,11 @@ class SvxGeneralTabPage : public SfxTabPage
using TabPage::DeactivatePage;
private:
// the "Use data for document properties" checkbox
- VclPtr<CheckBox> m_pUseDataCB;
- VclPtr<VclContainer> m_pCryptoFrame;
- VclPtr<ListBox> m_pSigningKeyLB;
- VclPtr<ListBox> m_pEncryptionKeyLB;
- VclPtr<CheckBox> m_pEncryptToSelfCB;
+ std::unique_ptr<weld::CheckButton> m_xUseDataCB;
+ std::unique_ptr<weld::Widget> m_xCryptoFrame;
+ std::unique_ptr<weld::ComboBox> m_xSigningKeyLB;
+ std::unique_ptr<weld::ComboBox> m_xEncryptionKeyLB;
+ std::unique_ptr<weld::CheckButton> m_xEncryptToSelfCB;
// rows
struct Row;
std::vector<std::shared_ptr<Row> > vRows;
@@ -55,7 +49,7 @@ private:
unsigned nNameRow;
unsigned nShortNameField;
- DECL_LINK( ModifyHdl_Impl, Edit&, void );
+ DECL_LINK( ModifyHdl_Impl, weld::Entry&, void );
bool GetData_Impl();
void SetData_Impl();
@@ -68,9 +62,8 @@ protected:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
- SvxGeneralTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
+ SvxGeneralTabPage(TabPageParent pParent, const SfxItemSet& rSet);
virtual ~SvxGeneralTabPage() override;
- virtual void dispose() override;
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index ad218734162c..e7d407874994 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -168,17 +168,17 @@ const vFieldInfo[] =
struct SvxGeneralTabPage::Row
{
// row label
- VclPtr<FixedText> pLabel;
+ std::unique_ptr<weld::Label> xLabel;
// first and last field in the row (last is exclusive)
unsigned nFirstField, nLastField;
public:
- explicit Row (FixedText *pLabel_)
- : pLabel(pLabel_)
+ explicit Row (std::unique_ptr<weld::Label> xLabel_)
+ : xLabel(std::move(xLabel_))
, nFirstField(0)
, nLastField(0)
{
- pLabel->Show();
+ xLabel->show();
}
};
@@ -190,38 +190,38 @@ struct SvxGeneralTabPage::Field
// which field is this? (in vFieldInfo[] above)
unsigned iField;
// edit box
- VclPtr<Edit> pEdit;
+ std::unique_ptr<weld::Entry> xEdit;
+ std::unique_ptr<weld::Container> xParent;
public:
- Field (Edit *pEdit_, unsigned iField_)
+ Field (std::unique_ptr<weld::Entry> xEdit_, unsigned iField_)
: iField(iField_)
- , pEdit(pEdit_)
+ , xEdit(std::move(xEdit_))
+ , xParent(xEdit->weld_parent())
{
//We want all widgets inside a container, so each row of the toplevel
//grid has another container in it. To avoid adding spacing to these
//empty grids they all default to invisible, so show them if their
//children are visible
- pEdit->GetParent()->Show();
- pEdit->Show();
+ xParent->show();
+ xEdit->show();
}
};
-SvxGeneralTabPage::SvxGeneralTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
-
- : SfxTabPage(pParent, "OptUserPage", "cui/ui/optuserpage.ui", &rCoreSet)
+SvxGeneralTabPage::SvxGeneralTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
+ : SfxTabPage(pParent, "cui/ui/optuserpage.ui", "OptUserPage", &rCoreSet)
+ , m_xUseDataCB(m_xBuilder->weld_check_button("usefordocprop"))
+ , m_xCryptoFrame(m_xBuilder->weld_widget( "cryptography"))
+ , m_xSigningKeyLB(m_xBuilder->weld_combo_box("signingkey"))
+ , m_xEncryptionKeyLB(m_xBuilder->weld_combo_box("encryptionkey"))
+ , m_xEncryptToSelfCB(m_xBuilder->weld_check_button("encrypttoself"))
{
- get(m_pUseDataCB, "usefordocprop");
-
- get(m_pCryptoFrame, "cryptography");
- get(m_pSigningKeyLB, "signingkey");
- get(m_pEncryptionKeyLB, "encryptionkey");
- get(m_pEncryptToSelfCB, "encrypttoself");
InitControls();
#if HAVE_FEATURE_GPGME
InitCryptography();
#else
- m_pCryptoFrame->Hide();
+ m_xCryptoFrame->hide();
#endif
SetExchangeSupport(); // this page needs ExchangeSupport
@@ -233,17 +233,6 @@ SvxGeneralTabPage::~SvxGeneralTabPage()
disposeOnce();
}
-void SvxGeneralTabPage::dispose()
-{
- m_pUseDataCB.clear();
- m_pSigningKeyLB.clear();
- m_pEncryptionKeyLB.clear();
- m_pEncryptToSelfCB.clear();
- m_pCryptoFrame.clear();
- SfxTabPage::dispose();
-}
-
-
// Initializes the titles and the edit boxes,
// according to vRowInfo[] and vFieldInfo[] above.
void SvxGeneralTabPage::InitControls ()
@@ -273,7 +262,7 @@ void SvxGeneralTabPage::InitControls ()
continue;
// creating row
vRows.push_back(std::make_shared<Row>(
- get<FixedText>(vRowInfo[iRow].pTextId)));
+ m_xBuilder->weld_label(vRowInfo[iRow].pTextId)));
Row& rRow = *vRows.back();
// fields in the row
static unsigned const nFieldCount = SAL_N_ELEMENTS(vFieldInfo);
@@ -286,7 +275,7 @@ void SvxGeneralTabPage::InitControls ()
{
// creating edit field
vFields.push_back(std::make_shared<Field>(
- get<Edit>(vFieldInfo[iField].pEditId), iField));
+ m_xBuilder->weld_entry(vFieldInfo[iField].pEditId), iField));
// "short name" field?
if (vFieldInfo[iField].nUserOptionsId == UserOptToken::ID)
{
@@ -301,7 +290,7 @@ void SvxGeneralTabPage::InitControls ()
void SvxGeneralTabPage::InitCryptography()
{
#if HAVE_FEATURE_GPGME
- m_pCryptoFrame->Show();
+ m_xCryptoFrame->show();
uno::Reference< xml::crypto::XSEInitializer > xSEInitializer;
try
@@ -317,22 +306,21 @@ void SvxGeneralTabPage::InitCryptography()
{
for (auto& xCert : xCertificates)
{
- m_pSigningKeyLB->InsertEntry( xCert->getIssuerName());
- m_pEncryptionKeyLB->InsertEntry( xCert->getIssuerName());
+ m_xSigningKeyLB->append_text( xCert->getIssuerName());
+ m_xEncryptionKeyLB->append_text( xCert->getIssuerName());
}
}
//tdf#115015: wrap checkbox text and listboxes if necessary
- Size aPrefSize(m_pEncryptToSelfCB->get_preferred_size());
- Size aSize(m_pEncryptToSelfCB->CalcMinimumSize(40*approximate_char_width()));
- if (aPrefSize.Width() > aSize.Width())
+ int nPrefWidth(m_xEncryptToSelfCB->get_preferred_size().Width());
+ int nMaxWidth = m_xEncryptToSelfCB->get_approximate_digit_width() * 40;
+ if (nPrefWidth > nMaxWidth)
{
- m_pSigningKeyLB->set_width_request(aSize.Width());
- m_pEncryptionKeyLB->set_width_request(aSize.Width());
- m_pEncryptToSelfCB->set_width_request(aSize.Width());
- m_pEncryptToSelfCB->set_height_request(aSize.Height());
+ m_xSigningKeyLB->set_size_request(nMaxWidth, -1);
+ m_xEncryptionKeyLB->set_size_request(nMaxWidth, -1);
+ m_xEncryptToSelfCB->set_label_line_wrap(true);
+ m_xEncryptToSelfCB->set_size_request(nMaxWidth, -1);
}
-
}
}
catch ( uno::Exception const & )
@@ -344,30 +332,30 @@ void SvxGeneralTabPage::InitCryptography()
void SvxGeneralTabPage::SetLinks ()
{
// link for updating the initials
- Link<Edit&,void> aLink = LINK( this, SvxGeneralTabPage, ModifyHdl_Impl );
+ Link<weld::Entry&,void> aLink = LINK( this, SvxGeneralTabPage, ModifyHdl_Impl );
Row& rNameRow = *vRows[nNameRow];
for (unsigned i = rNameRow.nFirstField; i != rNameRow.nLastField - 1; ++i)
- vFields[i]->pEdit->SetModifyHdl(aLink);
+ vFields[i]->xEdit->connect_changed(aLink);
}
VclPtr<SfxTabPage> SvxGeneralTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
{
- return VclPtr<SvxGeneralTabPage>::Create( pParent.pParent, *rAttrSet );
+ return VclPtr<SvxGeneralTabPage>::Create( pParent, *rAttrSet );
}
bool SvxGeneralTabPage::FillItemSet( SfxItemSet* )
{
// remove leading and trailing whitespaces
for (auto const & i: vFields)
- i->pEdit->SetText(comphelper::string::strip(i->pEdit->GetText(), ' '));
+ i->xEdit->set_text(comphelper::string::strip(i->xEdit->get_text(), ' '));
bool bModified = false;
bModified |= GetData_Impl();
SvtSaveOptions aSaveOpt;
- if ( m_pUseDataCB->IsChecked() != aSaveOpt.IsUseUserData() )
+ if (m_xUseDataCB->get_active() != aSaveOpt.IsUseUserData())
{
- aSaveOpt.SetUseUserData( m_pUseDataCB->IsChecked() );
+ aSaveOpt.SetUseUserData(m_xUseDataCB->get_active());
bModified = true;
}
return bModified;
@@ -386,20 +374,20 @@ void SvxGeneralTabPage::Reset( const SfxItemSet* rSet )
{
for (auto const & i: vFields)
if (nField == vFieldInfo[i->iField].nGrabFocusId)
- i->pEdit->GrabFocus();
+ i->xEdit->grab_focus();
}
else
- vFields.front()->pEdit->GrabFocus();
+ vFields.front()->xEdit->grab_focus();
}
- m_pUseDataCB->Check( SvtSaveOptions().IsUseUserData() );
+ m_xUseDataCB->set_sensitive( SvtSaveOptions().IsUseUserData() );
}
// ModifyHdl_Impl()
// This handler updates the initials (short name)
// when one of the name fields was updated.
-IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit&, rEdit, void )
+IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, weld::Entry&, rEdit, void )
{
// short name field and row
Field& rShortName = *vFields[nShortNameField];
@@ -410,24 +398,24 @@ IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit&, rEdit, void )
unsigned nField = nInits;
for (unsigned i = 0; i != nInits; ++i)
{
- if (vFields[rNameRow.nFirstField + i]->pEdit == &rEdit)
+ if (vFields[rNameRow.nFirstField + i]->xEdit.get() == &rEdit)
nField = i;
}
// updating the initial
- if (nField < nInits && rShortName.pEdit->IsEnabled())
+ if (nField < nInits && rShortName.xEdit->get_sensitive())
{
- OUString sShortName = rShortName.pEdit->GetText();
+ OUString sShortName = rShortName.xEdit->get_text();
// clear short name if it contains more characters than the number of initials
if (static_cast<unsigned>(sShortName.getLength()) > nInits)
{
- rShortName.pEdit->SetText(OUString());
+ rShortName.xEdit->set_text(OUString());
}
while (static_cast<unsigned>(sShortName.getLength()) < nInits)
sShortName += " ";
- OUString sName = rEdit.GetText();
+ OUString sName = rEdit.get_text();
OUString sLetter = sName.isEmpty()
? OUString(u' ') : sName.copy(0, 1);
- rShortName.pEdit->SetText(sShortName.replaceAt(nField, 1, sLetter).trim());
+ rShortName.xEdit->set_text(sShortName.replaceAt(nField, 1, sLetter).trim());
}
}
@@ -439,14 +427,14 @@ bool SvxGeneralTabPage::GetData_Impl()
for (auto const & i: vFields)
aUserOpt.SetToken(
vFieldInfo[i->iField].nUserOptionsId,
- i->pEdit->GetText()
+ i->xEdit->get_text()
);
// modified?
bool bModified = false;
for (auto const & i: vFields)
{
- if (i->pEdit->IsValueChangedFromSaved())
+ if (i->xEdit->get_value_changed_from_saved())
{
bModified = true;
break;
@@ -454,18 +442,18 @@ bool SvxGeneralTabPage::GetData_Impl()
}
#if HAVE_FEATURE_GPGME
- OUString aSK = m_pSigningKeyLB->GetSelectedEntryPos() == 0 ? OUString() //i.e. no key
- : m_pSigningKeyLB->GetSelectedEntry();
- OUString aEK = m_pEncryptionKeyLB->GetSelectedEntryPos() == 0 ? OUString()
- : m_pEncryptionKeyLB->GetSelectedEntry();
+ OUString aSK = m_xSigningKeyLB->get_active() == 0 ? OUString() //i.e. no key
+ : m_xSigningKeyLB->get_active_text();
+ OUString aEK = m_xEncryptionKeyLB->get_active() == 0 ? OUString()
+ : m_xEncryptionKeyLB->get_active_text();
aUserOpt.SetToken( UserOptToken::SigningKey, aSK );
aUserOpt.SetToken( UserOptToken::EncryptionKey, aEK );
- aUserOpt.SetBoolValue( UserOptToken::EncryptToSelf, m_pEncryptToSelfCB->IsChecked() );
+ aUserOpt.SetBoolValue( UserOptToken::EncryptToSelf, m_xEncryptToSelfCB->get_active() );
- bModified |= m_pSigningKeyLB->IsValueChangedFromSaved() ||
- m_pEncryptionKeyLB->IsValueChangedFromSaved() ||
- m_pEncryptToSelfCB->IsValueChangedFromSaved();
+ bModified |= m_xSigningKeyLB->get_value_changed_from_saved() ||
+ m_xEncryptionKeyLB->get_value_changed_from_saved() ||
+ m_xEncryptToSelfCB->get_state_changed_from_saved();
#endif
return bModified;
@@ -486,29 +474,29 @@ void SvxGeneralTabPage::SetData_Impl()
Field& rField = *vFields[iField];
// updating content
UserOptToken const nToken = vFieldInfo[rField.iField].nUserOptionsId;
- rField.pEdit->SetText(aUserOpt.GetToken(nToken));
+ rField.xEdit->set_text(aUserOpt.GetToken(nToken));
// is enabled?
bool const bEnableEdit = !aUserOpt.IsTokenReadonly(nToken);
- rField.pEdit->Enable(bEnableEdit);
+ rField.xEdit->set_sensitive(bEnableEdit);
bEnableLabel = bEnableLabel || bEnableEdit;
}
- rRow.pLabel->Enable(bEnableLabel);
+ rRow.xLabel->set_sensitive(bEnableLabel);
}
// saving
for (auto const & i: vFields)
- i->pEdit->SaveValue();
+ i->xEdit->save_value();
#if HAVE_FEATURE_GPGME
OUString aSK = aUserOpt.GetToken(UserOptToken::SigningKey);
- aSK.isEmpty() ? m_pSigningKeyLB->SelectEntryPos( 0 ) //i.e. 'No Key'
- : m_pSigningKeyLB->SelectEntry( aSK );
+ aSK.isEmpty() ? m_xSigningKeyLB->set_active( 0 ) //i.e. 'No Key'
+ : m_xSigningKeyLB->set_active_text( aSK );
OUString aEK = aUserOpt.GetToken(UserOptToken::EncryptionKey);
- aEK.isEmpty() ? m_pEncryptionKeyLB->SelectEntryPos( 0 ) //i.e. 'No Key'
- : m_pEncryptionKeyLB->SelectEntry( aEK );
+ aEK.isEmpty() ? m_xEncryptionKeyLB->set_active( 0 ) //i.e. 'No Key'
+ : m_xEncryptionKeyLB->set_active_text( aEK );
- m_pEncryptToSelfCB->Check( aUserOpt.GetEncryptToSelf() );
+ m_xEncryptToSelfCB->set_active( aUserOpt.GetEncryptToSelf() );
#endif
}
diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui
index 37726febbd22..24616760fbb9 100644
--- a/cui/uiconfig/ui/optuserpage.ui
+++ b/cui/uiconfig/ui/optuserpage.ui
@@ -1,18 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="cui">
<requires lib="gtk+" version="3.18"/>
- <object class="GtkListStore" id="liststore1">
- <columns>
- <!-- column-name gchararray1 -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes" context="optuserpage|liststore1">No key</col>
- </row>
- </data>
- </object>
<object class="GtkBox" id="OptUserPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -165,6 +154,7 @@
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="firstname-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|firstname-atkobject">First name</property>
@@ -182,6 +172,7 @@
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="lastname-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="lastname-atkobject">Last name</property>
@@ -198,6 +189,7 @@
<property name="can_focus">True</property>
<property name="no_show_all">True</property>
<property name="valign">center</property>
+ <property name="activates_default">True</property>
<property name="width_chars">7</property>
<child internal-child="accessible">
<object class="AtkObject" id="shortname-atkobject">
@@ -227,6 +219,7 @@
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="city-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="city-atkobject">City</property>
@@ -244,6 +237,7 @@
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="state-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="state-atkobject">State</property>
@@ -260,6 +254,7 @@
<property name="can_focus">True</property>
<property name="no_show_all">True</property>
<property name="valign">center</property>
+ <property name="activates_default">True</property>
<property name="width_chars">15</property>
<child internal-child="accessible">
<object class="AtkObject" id="zip-atkobject">
@@ -290,6 +285,7 @@
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="title-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="title-atkobject">Title</property>
@@ -307,6 +303,7 @@
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="position-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="position-atkobject">Position</property>
@@ -335,6 +332,7 @@
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="home-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="home-atkobject">Home telephone number</property>
@@ -352,6 +350,7 @@
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="work-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="work-atkobject">Work telephone number</property>
@@ -381,6 +380,7 @@
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="fax-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="fax-atkobject">Fax number</property>
@@ -398,6 +398,7 @@
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="email-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="email-atkobject">email address</property>
@@ -455,6 +456,7 @@
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="ruslastname-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="ruslastname-atkobject">Last name</property>
@@ -472,6 +474,7 @@
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="rusfathersname-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="rusfathersname-atkobject">Father's name</property>
@@ -488,6 +491,7 @@
<property name="can_focus">True</property>
<property name="no_show_all">True</property>
<property name="valign">center</property>
+ <property name="activates_default">True</property>
<property name="width_chars">7</property>
<child internal-child="accessible">
<object class="AtkObject" id="russhortname-atkobject">
@@ -506,6 +510,7 @@
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="rusfirstname-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="rusfirstname-atkobject">First name</property>
@@ -548,6 +553,7 @@
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="eastlastname-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="eastlastname-atkobject">Last name</property>
@@ -565,6 +571,7 @@
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="eastfirstname-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="eastfirstname-atkobject">First name</property>
@@ -581,6 +588,7 @@
<property name="can_focus">True</property>
<property name="no_show_all">True</property>
<property name="valign">center</property>
+ <property name="activates_default">True</property>
<property name="width_chars">7</property>
<child internal-child="accessible">
<object class="AtkObject" id="eastshortname-atkobject">
@@ -624,6 +632,7 @@
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="russtreet-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="russtreet-atkobject">Street</property>
@@ -640,6 +649,7 @@
<property name="can_focus">True</property>
<property name="no_show_all">True</property>
<property name="valign">center</property>
+ <property name="activates_default">True</property>
<property name="width_chars">15</property>
<child internal-child="accessible">
<object class="AtkObject" id="apartnum-atkobject">
@@ -683,6 +693,7 @@
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="icity-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="icity-atkobject">City</property>
@@ -699,6 +710,7 @@
<property name="can_focus">True</property>
<property name="no_show_all">True</property>
<property name="valign">center</property>
+ <property name="activates_default">True</property>
<property name="width_chars">15</property>
<child internal-child="accessible">
<object class="AtkObject" id="izip-atkobject">
@@ -728,6 +740,7 @@
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -751,6 +764,7 @@
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -774,6 +788,7 @@
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -857,11 +872,13 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="encryptionkey">
+ <object class="GtkComboBoxText" id="encryptionkey">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="model">liststore1</property>
+ <items>
+ <item translatable="yes" context="optuserpage|liststore1">No key</item>
+ </items>
</object>
<packing>
<property name="left_attach">1</property>
@@ -869,11 +886,13 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="signingkey">
+ <object class="GtkComboBoxText" id="signingkey">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="model">liststore1</property>
+ <items>
+ <item translatable="yes" context="optuserpage|liststore1">No key</item>
+ </items>
</object>
<packing>
<property name="left_attach">1</property>
@@ -881,13 +900,13 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="encrypttoself:wrap">
+ <object class="GtkCheckButton" id="encrypttoself">
<property name="label" translatable="yes" context="optuserpage|encrypttoself">When encrypting documents, always encrypt to self</property>
- <property name="can_focus">True</property>
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -904,8 +923,8 @@
</child>
<child type="label">
<object class="GtkLabel" id="cryptographylabel">
- <property name="can_focus">False</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" context="optuserpage|cryptographylabel">Cryptography</property>
<property name="use_underline">True</property>
<attributes>
More information about the Libreoffice-commits
mailing list