cui/UIConfig_cui.mk | 1
cui/source/inc/autocdlg.hxx | 32 +--
cui/source/inc/cuires.hrc | 1
cui/source/inc/helpid.hrc | 1
cui/source/tabpages/autocdlg.cxx | 183 +++++++++----------
cui/source/tabpages/autocdlg.hrc | 22 --
cui/source/tabpages/autocdlg.src | 126 -------------
cui/uiconfig/ui/acorexceptpage.ui | 348 +++++++++++++++++++++++++++++++++++++
cui/uiconfig/ui/acorreplacepage.ui | 200 ++++++++++-----------
9 files changed, 545 insertions(+), 369 deletions(-)
New commits:
commit 599d66fdce6149c7fa5c7c0ad00d4da3b9ce2dfe
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Apr 18 14:35:53 2013 +0100
convert autocorrect replace tabpage to .ui format
Change-Id: I962fae2d4d177a7ca364d0dece0c15132a199497
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 61d0b15..327223f 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,cui))
$(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/aboutdialog \
+ cui/uiconfig/ui/acorexceptpage \
cui/uiconfig/ui/acorreplacepage \
cui/uiconfig/ui/asiantypography \
cui/uiconfig/ui/autocorrectdialog \
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index d953ad2..b760dca 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -301,23 +301,21 @@ class OfaAutocorrExceptPage : public SfxTabPage
using TabPage::DeactivatePage;
private:
- FixedLine aAbbrevFL;
- AutoCorrEdit aAbbrevED;
- ListBox aAbbrevLB;
- PushButton aNewAbbrevPB;
- PushButton aDelAbbrevPB;
- CheckBox aAutoAbbrevCB;
-
- FixedLine aDoubleCapsFL;
- AutoCorrEdit aDoubleCapsED;
- ListBox aDoubleCapsLB;
- PushButton aNewDoublePB;
- PushButton aDelDoublePB;
- CheckBox aAutoCapsCB;
-
- StringsTable aStringsTable;
- CollatorWrapper* pCompareClass;
- LanguageType eLang;
+ AutoCorrEdit* m_pAbbrevED;
+ ListBox* m_pAbbrevLB;
+ PushButton* m_pNewAbbrevPB;
+ PushButton* m_pDelAbbrevPB;
+ CheckBox* m_pAutoAbbrevCB;
+
+ AutoCorrEdit* m_pDoubleCapsED;
+ ListBox* m_pDoubleCapsLB;
+ PushButton* m_pNewDoublePB;
+ PushButton* m_pDelDoublePB;
+ CheckBox* m_pAutoCapsCB;
+
+ StringsTable aStringsTable;
+ CollatorWrapper* pCompareClass;
+ LanguageType eLang;
DECL_LINK(NewDelHdl, PushButton*);
DECL_LINK(SelectHdl, ListBox*);
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 1a01385..bdb022d 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -116,7 +116,6 @@
#define RID_OFAPAGE_AUTOCORR_OPTIONS (RID_OFA_START + 102)
#define RID_OFAPAGE_AUTOFMT_APPLY (RID_OFA_START + 110)
-#define RID_OFAPAGE_AUTOCORR_EXCEPT (RID_OFA_START + 104)
#define RID_OFAPAGE_AUTOCORR_QUOTE (RID_OFA_START + 109)
#define RID_OFADLG_PRCNT_SET (RID_OFA_START + 111)
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 972992e..f3b95fd 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -238,7 +238,6 @@
#define HID_TPCOLOR_CMYK_3 "CUI_HID_TPCOLOR_CMYK_3"
#define HID_OFAPAGE_AUTOCORR_OPTIONS "CUI_HID_OFAPAGE_AUTOCORR_OPTIONS"
#define HID_OFAPAGE_AUTOFMT_OPTIONS "CUI_HID_OFAPAGE_AUTOFMT_OPTIONS"
-#define HID_OFAPAGE_AUTOCORR_EXCEPT "CUI_HID_OFAPAGE_AUTOCORR_EXCEPT"
#define HID_OFAPAGE_AUTOCORR_QUOTE "CUI_HID_OFAPAGE_AUTOCORR_QUOTE"
#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS "CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS"
#define HID_PAGE_CONNECTION "CUI_HID_PAGE_CONNECTION"
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 1ea6a9f..4c12dee 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1347,51 +1347,40 @@ static sal_Bool lcl_FindInArray(std::vector<OUString>&
rStrings, const String& r
return sal_False;
}
-OfaAutocorrExceptPage::OfaAutocorrExceptPage( Window* pParent,
- const SfxItemSet& rSet ) :
- SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_EXCEPT ), rSet),
- aAbbrevFL (this, CUI_RES(FL_ABBREV )),
- aAbbrevED (this, CUI_RES(ED_ABBREV )),
- aAbbrevLB (this, CUI_RES(LB_ABBREV )),
- aNewAbbrevPB (this, CUI_RES(PB_NEWABBREV )),
- aDelAbbrevPB (this, CUI_RES(PB_DELABBREV )),
- aAutoAbbrevCB (this, CUI_RES(CB_AUTOABBREV )),
- aDoubleCapsFL (this, CUI_RES(FL_DOUBLECAPS )),
- aDoubleCapsED (this, CUI_RES(ED_DOUBLE_CAPS )),
- aDoubleCapsLB (this, CUI_RES(LB_DOUBLE_CAPS )),
- aNewDoublePB (this, CUI_RES(PB_NEWDOUBLECAPS)),
- aDelDoublePB (this, CUI_RES(PB_DELDOUBLECAPS)),
- aAutoCapsCB (this, CUI_RES(CB_AUTOCAPS )),
- eLang(eLastDialogLanguage)
-{
- aNewAbbrevPB.SetAccessibleName(String(CUI_RES(STR_PB_NEWABBREV) ) );
- aDelAbbrevPB.SetAccessibleName(String(CUI_RES(STR_PB_DELABBREV) ) );
- aNewDoublePB.SetAccessibleName(String(CUI_RES(STR_PB_NEWDOUBLECAPS) ) );
- aDelDoublePB.SetAccessibleName(String(CUI_RES(STR_PB_DELDOUBLECAPS) ) );
+OfaAutocorrExceptPage::OfaAutocorrExceptPage(Window* pParent, const
SfxItemSet& rSet)
+ : SfxTabPage(pParent, "AcorExceptPage", "cui/ui/acorexceptpage.ui", rSet)
+ , eLang(eLastDialogLanguage)
+{
+ get(m_pAbbrevED, "abbrev");
+ get(m_pAbbrevLB, "abbrevlist");
+ m_pAbbrevLB->SetStyle(m_pAbbrevLB->GetStyle() | WB_SORT);
+ get(m_pNewAbbrevPB, "newabbrev");
+ get(m_pDelAbbrevPB, "delabbrev");
+ get(m_pAutoAbbrevCB, "autoabbrev");
- FreeResource();
+ get(m_pDoubleCapsED, "double");
+ get(m_pDoubleCapsLB, "doublelist");
+ m_pDoubleCapsLB->SetStyle(m_pDoubleCapsLB->GetStyle() | WB_SORT);
+ get(m_pNewDoublePB, "newdouble");
+ get(m_pDelDoublePB, "deldouble");
+ get(m_pAutoCapsCB, "autodouble");
::com::sun::star::lang::Locale aLcl( LanguageTag(eLastDialogLanguage
).getLocale());
pCompareClass = new CollatorWrapper(
comphelper::getProcessComponentContext() );
pCompareClass->loadDefaultCollator( aLcl, 0 );
- aNewAbbrevPB.SetClickHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl));
- aDelAbbrevPB.SetClickHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl));
- aNewDoublePB.SetClickHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl));
- aDelDoublePB.SetClickHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl));
-
- aAbbrevLB.SetSelectHdl(LINK(this, OfaAutocorrExceptPage, SelectHdl));
- aDoubleCapsLB.SetSelectHdl(LINK(this, OfaAutocorrExceptPage, SelectHdl));
- aAbbrevED.SetModifyHdl(LINK(this, OfaAutocorrExceptPage, ModifyHdl));
- aDoubleCapsED.SetModifyHdl(LINK(this, OfaAutocorrExceptPage, ModifyHdl));
+ m_pNewAbbrevPB->SetClickHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl));
+ m_pDelAbbrevPB->SetClickHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl));
+ m_pNewDoublePB->SetClickHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl));
+ m_pDelDoublePB->SetClickHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl));
- aAbbrevED.SetActionHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl));
- aDoubleCapsED.SetActionHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl));
+ m_pAbbrevLB->SetSelectHdl(LINK(this, OfaAutocorrExceptPage, SelectHdl));
+ m_pDoubleCapsLB->SetSelectHdl(LINK(this, OfaAutocorrExceptPage,
SelectHdl));
+ m_pAbbrevED->SetModifyHdl(LINK(this, OfaAutocorrExceptPage, ModifyHdl));
+ m_pDoubleCapsED->SetModifyHdl(LINK(this, OfaAutocorrExceptPage,
ModifyHdl));
- aNewAbbrevPB.SetAccessibleRelationMemberOf(&aAbbrevFL);
- aDelAbbrevPB.SetAccessibleRelationMemberOf(&aAbbrevFL);
- aNewDoublePB.SetAccessibleRelationMemberOf(&aDoubleCapsFL);
- aDelDoublePB.SetAccessibleRelationMemberOf(&aDoubleCapsFL);
+ m_pAbbrevED->SetActionHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl));
+ m_pDoubleCapsED->SetActionHdl(LINK(this, OfaAutocorrExceptPage,
NewDelHdl));
}
OfaAutocorrExceptPage::~OfaAutocorrExceptPage()
@@ -1491,16 +1480,16 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet(
SfxItemSet& )
for( i = nCount; i; )
{
String* pString = (*pWrdList)[ --i ];
- if( USHRT_MAX == aDoubleCapsLB.GetEntryPos(*pString) )
+ if( USHRT_MAX == m_pDoubleCapsLB->GetEntryPos(*pString) )
{
delete (*pWrdList)[ i ];
pWrdList->erase(i);
}
}
- nCount = aDoubleCapsLB.GetEntryCount();
+ nCount = m_pDoubleCapsLB->GetEntryCount();
for( i = 0; i < nCount; ++i )
{
- String* pEntry = new String( aDoubleCapsLB.GetEntry( i ) );
+ String* pEntry = new String( m_pDoubleCapsLB->GetEntry( i ) );
if( !pWrdList->insert( pEntry ).second)
delete pEntry;
}
@@ -1516,25 +1505,25 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet(
SfxItemSet& )
for( i = nCount; i; )
{
String* pString = (*pCplList)[ --i ];
- if( USHRT_MAX == aAbbrevLB.GetEntryPos(*pString) )
+ if( USHRT_MAX == m_pAbbrevLB->GetEntryPos(*pString) )
{
delete (*pCplList)[ i ];
pCplList->erase(i);
}
}
- nCount = aAbbrevLB.GetEntryCount();
+ nCount = m_pAbbrevLB->GetEntryCount();
for( i = 0; i < nCount; ++i )
{
- String* pEntry = new String( aAbbrevLB.GetEntry( i ) );
+ String* pEntry = new String( m_pAbbrevLB->GetEntry( i ) );
if( !pCplList->insert( pEntry ).second)
delete pEntry;
}
pAutoCorrect->SaveCplSttExceptList(eLang);
}
- if(aAutoAbbrevCB.IsChecked() != aAutoAbbrevCB.GetSavedValue())
- pAutoCorrect->SetAutoCorrFlag( SaveWordCplSttLst,
aAutoAbbrevCB.IsChecked());
- if(aAutoCapsCB.IsChecked() != aAutoCapsCB.GetSavedValue())
- pAutoCorrect->SetAutoCorrFlag( SaveWordWrdSttLst,
aAutoCapsCB.IsChecked());
+ if(m_pAutoAbbrevCB->IsChecked() != m_pAutoAbbrevCB->GetSavedValue())
+ pAutoCorrect->SetAutoCorrFlag( SaveWordCplSttLst,
m_pAutoAbbrevCB->IsChecked());
+ if(m_pAutoCapsCB->IsChecked() != m_pAutoCapsCB->GetSavedValue())
+ pAutoCorrect->SetAutoCorrFlag( SaveWordWrdSttLst,
m_pAutoCapsCB->IsChecked());
return sal_False;
}
@@ -1548,8 +1537,8 @@ void OfaAutocorrExceptPage::SetLanguage(LanguageType eSet)
delete pCompareClass;
pCompareClass = new CollatorWrapper(
comphelper::getProcessComponentContext() );
pCompareClass->loadDefaultCollator( LanguageTag( eLastDialogLanguage
).getLocale(), 0 );
- ModifyHdl(&aAbbrevED);
- ModifyHdl(&aDoubleCapsED);
+ ModifyHdl(m_pAbbrevED);
+ ModifyHdl(m_pDoubleCapsED);
}
}
@@ -1577,26 +1566,26 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(sal_Bool
bFromReset,
}
sal_uInt16 i;
- for(i = 0; i < aAbbrevLB.GetEntryCount(); i++)
- pArrays->aAbbrevStrings.push_back(OUString(aAbbrevLB.GetEntry(i)));
+ for(i = 0; i < m_pAbbrevLB->GetEntryCount(); i++)
+
pArrays->aAbbrevStrings.push_back(OUString(m_pAbbrevLB->GetEntry(i)));
- for(i = 0; i < aDoubleCapsLB.GetEntryCount(); i++)
-
pArrays->aDoubleCapsStrings.push_back(OUString(aDoubleCapsLB.GetEntry(i)));
+ for(i = 0; i < m_pDoubleCapsLB->GetEntryCount(); i++)
+
pArrays->aDoubleCapsStrings.push_back(OUString(m_pDoubleCapsLB->GetEntry(i)));
}
- aDoubleCapsLB.Clear();
- aAbbrevLB.Clear();
+ m_pDoubleCapsLB->Clear();
+ m_pAbbrevLB->Clear();
String sTemp;
- aAbbrevED.SetText(sTemp);
- aDoubleCapsED.SetText(sTemp);
+ m_pAbbrevED->SetText(sTemp);
+ m_pDoubleCapsED->SetText(sTemp);
if(aStringsTable.find(eLang) != aStringsTable.end())
{
StringsArrays& rArrays = aStringsTable[eLang];
for(std::vector<OUString>::iterator i =
rArrays.aAbbrevStrings.begin(); i != rArrays.aAbbrevStrings.end(); ++i)
- aAbbrevLB.InsertEntry(*i);
+ m_pAbbrevLB->InsertEntry(*i);
for(std::vector<OUString>::iterator i =
rArrays.aDoubleCapsStrings.begin(); i != rArrays.aDoubleCapsStrings.end(); ++i)
- aDoubleCapsLB.InsertEntry(*i);
+ m_pDoubleCapsLB->InsertEntry(*i);
}
else
{
@@ -1606,11 +1595,11 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(sal_Bool
bFromReset,
sal_uInt16 i;
for( i = 0; i < pCplList->size(); i++ )
{
- aAbbrevLB.InsertEntry(*(*pCplList)[i]);
+ m_pAbbrevLB->InsertEntry(*(*pCplList)[i]);
}
for( i = 0; i < pWrdList->size(); i++ )
{
- aDoubleCapsLB.InsertEntry(*(*pWrdList)[i]);
+ m_pDoubleCapsLB->InsertEntry(*(*pWrdList)[i]);
}
}
}
@@ -1619,52 +1608,52 @@ void OfaAutocorrExceptPage::Reset( const SfxItemSet& )
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
RefillReplaceBoxes(sal_True, eLang, eLang);
- aAutoAbbrevCB. Check( pAutoCorrect->IsAutoCorrFlag( SaveWordCplSttLst ));
- aAutoCapsCB. Check( pAutoCorrect->IsAutoCorrFlag( SaveWordWrdSttLst ));
- aAutoAbbrevCB.SaveValue();
- aAutoCapsCB.SaveValue();
+ m_pAutoAbbrevCB-> Check( pAutoCorrect->IsAutoCorrFlag( SaveWordCplSttLst
));
+ m_pAutoCapsCB-> Check( pAutoCorrect->IsAutoCorrFlag( SaveWordWrdSttLst
));
+ m_pAutoAbbrevCB->SaveValue();
+ m_pAutoCapsCB->SaveValue();
}
IMPL_LINK(OfaAutocorrExceptPage, NewDelHdl, PushButton*, pBtn)
{
- if((pBtn == &aNewAbbrevPB || pBtn == (PushButton*)&aAbbrevED )
- && !aAbbrevED.GetText().isEmpty())
+ if((pBtn == m_pNewAbbrevPB || pBtn == (PushButton*)m_pAbbrevED )
+ && !m_pAbbrevED->GetText().isEmpty())
{
- aAbbrevLB.InsertEntry(aAbbrevED.GetText());
- ModifyHdl(&aAbbrevED);
+ m_pAbbrevLB->InsertEntry(m_pAbbrevED->GetText());
+ ModifyHdl(m_pAbbrevED);
}
- else if(pBtn == &aDelAbbrevPB)
+ else if(pBtn == m_pDelAbbrevPB)
{
- aAbbrevLB.RemoveEntry(aAbbrevED.GetText());
- ModifyHdl(&aAbbrevED);
+ m_pAbbrevLB->RemoveEntry(m_pAbbrevED->GetText());
+ ModifyHdl(m_pAbbrevED);
}
- else if((pBtn == &aNewDoublePB || pBtn == (PushButton*)&aDoubleCapsED )
- && !aDoubleCapsED.GetText().isEmpty())
+ else if((pBtn == m_pNewDoublePB || pBtn == (PushButton*)m_pDoubleCapsED )
+ && !m_pDoubleCapsED->GetText().isEmpty())
{
- aDoubleCapsLB.InsertEntry(aDoubleCapsED.GetText());
- ModifyHdl(&aDoubleCapsED);
+ m_pDoubleCapsLB->InsertEntry(m_pDoubleCapsED->GetText());
+ ModifyHdl(m_pDoubleCapsED);
}
- else if(pBtn == &aDelDoublePB)
+ else if(pBtn == m_pDelDoublePB)
{
- aDoubleCapsLB.RemoveEntry(aDoubleCapsED.GetText());
- ModifyHdl(&aDoubleCapsED);
+ m_pDoubleCapsLB->RemoveEntry(m_pDoubleCapsED->GetText());
+ ModifyHdl(m_pDoubleCapsED);
}
return 0;
}
IMPL_LINK(OfaAutocorrExceptPage, SelectHdl, ListBox*, pBox)
{
- if(pBox == &aAbbrevLB)
+ if (pBox == m_pAbbrevLB)
{
- aAbbrevED.SetText(pBox->GetSelectEntry());
- aNewAbbrevPB.Enable(sal_False);
- aDelAbbrevPB.Enable();
+ m_pAbbrevED->SetText(pBox->GetSelectEntry());
+ m_pNewAbbrevPB->Enable(sal_False);
+ m_pDelAbbrevPB->Enable();
}
else
{
- aDoubleCapsED.SetText(pBox->GetSelectEntry());
- aNewDoublePB.Enable(sal_False);
- aDelDoublePB.Enable();
+ m_pDoubleCapsED->SetText(pBox->GetSelectEntry());
+ m_pNewDoublePB->Enable(sal_False);
+ m_pDelDoublePB->Enable();
}
return 0;
}
@@ -1674,21 +1663,21 @@ IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt)
// sal_Bool bSame = pEdt->GetText() == ->GetSelectEntry();
const String& sEntry = pEdt->GetText();
sal_Bool bEntryLen = 0!= sEntry.Len();
- if(pEdt == &aAbbrevED)
+ if(pEdt == m_pAbbrevED)
{
- sal_Bool bSame = lcl_FindEntry(aAbbrevLB, sEntry, *pCompareClass);
- if(bSame && sEntry != aAbbrevLB.GetSelectEntry())
- pEdt->SetText(aAbbrevLB.GetSelectEntry());
- aNewAbbrevPB.Enable(!bSame && bEntryLen);
- aDelAbbrevPB.Enable(bSame && bEntryLen);
+ sal_Bool bSame = lcl_FindEntry(*m_pAbbrevLB, sEntry, *pCompareClass);
+ if(bSame && sEntry != m_pAbbrevLB->GetSelectEntry())
+ pEdt->SetText(m_pAbbrevLB->GetSelectEntry());
+ m_pNewAbbrevPB->Enable(!bSame && bEntryLen);
+ m_pDelAbbrevPB->Enable(bSame && bEntryLen);
}
else
{
- sal_Bool bSame = lcl_FindEntry(aDoubleCapsLB, sEntry, *pCompareClass);
- if(bSame && sEntry != aDoubleCapsLB.GetSelectEntry())
- pEdt->SetText(aDoubleCapsLB.GetSelectEntry());
- aNewDoublePB.Enable(!bSame && bEntryLen);
- aDelDoublePB.Enable(bSame && bEntryLen);
+ sal_Bool bSame = lcl_FindEntry(*m_pDoubleCapsLB, sEntry,
*pCompareClass);
+ if(bSame && sEntry != m_pDoubleCapsLB->GetSelectEntry())
+ pEdt->SetText(m_pDoubleCapsLB->GetSelectEntry());
+ m_pNewDoublePB->Enable(!bSame && bEntryLen);
+ m_pDelDoublePB->Enable(bSame && bEntryLen);
}
return 0;
}
diff --git a/cui/source/tabpages/autocdlg.hrc b/cui/source/tabpages/autocdlg.hrc
index 80d5167..3af45f8 100644
--- a/cui/source/tabpages/autocdlg.hrc
+++ b/cui/source/tabpages/autocdlg.hrc
@@ -31,30 +31,8 @@
#define FT_ENDQUOTE 14
#define PB_ENDQUOTE 15
-#define FL_ABBREV 16
-#define ED_ABBREV 17
-#define LB_ABBREV 18
-#define PB_NEWABBREV 19
-#define PB_DELABBREV 20
-#define FL_DOUBLECAPS 21
-#define ED_DOUBLE_CAPS 22
-#define LB_DOUBLE_CAPS 23
-#define PB_NEWDOUBLECAPS 24
-#define PB_DELDOUBLECAPS 25
-
-#define ED_SHORT 31
-#define ED_REPLACE 32
-#define TLB_REPLACE 33
-#define CB_TEXT_ONLY 34
-#define PB_NEW_REPLACE 35
-#define PB_DELETE_REPLACE 36
-#define STR_MODIFY 37
-#define FT_SHORT 39
-#define FT_REPLACE 40
#define STR_CHANGE_START 41
#define STR_CHANGE_END 42
-#define CB_AUTOABBREV 43
-#define CB_AUTOCAPS 44
#define FT_SGL_STARTQUOTE 45
#define PB_SGL_STARTQUOTE 46
diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index ffb3890..e7bfebd 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -212,132 +212,6 @@ ModalDialog RID_OFADLG_PRCNT_SET
/**************************************************************************/
/* */
-/* Beschreibung: Ausnahmelisten */
-/* */
-/**************************************************************************/
-TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
-{
- HelpId = HID_OFAPAGE_AUTOCORR_EXCEPT ;
- OutputSize = TRUE ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- SVLook = TRUE ;
- Hide = TRUE ;
- FixedLine FL_ABBREV
- {
- Pos = MAP_APPFONT ( 4 , 3 ) ;
- Size = MAP_APPFONT ( 252 , 8 ) ;
- Text [ en-US ] = "Abbreviations (no subsequent capital)" ;
- };
- Edit ED_ABBREV
- {
- HelpID = "cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV";
- Pos = MAP_APPFONT ( 7 , 14 ) ;
- Size = MAP_APPFONT ( 123 , 12 ) ;
- TabStop = TRUE ;
- Border = TRUE ;
- };
- ListBox LB_ABBREV
- {
- HelpID = "cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV";
- Pos = MAP_APPFONT ( 7 , 30 ) ;
- Size = MAP_APPFONT ( 123 , 58 ) ;
- TabStop = TRUE ;
- AutoHScroll = TRUE ;
- SORT = TRUE ;
- Border = TRUE ;
- };
- PushButton PB_NEWABBREV
- {
- HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWABBREV";
- Pos = MAP_APPFONT ( 198 , 14 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- Disable = TRUE ;
- Text [ en-US ] = "~New" ;
- };
- PushButton PB_DELABBREV
- {
- HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV";
- Pos = MAP_APPFONT ( 198 , 31 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- Disable = TRUE ;
- Text [ en-US ] = "~Delete" ;
- };
- CheckBox CB_AUTOABBREV
- {
- HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV";
- Pos = MAP_APPFONT ( 137 , 78 ) ;
- Size = MAP_APPFONT ( 111 , 10 ) ;
- Text [ en-US ] = "~AutoInclude";
- TabStop = TRUE ;
- };
- FixedLine FL_DOUBLECAPS
- {
- Pos = MAP_APPFONT ( 4 , 94 ) ;
- Size = MAP_APPFONT ( 252 , 8 ) ;
- Text [ en-US ] = "Words with TWo INitial CApitals" ;
- };
- Edit ED_DOUBLE_CAPS
- {
- HelpID = "cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS";
- Pos = MAP_APPFONT ( 7 , 105 ) ;
- Size = MAP_APPFONT ( 123 , 12 ) ;
- TabStop = TRUE ;
- Border = TRUE ;
- };
- ListBox LB_DOUBLE_CAPS
- {
- HelpID = "cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS";
- Pos = MAP_APPFONT ( 7 , 120 ) ;
- Size = MAP_APPFONT ( 123 , 59 ) ;
- TabStop = TRUE ;
- AutoHScroll = TRUE ;
- SORT = TRUE ;
- Border = TRUE ;
- };
- PushButton PB_NEWDOUBLECAPS
- {
- HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS";
- Pos = MAP_APPFONT ( 198 , 105 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Disable = TRUE ;
- Text [ en-US ] = "Ne~w" ;
- };
- PushButton PB_DELDOUBLECAPS
- {
- HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS";
- Pos = MAP_APPFONT ( 198 , 122 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Disable = TRUE ;
- Text [ en-US ] = "Dele~te" ;
- };
- CheckBox CB_AUTOCAPS
- {
- HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS";
- Pos = MAP_APPFONT ( 137 , 169 ) ;
- Size = MAP_APPFONT ( 111 , 10 ) ;
- Text [ en-US ] = "A~utoInclude";
- };
- String STR_PB_NEWABBREV
- {
- Text [ en-US ] = "New abbreviations" ;
- };
- String STR_PB_DELABBREV
- {
- Text [ en-US ] = "Delete abbreviations" ;
- };
- String STR_PB_NEWDOUBLECAPS
- {
- Text [ en-US ] = "New words with two initial capitals" ;
- };
- String STR_PB_DELDOUBLECAPS
- {
- Text [ en-US ] = "Delete words with two initial capitals" ;
- };
-};
-/**************************************************************************/
-/* */
/* Beschreibung: Typografische Anfuehrungszeichen */
/* */
/**************************************************************************/
diff --git a/cui/uiconfig/ui/acorexceptpage.ui
b/cui/uiconfig/ui/acorexceptpage.ui
new file mode 100644
index 0000000..6f36c0e
--- /dev/null
+++ b/cui/uiconfig/ui/acorexceptpage.ui
@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
+ <object class="GtkBox" id="AcorExceptPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="cuilo-AutoCorrEdit" id="abbrev">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</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>
+ <object class="GtkCheckButton" id="autoabbrev">
+ <property name="label"
translatable="yes">_AutoInclude</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="valign">end</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox" id="buttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="newabbrev">
+ <property name="label">gtk-new</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="newabbrev-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes">New abbreviations</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="replace">
+ <property name="label"
translatable="yes">_Replace</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="no_show_all">True</property>
+ <property name="use_underline">True</property>
+ <property name="image_position">right</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="delabbrev">
+ <property name="label">gtk-delete</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="valign">start</property>
+ <property name="use_stock">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="delabbrev-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes">Delete abbreviations</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTreeView" id="abbrevlist:border">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</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>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Abbreviations (no
subsequent capital)</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="cuilo-AutoCorrEdit" id="double">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</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>
+ <object class="GtkTreeView" id="doublelist:border">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection3"/>
+ </child>
+ </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>
+ <object class="GtkCheckButton" id="autodouble">
+ <property name="label"
translatable="yes">A_utoInclude</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="valign">end</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox" id="buttonbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="newdouble">
+ <property name="label">gtk-new</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="newdouble-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes">New words with two initial capitals</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="replace1">
+ <property name="label"
translatable="yes">_Replace</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="no_show_all">True</property>
+ <property name="use_underline">True</property>
+ <property name="image_position">right</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="deldouble">
+ <property name="label">gtk-delete</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="valign">start</property>
+ <property name="use_stock">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="deldouble-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes">Delete words with two initial capitals</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Words with TWo INitial
CApitals</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="newabbrev"/>
+ <widget name="replace"/>
+ <widget name="delabbrev"/>
+ <widget name="newdouble"/>
+ <widget name="replace1"/>
+ <widget name="deldouble"/>
+ </widgets>
+ </object>
+</interface>
diff --git a/cui/uiconfig/ui/acorreplacepage.ui
b/cui/uiconfig/ui/acorreplacepage.ui
index 1e81cc9..aa04bcb 100644
--- a/cui/uiconfig/ui/acorreplacepage.ui
+++ b/cui/uiconfig/ui/acorreplacepage.ui
@@ -2,120 +2,105 @@
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
- <object class="GtkBox" id="AcorReplacePage">
+ <object class="GtkGrid" id="AcorReplacePage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property>
- <property name="spacing">12</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Repla_ce</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">origtext</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>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_With:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">newtext</property>
+ </object>
+ <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>
+ <child>
+ <object class="GtkCheckButton" id="textonly">
+ <property name="label" translatable="yes">_Text only</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">end</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="cuilo-AutoCorrEdit" id="origtext">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="max_length">30</property>
+ <property name="invisible_char">â</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>
+ <object class="cuilo-AutoCorrEdit" id="newtext">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">â</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svtlo-SvTabListBox" id="tabview:border">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Repla_ce</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">origtext</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>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_With:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">newtext</property>
- </object>
- <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>
- <child>
- <object class="GtkCheckButton" id="textonly">
- <property name="label" translatable="yes">_Text only</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="halign">end</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="cuilo-AutoCorrEdit" id="origtext">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="max_length">30</property>
- <property name="invisible_char">â</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>
- <object class="cuilo-AutoCorrEdit" id="newtext">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">2</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="svtlo-SvTabListBox" id="tabview:border">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="Tab List-selection1"/>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">3</property>
- <property name="height">1</property>
- </packing>
- </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -132,6 +117,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
+ <property name="image_position">right</property>
</object>
<packing>
<property name="expand">False</property>
@@ -170,11 +156,15 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">2</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<object class="GtkSizeGroup" id="sizegroup1">
<widgets>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
