|
 |
e8a9a9b |
--- kdelibs-3.5.10/kabc/scripts/field.src.cpp.orig 2009-12-09 18:51:15.000000000 +0100
|
|
|
e8a9a9b |
+++ kdelibs-3.5.10/kabc/scripts/field.src.cpp 2009-12-09 18:51:54.000000000 +0100
|
|
|
e8a9a9b |
@@ -36,7 +36,7 @@
|
|
|
e8a9a9b |
const QString &app = QString::null )
|
|
|
e8a9a9b |
: mFieldId( fieldId ), mCategory( category ), mLabel( label ),
|
|
|
e8a9a9b |
mKey( key ), mApp( app ) {}
|
|
|
e8a9a9b |
-
|
|
|
e8a9a9b |
+
|
|
|
e8a9a9b |
enum FieldId
|
|
|
e8a9a9b |
{
|
|
|
e8a9a9b |
CustomField,
|
|
|
e8a9a9b |
@@ -45,11 +45,11 @@
|
|
|
e8a9a9b |
|
|
|
e8a9a9b |
int fieldId() { return mFieldId; }
|
|
|
e8a9a9b |
int category() { return mCategory; }
|
|
|
e8a9a9b |
-
|
|
|
e8a9a9b |
+
|
|
|
e8a9a9b |
QString label() { return mLabel; }
|
|
|
e8a9a9b |
QString key() { return mKey; }
|
|
|
e8a9a9b |
QString app() { return mApp; }
|
|
|
e8a9a9b |
-
|
|
|
e8a9a9b |
+
|
|
|
e8a9a9b |
private:
|
|
|
e8a9a9b |
int mFieldId;
|
|
|
e8a9a9b |
int mCategory;
|
|
|
e8a9a9b |
@@ -184,6 +184,8 @@
|
|
|
e8a9a9b |
return a.phoneNumber( PhoneNumber::Pager ).number();
|
|
|
e8a9a9b |
case FieldImpl::HomeAddressStreet:
|
|
|
e8a9a9b |
return a.address( Address::Home ).street();
|
|
|
e8a9a9b |
+ case FieldImpl::HomeAddressPostOfficeBox:
|
|
|
e8a9a9b |
+ return a.address( Address::Home ).postOfficeBox();
|
|
|
e8a9a9b |
case FieldImpl::HomeAddressLocality:
|
|
|
e8a9a9b |
return a.address( Address::Home ).locality();
|
|
|
e8a9a9b |
case FieldImpl::HomeAddressRegion:
|
|
|
e8a9a9b |
@@ -196,6 +198,8 @@
|
|
|
e8a9a9b |
return a.address( Address::Home ).label();
|
|
|
e8a9a9b |
case FieldImpl::BusinessAddressStreet:
|
|
|
e8a9a9b |
return a.address( Address::Work ).street();
|
|
|
e8a9a9b |
+ case FieldImpl::BusinessAddressPostOfficeBox:
|
|
|
e8a9a9b |
+ return a.address( Address::Work ).postOfficeBox();
|
|
|
e8a9a9b |
case FieldImpl::BusinessAddressLocality:
|
|
|
e8a9a9b |
return a.address( Address::Work ).locality();
|
|
|
e8a9a9b |
case FieldImpl::BusinessAddressRegion:
|
|
|
e8a9a9b |
@@ -266,6 +270,13 @@
|
|
|
e8a9a9b |
a.insertAddress( address );
|
|
|
e8a9a9b |
return true;
|
|
|
e8a9a9b |
}
|
|
|
e8a9a9b |
+ case FieldImpl::HomeAddressPostOfficeBox:
|
|
|
e8a9a9b |
+ {
|
|
|
e8a9a9b |
+ KABC::Address address = a.address( Address::Home );
|
|
|
e8a9a9b |
+ address.setPostOfficeBox( value );
|
|
|
e8a9a9b |
+ a.insertAddress( address );
|
|
|
e8a9a9b |
+ return true;
|
|
|
e8a9a9b |
+ }
|
|
|
e8a9a9b |
case FieldImpl::HomeAddressLocality:
|
|
|
e8a9a9b |
{
|
|
|
e8a9a9b |
KABC::Address address = a.address( Address::Home );
|
|
|
e8a9a9b |
@@ -308,6 +319,13 @@
|
|
|
e8a9a9b |
a.insertAddress( address );
|
|
|
e8a9a9b |
return true;
|
|
|
e8a9a9b |
}
|
|
|
e8a9a9b |
+ case FieldImpl::BusinessAddressPostOfficeBox:
|
|
|
e8a9a9b |
+ {
|
|
|
e8a9a9b |
+ KABC::Address address = a.address( Address::Work );
|
|
|
e8a9a9b |
+ address.setPostOfficeBox( value );
|
|
|
e8a9a9b |
+ a.insertAddress( address );
|
|
|
e8a9a9b |
+ return true;
|
|
|
e8a9a9b |
+ }
|
|
|
e8a9a9b |
case FieldImpl::BusinessAddressLocality:
|
|
|
e8a9a9b |
{
|
|
|
e8a9a9b |
KABC::Address address = a.address( Address::Work );
|
|
|
e8a9a9b |
@@ -438,7 +456,7 @@
|
|
|
e8a9a9b |
const Field::List &fields )
|
|
|
e8a9a9b |
{
|
|
|
e8a9a9b |
QValueList<int> fieldIds;
|
|
|
e8a9a9b |
-
|
|
|
e8a9a9b |
+
|
|
|
e8a9a9b |
int custom = 0;
|
|
|
e8a9a9b |
Field::List::ConstIterator it;
|
|
|
e8a9a9b |
for( it = fields.begin(); it != fields.end(); ++it ) {
|
|
|
e8a9a9b |
@@ -452,7 +470,7 @@
|
|
|
e8a9a9b |
QString::number( custom++ ), customEntry );
|
|
|
e8a9a9b |
}
|
|
|
e8a9a9b |
}
|
|
|
e8a9a9b |
-
|
|
|
e8a9a9b |
+
|
|
|
e8a9a9b |
cfg->writeEntry( identifier, fieldIds );
|
|
|
e8a9a9b |
}
|
|
|
e8a9a9b |
|
|
|
e8a9a9b |
@@ -460,7 +478,7 @@
|
|
|
e8a9a9b |
{
|
|
|
e8a9a9b |
KConfig *cfg = KGlobal::config();
|
|
|
e8a9a9b |
KConfigGroupSaver( cfg, "KABCFields" );
|
|
|
e8a9a9b |
-
|
|
|
e8a9a9b |
+
|
|
|
e8a9a9b |
return restoreFields( cfg, identifier );
|
|
|
e8a9a9b |
}
|
|
|
e8a9a9b |
|
|
|
e8a9a9b |
@@ -485,7 +503,7 @@
|
|
|
e8a9a9b |
}
|
|
|
e8a9a9b |
fields.append( new Field( f ) );
|
|
|
e8a9a9b |
}
|
|
|
e8a9a9b |
-
|
|
|
e8a9a9b |
+
|
|
|
e8a9a9b |
return fields;
|
|
|
e8a9a9b |
}
|
|
|
e8a9a9b |
|
|
|
e8a9a9b |
@@ -496,7 +514,7 @@
|
|
|
e8a9a9b |
if ( !sameId ) return false;
|
|
|
e8a9a9b |
|
|
|
e8a9a9b |
if ( mImpl->fieldId() != FieldImpl::CustomField ) return true;
|
|
|
e8a9a9b |
-
|
|
|
e8a9a9b |
+
|
|
|
e8a9a9b |
return mImpl->key() == field->mImpl->key();
|
|
|
e8a9a9b |
}
|
|
|
e8a9a9b |
|
|
|
e8a9a9b |
--- kdelibs-3.5.10/kabc/scripts/entrylist.orig 2009-12-09 18:48:40.000000000 +0100
|
|
|
e8a9a9b |
+++ kdelibs-3.5.10/kabc/scripts/entrylist 2009-12-09 18:50:42.000000000 +0100
|
|
|
e8a9a9b |
@@ -29,6 +29,7 @@
|
|
|
e8a9a9b |
|
|
|
e8a9a9b |
#Address address
|
|
|
e8a9a9b |
LF,home address street,,QString,homeAddressStreet,Address|Personal
|
|
|
e8a9a9b |
+LF,home address post office box,,QString,homeAddressPostOfficeBox,Address|Personal
|
|
|
e8a9a9b |
LF,home address city,,QString,homeAddressLocality,Address|Personal
|
|
|
e8a9a9b |
LF,home address state,,QString,homeAddressRegion,Address|Personal
|
|
|
e8a9a9b |
LF,home address zip code,,QString,homeAddressPostalCode,Address|Personal
|
|
|
e8a9a9b |
@@ -36,6 +37,7 @@
|
|
|
e8a9a9b |
LF,home address label,,QString,homeAddressLabel,Address|Personal
|
|
|
e8a9a9b |
|
|
|
e8a9a9b |
LF,business address street,,QString,businessAddressStreet,Address|Organization
|
|
|
e8a9a9b |
+LF,business address post office box,,QString,businessAddressPostOfficeBox,Address|Organization
|
|
|
e8a9a9b |
LF,business address city,,QString,businessAddressLocality,Address|Organization
|
|
|
e8a9a9b |
LF,business address state,,QString,businessAddressRegion,Address|Organization
|
|
|
e8a9a9b |
LF,business address zip code,,QString,businessAddressPostalCode,Address|Organization
|