← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kdepim/oneiric-updates

« back to all changes in this revision

Viewing changes to kaddressbook/contactfields.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2011-06-28 19:33:24 UTC
  • mfrom: (0.2.13) (0.1.13 sid)
  • Revision ID: package-import@ubuntu.com-20110628193324-8yvjs8sdv9rdoo6c
Tags: 4:4.7.0-0ubuntu1
* New upstream release
  - update install files
  - add missing kdepim-doc package to control file
  - Fix Vcs lines
  - kontact breaks/replaces korganizer << 4:4.6.80
  - tighten the dependency of kdepim-dev on libkdepim4 to fix lintian error

Show diffs side-by-side

added added

removed removed

Lines of Context:
kaddressbook/contactfields.cpp
57
57
    case CarPhone: return KABC::Addressee::carPhoneLabel(); break;
58
58
    case Isdn: return KABC::Addressee::isdnLabel(); break;
59
59
    case Pager: return KABC::Addressee::pagerLabel(); break;
60
 
    case PreferredEmail: return i18n( "EMail (preferred)" ); break;
61
 
    case Email2: return i18n( "EMail (2)" ); break;
62
 
    case Email3: return i18n( "EMail (3)" ); break;
63
 
    case Email4: return i18n( "EMail (4)" ); break;
 
60
    case PreferredEmail: return i18nc( "Preferred email address", "EMail (preferred)" ); break;
 
61
    case Email2: return i18nc( "Second email address", "EMail (2)" ); break;
 
62
    case Email3: return i18nc( "Third email address", "EMail (3)" ); break;
 
63
    case Email4: return i18nc( "Fourth email address", "EMail (4)" ); break;
64
64
    case Mailer: return KABC::Addressee::mailerLabel(); break;
65
65
    case Title: return KABC::Addressee::titleLabel(); break;
66
66
    case Role: return KABC::Addressee::roleLabel(); break;
67
67
    case Organization: return KABC::Addressee::organizationLabel(); break;
68
68
    case Note: return KABC::Addressee::noteLabel(); break;
69
69
    case Homepage: return KABC::Addressee::urlLabel(); break;
 
70
    case BlogFeed: return i18n( "Blog Feed" ); break;
 
71
    case Profession: return i18n( "Profession" ); break;
 
72
    case Office: return i18n( "Office" ); break;
 
73
    case Manager: return i18n( "Manager" ); break;
 
74
    case Assistant: return i18n( "Assistant" ); break;
 
75
    case Spouse: return i18n( "Spouse" ); break;
70
76
  }
71
77
 
72
78
  return QString();
117
123
         << Role
118
124
         << Organization
119
125
         << Note
120
 
         << Homepage;
 
126
         << Homepage
 
127
         << BlogFeed
 
128
         << Profession
 
129
         << Office
 
130
         << Manager
 
131
         << Assistant
 
132
         << Spouse;
121
133
 
122
134
  return fields;
123
135
}
341
353
        contact.insertAddress( address );
342
354
      }
343
355
      break;
 
356
    case BlogFeed:
 
357
      contact.insertCustom( QLatin1String( "KADDRESSBOOK" ), QLatin1String( "BlogFeed" ), value );
 
358
      break;
 
359
    case Profession:
 
360
      contact.insertCustom( QLatin1String( "KADDRESSBOOK" ), QLatin1String( "X-Profession" ), value );
 
361
      break;
 
362
    case Office:
 
363
      contact.insertCustom( QLatin1String( "KADDRESSBOOK" ), QLatin1String( "X-Office" ), value );
 
364
      break;
 
365
    case Manager:
 
366
      contact.insertCustom( QLatin1String( "KADDRESSBOOK" ), QLatin1String( "X-ManagersName" ), value );
 
367
      break;
 
368
    case Assistant:
 
369
      contact.insertCustom( QLatin1String( "KADDRESSBOOK" ), QLatin1String( "X-AssistantsName" ), value );
 
370
      break;
 
371
    case Spouse:
 
372
      contact.insertCustom( QLatin1String( "KADDRESSBOOK" ), QLatin1String( "X-SpousesName" ), value );
 
373
      break;
344
374
  }
345
375
}
346
376
 
359
389
      {
360
390
        const QDateTime birthday = contact.birthday();
361
391
        if ( birthday.isValid() )
362
 
          return birthday.toString( Qt::ISODate );
 
392
          return birthday.date().toString( Qt::ISODate );
363
393
        else
364
394
          return QString();
365
395
      }
495
525
    case Organization: return contact.organization(); break;
496
526
    case Note: return contact.note(); break;
497
527
    case Homepage: return contact.url().url(); break;
 
528
    case BlogFeed: return contact.custom( QLatin1String( "KADDRESSBOOK" ), QLatin1String( "BlogFeed" ) );
 
529
    case Profession: return contact.custom( QLatin1String( "KADDRESSBOOK" ), QLatin1String( "X-Profession" ) );
 
530
    case Office: return contact.custom( QLatin1String( "KADDRESSBOOK" ), QLatin1String( "X-Office" ) );
 
531
    case Manager: return contact.custom( QLatin1String( "KADDRESSBOOK" ), QLatin1String( "X-ManagersName" ) );
 
532
    case Assistant: return contact.custom( QLatin1String( "KADDRESSBOOK" ), QLatin1String( "X-AssistantsName" ) );
 
533
    case Spouse: return contact.custom( QLatin1String( "KADDRESSBOOK" ), QLatin1String( "X-SpousesName" ) );
498
534
  }
499
535
 
500
536
  return QString();