[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
Caolán McNamara
caolanm at redhat.com
Tue Aug 13 02:53:02 PDT 2013
helpcontent2 | 2
sw/UIConfig_swriter.mk | 1
sw/inc/helpid.h | 2
sw/source/ui/envelp/label.hrc | 41 -
sw/source/ui/envelp/label.src | 170 --------
sw/source/ui/envelp/label1.cxx | 106 ++---
sw/source/ui/envelp/swuilabimp.hxx | 48 --
sw/uiconfig/swriter/ui/businessdatapage.ui | 605 +++++++++++++++++++++++++++++
sw/uiconfig/swriter/ui/privateuserpage.ui | 72 +--
9 files changed, 706 insertions(+), 341 deletions(-)
New commits:
commit 42133692c1ab342b327a810235c7ede7fc3a256d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 13 09:23:49 2013 +0100
convert business data page to .ui
Change-Id: If6706e0f40ff4559fd0bf5745845680ce610d706
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 22c5b20..05f118a 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -66,6 +66,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/autotext \
sw/uiconfig/swriter/ui/bibliographyentry \
sw/uiconfig/swriter/ui/bulletsandnumbering \
+ sw/uiconfig/swriter/ui/businessdatapage \
sw/uiconfig/swriter/ui/cannotsavelabeldialog \
sw/uiconfig/swriter/ui/captionoptions \
sw/uiconfig/swriter/ui/cardformatpage \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 2a4760e..751430f 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -170,8 +170,6 @@
#define HID_ADD_STYLES_TLB "SW_HID_ADD_STYLES_TLB"
#define HID_OLE_CHECKLB "SW_HID_OLE_CHECKLB"
-#define HID_TP_BUSINESS_DATA "SW_HID_TP_BUSINESS_DATA"
-
#define HID_OPTCOMPATIBILITY_PAGE "SW_HID_OPTCOMPATIBILITY_PAGE"
#define HID_COMPATIBILITY_OPTIONS_BOX "SW_HID_COMPATIBILITY_OPTIONS_BOX"
diff --git a/sw/source/ui/envelp/label.hrc b/sw/source/ui/envelp/label.hrc
index 4130fac..dee382d 100644
--- a/sw/source/ui/envelp/label.hrc
+++ b/sw/source/ui/envelp/label.hrc
@@ -26,51 +26,10 @@
#define BTN_SYNC 20
-#define FL_DATA 30
-#define FT_NAME 31
-#define ED_FIRSTNAME 32
-#define ED_NAME 33
-#define ED_SHORTCUT 34
-#define FT_STREET 35
-#define ED_STREET 36
-#define FT_ZIPCITY 37
-#define ED_ZIP 38
-#define ED_CITY 39
-#define FT_COUNTRYSTATE 40
-#define ED_COUNTRY 41
-#define FT_TITLEPROF 42
-#define ED_PROFESSION 43
-#define ED_TITLE 44
-
-#define ED_PHONE 46
-#define ED_MOBILE 47
-
-#define ED_FAX 49
-#define FT_WWWMAIL 50
-#define ED_WWW 51
-#define ED_MAIL 52
-#define ED_STATE 53
-#define FT_COMP 54
-#define ED_COMP 55
-#define FT_COMP_EXT 56
-#define ED_COMP_EXT 57
-#define FT_SLOGAN 58
-#define ED_SLOGAN 59
-#define FT_POSITION 60
-#define ED_POSITION 61
-
#define ST_BUSINESSCARDDLG 62
#define ST_FIRSTPAGE_LAB 63
#define ST_FIRSTPAGE_BC 64
-#define FT_NAME_2 65
-#define ED_FIRSTNAME_2 66
-#define ED_NAME_2 67
-#define ED_SHORTCUT_2 68
-
-#define FT_PHONE_MOBILE 70
-#define FT_FAX 73
-
// global resources ********************************************************
#define STR_DOC_TITLE (RC_LABEL_BEGIN)
#define STR_CUSTOM (RC_LABEL_BEGIN + 1)
diff --git a/sw/source/ui/envelp/label.src b/sw/source/ui/envelp/label.src
index 48dee94..debe3e1 100644
--- a/sw/source/ui/envelp/label.src
+++ b/sw/source/ui/envelp/label.src
@@ -115,175 +115,5 @@ String STR_CUSTOM
{
Text [ en-US ] = "[User]";
};
-TabPage TP_BUSINESS_DATA
-{
- HelpID = HID_TP_BUSINESS_DATA;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- Hide = TRUE ;
- FixedLine FL_DATA
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Business data";
- };
- FixedText FT_COMP
- {
- Pos = MAP_APPFONT ( 12 , 16) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Company";
- };
- Edit ED_COMP
- {
- HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_COMP";
- Pos = MAP_APPFONT ( 105 , 14) ;
- Size = MAP_APPFONT ( 143 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_COMP_EXT
- {
- Pos = MAP_APPFONT ( 12 , 32) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Company 2nd line";
- };
- Edit ED_COMP_EXT
- {
- HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_COMP_EXT";
- Pos = MAP_APPFONT ( 105 , 30) ;
- Size = MAP_APPFONT ( 143 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_SLOGAN
- {
- Pos = MAP_APPFONT ( 12 , 48) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Slogan";
- };
- Edit ED_SLOGAN
- {
- HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_SLOGAN";
- Pos = MAP_APPFONT ( 105 , 46) ;
- Size = MAP_APPFONT ( 143 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_STREET
- {
- Pos = MAP_APPFONT ( 12 , 64) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Street";
- };
- Edit ED_STREET
- {
- HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_STREET";
- Pos = MAP_APPFONT ( 105 , 62) ;
- Size = MAP_APPFONT ( 143 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_ZIPCITY
- {
- Pos = MAP_APPFONT ( 12 , 80) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "ZIP/City";
- };
- Edit ED_ZIP
- {
- HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_ZIP";
- Pos = MAP_APPFONT ( 105 , 78) ;
- Size = MAP_APPFONT ( 50 , 12 ) ;
- Border = TRUE ;
- };
- Edit ED_CITY
- {
- HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_CITY";
- Pos = MAP_APPFONT ( 158 , 78) ;
- Size = MAP_APPFONT ( 90 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_COUNTRYSTATE
- {
- Pos = MAP_APPFONT ( 12 , 96) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Country/State";
- };
- Edit ED_COUNTRY
- {
- HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_COUNTRY";
- Pos = MAP_APPFONT ( 105 , 94) ;
- Size = MAP_APPFONT ( 71 , 12 ) ;
- Border = TRUE ;
- };
- Edit ED_STATE
- {
- HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_STATE";
- Pos = MAP_APPFONT ( 179 , 94) ;
- Size = MAP_APPFONT ( 69 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_POSITION
- {
- Pos = MAP_APPFONT ( 12 , 112) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Position";
- };
- Edit ED_POSITION
- {
- HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_POSITION";
- Pos = MAP_APPFONT ( 105 , 110) ;
- Size = MAP_APPFONT ( 143 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_PHONE_MOBILE
- {
- Pos = MAP_APPFONT ( 12 , 128) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Phone/Mobile";
- };
- Edit ED_PHONE
- {
- HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_PHONE";
- Pos = MAP_APPFONT ( 105 , 126) ;
- Size = MAP_APPFONT ( 71 , 12 ) ;
- Border = TRUE ;
- };
- Edit ED_MOBILE
- {
- HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_MOBILE";
- Pos = MAP_APPFONT ( 179 , 126) ;
- Size = MAP_APPFONT ( 69 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_FAX
- {
- Pos = MAP_APPFONT ( 12 , 144) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Fax";
- };
- Edit ED_FAX
- {
- HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_FAX";
- Pos = MAP_APPFONT ( 105 , 142) ;
- Size = MAP_APPFONT ( 143 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_WWWMAIL
- {
- Pos = MAP_APPFONT ( 12 , 160) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Ho~mepage / e-mail";
- };
- Edit ED_WWW
- {
- HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_WWW";
- Pos = MAP_APPFONT ( 105 , 158) ;
- Size = MAP_APPFONT ( 71 , 12 ) ;
- Border = TRUE ;
- };
- Edit ED_MAIL
- {
- HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_MAIL";
- Pos = MAP_APPFONT ( 179 , 158) ;
- Size = MAP_APPFONT ( 69 , 12 ) ;
- Border = TRUE ;
- };
-};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index b4975ef..0d0c030 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -801,43 +801,27 @@ void SwPrivateDataPage::Reset(const SfxItemSet& rSet)
m_pMailED->SetText(aItem.aPrivMail);
}
-SwBusinessDataPage::SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet) :
- SfxTabPage(pParent, SW_RES(TP_BUSINESS_DATA), rSet),
- aDataFL (this, SW_RES( FL_DATA )),
- aCompanyFT (this, SW_RES( FT_COMP )),
- aCompanyED (this, SW_RES( ED_COMP )),
- aCompanyExtFT (this, SW_RES( FT_COMP_EXT )),
- aCompanyExtED (this, SW_RES( ED_COMP_EXT )),
- aSloganFT (this, SW_RES( FT_SLOGAN )),
- aSloganED (this, SW_RES( ED_SLOGAN )),
- aStreetFT (this, SW_RES( FT_STREET )),
- aStreetED (this, SW_RES( ED_STREET )),
- aZipCityFT (this, SW_RES( FT_ZIPCITY )),
- aZipED (this, SW_RES( ED_ZIP )),
- aCityED (this, SW_RES( ED_CITY )),
- aCountryStateFT (this, SW_RES( FT_COUNTRYSTATE )),
- aCountryED (this, SW_RES( ED_COUNTRY )),
- aStateED (this, SW_RES( ED_STATE )),
- aPositionFT (this, SW_RES( FT_POSITION )),
- aPositionED (this, SW_RES( ED_POSITION )),
- aPhoneFT (this, SW_RES( FT_PHONE_MOBILE )),
- aPhoneED (this, SW_RES( ED_PHONE )),
- aMobilePhoneED (this, SW_RES( ED_MOBILE )),
- aFaxFT (this, SW_RES( FT_FAX )),
- aFaxED (this, SW_RES( ED_FAX )),
- aWWWMailFT (this, SW_RES( FT_WWWMAIL )),
- aHomePageED (this, SW_RES( ED_WWW )),
- aMailED (this, SW_RES( ED_MAIL ))
+SwBusinessDataPage::SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet)
+ : SfxTabPage(pParent, "BusinessDataPage",
+ "modules/swriter/ui/businessdatapage.ui", rSet)
{
- FreeResource();
+ get(m_pCompanyED, "company");
+ get(m_pCompanyExtED, "company2");
+ get(m_pSloganED, "slogan");
+ get(m_pStreetED, "street");
+ get(m_pZipED, "izip");
+ get(m_pCityED, "icity");
+ get(m_pCountryED, "country");
+ get(m_pStateED, "state");
+ get(m_pPositionED, "position");
+ get(m_pPhoneED, "phone");
+ get(m_pMobilePhoneED, "mobile");
+ get(m_pFaxED, "fax");
+ get(m_pHomePageED, "url");
+ get(m_pMailED, "email");
SetExchangeSupport();
}
-
-SwBusinessDataPage::~SwBusinessDataPage()
-{
-}
-
SfxTabPage* SwBusinessDataPage::Create(Window* pParent, const SfxItemSet& rSet)
{
return new SwBusinessDataPage(pParent, rSet);
@@ -859,20 +843,20 @@ sal_Bool SwBusinessDataPage::FillItemSet(SfxItemSet& rSet)
{
SwLabItem aItem = (const SwLabItem&) GetTabDialog()->GetExampleSet()->Get(FN_LABEL);
- aItem.aCompCompany = aCompanyED .GetText();
- aItem.aCompCompanyExt= aCompanyExtED .GetText();
- aItem.aCompSlogan = aSloganED .GetText();
- aItem.aCompStreet = aStreetED .GetText();
- aItem.aCompZip = aZipED .GetText();
- aItem.aCompCity = aCityED .GetText();
- aItem.aCompCountry = aCountryED .GetText();
- aItem.aCompState = aStateED .GetText();
- aItem.aCompPosition = aPositionED .GetText();
- aItem.aCompPhone = aPhoneED .GetText();
- aItem.aCompMobile = aMobilePhoneED .GetText();
- aItem.aCompFax = aFaxED .GetText();
- aItem.aCompWWW = aHomePageED .GetText();
- aItem.aCompMail = aMailED .GetText();
+ aItem.aCompCompany = m_pCompanyED->GetText();
+ aItem.aCompCompanyExt= m_pCompanyExtED->GetText();
+ aItem.aCompSlogan = m_pSloganED->GetText();
+ aItem.aCompStreet = m_pStreetED->GetText();
+ aItem.aCompZip = m_pZipED->GetText();
+ aItem.aCompCity = m_pCityED->GetText();
+ aItem.aCompCountry = m_pCountryED->GetText();
+ aItem.aCompState = m_pStateED->GetText();
+ aItem.aCompPosition = m_pPositionED->GetText();
+ aItem.aCompPhone = m_pPhoneED->GetText();
+ aItem.aCompMobile = m_pMobilePhoneED->GetText();
+ aItem.aCompFax = m_pFaxED->GetText();
+ aItem.aCompWWW = m_pHomePageED->GetText();
+ aItem.aCompMail = m_pMailED->GetText();
rSet.Put(aItem);
return sal_True;
@@ -881,20 +865,20 @@ sal_Bool SwBusinessDataPage::FillItemSet(SfxItemSet& rSet)
void SwBusinessDataPage::Reset(const SfxItemSet& rSet)
{
const SwLabItem& aItem = (const SwLabItem&) rSet.Get(FN_LABEL);
- aCompanyED .SetText(aItem.aCompCompany);
- aCompanyExtED .SetText(aItem.aCompCompanyExt);
- aSloganED .SetText(aItem.aCompSlogan);
- aStreetED .SetText(aItem.aCompStreet);
- aZipED .SetText(aItem.aCompZip);
- aCityED .SetText(aItem.aCompCity);
- aCountryED .SetText(aItem.aCompCountry);
- aStateED .SetText(aItem.aCompState);
- aPositionED .SetText(aItem.aCompPosition);
- aPhoneED .SetText(aItem.aCompPhone);
- aMobilePhoneED .SetText(aItem.aCompMobile);
- aFaxED .SetText(aItem.aCompFax);
- aHomePageED .SetText(aItem.aCompWWW);
- aMailED .SetText(aItem.aCompMail);
+ m_pCompanyED->SetText(aItem.aCompCompany);
+ m_pCompanyExtED->SetText(aItem.aCompCompanyExt);
+ m_pSloganED->SetText(aItem.aCompSlogan);
+ m_pStreetED->SetText(aItem.aCompStreet);
+ m_pZipED->SetText(aItem.aCompZip);
+ m_pCityED->SetText(aItem.aCompCity);
+ m_pCountryED->SetText(aItem.aCompCountry);
+ m_pStateED->SetText(aItem.aCompState);
+ m_pPositionED->SetText(aItem.aCompPosition);
+ m_pPhoneED->SetText(aItem.aCompPhone);
+ m_pMobilePhoneED->SetText(aItem.aCompMobile);
+ m_pFaxED->SetText(aItem.aCompFax);
+ m_pHomePageED->SetText(aItem.aCompWWW);
+ m_pMailED->SetText(aItem.aCompMail);
}
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index b4b4596..574a3a3 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -164,38 +164,26 @@ public:
class SwBusinessDataPage : public SfxTabPage
{
- FixedLine aDataFL;
- FixedText aCompanyFT;
- Edit aCompanyED;
- FixedText aCompanyExtFT;
- Edit aCompanyExtED;
- FixedText aSloganFT;
- Edit aSloganED;
-
- FixedText aStreetFT;
- Edit aStreetED;
- FixedText aZipCityFT;
- Edit aZipED;
- Edit aCityED;
- FixedText aCountryStateFT;
- Edit aCountryED;
- Edit aStateED;
-
- FixedText aPositionFT;
- Edit aPositionED;
-
- FixedText aPhoneFT;
- Edit aPhoneED;
- Edit aMobilePhoneED;
- FixedText aFaxFT;
- Edit aFaxED;
-
- FixedText aWWWMailFT;
- Edit aHomePageED;
- Edit aMailED;
+ Edit* m_pCompanyED;
+ Edit* m_pCompanyExtED;
+ Edit* m_pSloganED;
+
+ Edit* m_pStreetED;
+ Edit* m_pZipED;
+ Edit* m_pCityED;
+ Edit* m_pCountryED;
+ Edit* m_pStateED;
+
+ Edit* m_pPositionED;
+
+ Edit* m_pPhoneED;
+ Edit* m_pMobilePhoneED;
+ Edit* m_pFaxED;
+
+ Edit* m_pHomePageED;
+ Edit* m_pMailED;
SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet);
- ~SwBusinessDataPage();
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
diff --git a/sw/uiconfig/swriter/ui/businessdatapage.ui b/sw/uiconfig/swriter/ui/businessdatapage.ui
new file mode 100644
index 0000000..4d9f7d4
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/businessdatapage.ui
@@ -0,0 +1,605 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkFrame" id="BusinessDataPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</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="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="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Company</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">company</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="streetft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Slogan</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">slogan</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>
+ <object class="GtkLabel" id="countryft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Co_untry/State</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">country</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Position</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">position</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="phoneft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Fa_x</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">fax</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="phoneft-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes">Home telephone number</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="faxft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Homepage / E-mail</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">url</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">9</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkEntry" id="company">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="company-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">First name</property>
+ </object>
+ </child>
+ </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>
+ </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="GtkGrid" id="grid5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkEntry" id="position">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="position-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Title</property>
+ </object>
+ </child>
+ </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>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkEntry" id="fax">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="fax-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Home telephone number</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkEntry" id="url">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="url-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">FAX number</property>
+ </object>
+ </child>
+ </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="GtkEntry" id="email">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="email-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">email address</property>
+ </object>
+ </child>
+ </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>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">9</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="eastnameft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Company 2nd line</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">company2</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="GtkGrid" id="grid9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkEntry" id="company2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="company2-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Last name</property>
+ </object>
+ </child>
+ </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>
+ </object>
+ <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="GtkLabel" id="icityft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Zip/City</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">izip</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>
+ <object class="GtkGrid" id="grid11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkEntry" id="icity">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="icity-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">City</property>
+ </object>
+ </child>
+ </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="GtkEntry" id="izip">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="invisible_char">•</property>
+ <property name="width_chars">15</property>
+ <property name="invisible_char_set">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="izip-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Zip code</property>
+ </object>
+ </child>
+ </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>
+ </object>
+ <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>
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="GtkEntry" id="slogan">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">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>
+ </object>
+ <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>
+ <object class="GtkGrid" id="grid12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkEntry" id="country">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">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="GtkEntry" id="state">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</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>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="titleft1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Phone/Mobile</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">position</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkEntry" id="phone">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="phone-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Title</property>
+ </object>
+ </child>
+ </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="GtkEntry" id="mobile">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="mobile-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Position</property>
+ </object>
+ </child>
+ </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>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="streetft1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Street</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">street</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>
+ <object class="GtkGrid" id="grid8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="GtkEntry" id="street">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">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>
+ </object>
+ <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>
+ </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">Business data</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+</interface>
diff --git a/sw/uiconfig/swriter/ui/privateuserpage.ui b/sw/uiconfig/swriter/ui/privateuserpage.ui
index 5d325ce..4996847 100644
--- a/sw/uiconfig/swriter/ui/privateuserpage.ui
+++ b/sw/uiconfig/swriter/ui/privateuserpage.ui
@@ -21,8 +21,8 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="nameft">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="no_show_all">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">First/Last _name/Initials</property>
<property name="use_underline">True</property>
@@ -37,8 +37,8 @@
</child>
<child>
<object class="GtkLabel" id="streetft">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="no_show_all">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Street</property>
<property name="use_underline">True</property>
@@ -53,8 +53,8 @@
</child>
<child>
<object class="GtkLabel" id="countryft">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="no_show_all">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Co_untry/State</property>
<property name="use_underline">True</property>
@@ -69,8 +69,8 @@
</child>
<child>
<object class="GtkLabel" id="titleft">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="no_show_all">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Title/Profession</property>
<property name="use_underline">True</property>
@@ -85,8 +85,8 @@
</child>
<child>
<object class="GtkLabel" id="phoneft">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="no_show_all">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Fa_x</property>
<property name="use_underline">True</property>
@@ -106,8 +106,8 @@
</child>
<child>
<object class="GtkLabel" id="faxft">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="no_show_all">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Homepage / E-mail</property>
<property name="use_underline">True</property>
@@ -122,13 +122,13 @@
</child>
<child>
<object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="no_show_all">True</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkEntry" id="firstname">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
@@ -147,8 +147,8 @@
</child>
<child>
<object class="GtkEntry" id="lastname">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
@@ -167,8 +167,8 @@
</child>
<child>
<object class="GtkEntry" id="shortname">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="invisible_char">•</property>
<property name="width_chars">7</property>
@@ -195,14 +195,14 @@
</child>
<child>
<object class="GtkGrid" id="grid5">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="no_show_all">True</property>
<property name="hexpand">True</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkEntry" id="title">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
@@ -221,8 +221,8 @@
</child>
<child>
<object class="GtkEntry" id="job">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
@@ -249,13 +249,13 @@
</child>
<child>
<object class="GtkGrid" id="grid6">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="no_show_all">True</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkEntry" id="fax">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
@@ -282,14 +282,14 @@
</child>
<child>
<object class="GtkGrid" id="grid7">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="no_show_all">True</property>
<property name="hexpand">True</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkEntry" id="url">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
@@ -308,8 +308,8 @@
</child>
<child>
<object class="GtkEntry" id="email">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
@@ -336,8 +336,8 @@
</child>
<child>
<object class="GtkLabel" id="eastnameft">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="no_show_all">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">First/Last _name/Initials 2</property>
<property name="use_underline">True</property>
@@ -352,13 +352,13 @@
</child>
<child>
<object class="GtkGrid" id="grid9">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="no_show_all">True</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkEntry" id="firstname2">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
@@ -378,8 +378,8 @@
</child>
<child>
<object class="GtkEntry" id="lastname2">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
@@ -399,8 +399,8 @@
</child>
<child>
<object class="GtkEntry" id="shortname2">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="invisible_char">•</property>
<property name="width_chars">7</property>
@@ -428,8 +428,8 @@
</child>
<child>
<object class="GtkLabel" id="icityft">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="no_show_all">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Zip/City</property>
<property name="use_underline">True</property>
@@ -444,13 +444,13 @@
</child>
<child>
<object class="GtkGrid" id="grid11">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="no_show_all">True</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkEntry" id="icity">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
@@ -470,8 +470,8 @@
</child>
<child>
<object class="GtkEntry" id="izip">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="invisible_char">•</property>
<property name="width_chars">15</property>
@@ -499,13 +499,13 @@
</child>
<child>
<object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="no_show_all">True</property>
<property name="hexpand">True</property>
<child>
<object class="GtkEntry" id="street">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
@@ -528,14 +528,14 @@
</child>
<child>
<object class="GtkGrid" id="grid12">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="no_show_all">True</property>
<property name="hexpand">True</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkEntry" id="country">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
@@ -550,8 +550,8 @@
</child>
<child>
<object class="GtkEntry" id="state">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
@@ -574,8 +574,8 @@
</child>
<child>
<object class="GtkLabel" id="titleft1">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="no_show_all">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Phone/Mobile</property>
<property name="use_underline">True</property>
@@ -590,14 +590,14 @@
</child>
<child>
<object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="no_show_all">True</property>
<property name="hexpand">True</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkEntry" id="phone">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
@@ -617,8 +617,8 @@
</child>
<child>
<object class="GtkEntry" id="mobile">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
commit 88816fcb49db1432cbb7bbf637b55f3fa19c3145
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 13 10:50:24 2013 +0100
Updated core
Project: help b75df5eeb8b4275609246c4623ae437fd580a3e4
diff --git a/helpcontent2 b/helpcontent2
index 9104e06..b75df5e 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9104e0686170abf9db588748dada24a395dc145f
+Subproject commit b75df5eeb8b4275609246c4623ae437fd580a3e4
More information about the Libreoffice-commits
mailing list