← Back to branch summary

~rhuddie/address-book-app/add-photo-helper

~rhuddie/address-book-app/add-photo-helper

« back to all changes in this revision

Viewing changes to src/imports/Ubuntu/Contacts/contacts.h

Committer: Richard Huddie
Date: 2015-02-24 15:05:10 UTC
mfrom: (218.1.167 address-book-app)
Revision ID: richard.huddie@canonical.com-20150224150510-nks2u1p0otpmji8m

merge from trunk

files added:
po/am.po

po/az.po

po/ca@valencia.po

po/da.po

po/el.po

po/en_AU.po

po/eo.po

po/fa.po

po/id.po

po/is.po

po/ko.po

po/oc.po

po/pa.po

po/pt.po

po/ro.po

po/sr.po

src/artwork/address-book-app-symbolic.svg

src/artwork/address-book-app.png

src/imports/ContactEdit/ComboButtonAddField.qml

src/imports/ContentHubProxy.qml

src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml

src/imports/Ubuntu/Contacts/ContactListModel.qml

src/imports/Ubuntu/Contacts/ContactPreviewPage.qml

src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml

src/imports/Ubuntu/Contacts/MostCalledList.qml

src/imports/Ubuntu/Contacts/OnlineAccountsDummy.qml

src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml

src/imports/Ubuntu/Contacts/SectionDelegate.qml

src/imports/Ubuntu/Contacts/SubtitledWithColors.qml

src/imports/Ubuntu/Contacts/VCardParser.qml

tests/data/tst_ContactListModel_data.vcf

tests/data/vcard_single.vcf

tests/qml/tst_ContactList.qml

tests/qml/tst_ContactListModel.qml

tests/qml/tst_ContactListView.qml

tests/qml/tst_ContactPreviewPage.qml

tests/qml/tst_ListWithActions.qml

tests/qml/tst_VCardParser.qml

files removed:
data/address-book-app.svg

src/imports/ContactEdit/AddFieldDialog.qml

src/imports/ContactList/OnlineAccountsMessage.qml

src/imports/Ubuntu/Contacts/DialogButtons.qml

files renamed:
data/address-book-app.desktop.in => data/address-book-app.desktop.in.in

src/imports/ContactList/ContactExporter.qml => src/imports/Common/ContactExporter.qml

src/imports/ContactView/ActionButton.qml => src/imports/Ubuntu/Contacts/ActionButton.qml

src/imports/ContactView/BasicFieldView.qml => src/imports/Ubuntu/Contacts/BasicFieldView.qml

src/imports/ContactView/ContactDetailAddressesView.qml => src/imports/Ubuntu/Contacts/ContactDetailAddressesView.qml

src/imports/ContactView/ContactDetailAvatarView.qml => src/imports/Ubuntu/Contacts/ContactDetailAvatarView.qml

src/imports/Common/ContactDetailBase.qml => src/imports/Ubuntu/Contacts/ContactDetailBase.qml

src/imports/ContactView/ContactDetailEmailsView.qml => src/imports/Ubuntu/Contacts/ContactDetailEmailsView.qml

src/imports/Common/ContactDetailGroupBase.qml => src/imports/Ubuntu/Contacts/ContactDetailGroupBase.qml

src/imports/Common/ContactDetailGroupWithTypeBase.qml => src/imports/Ubuntu/Contacts/ContactDetailGroupWithTypeBase.qml

src/imports/ContactView/ContactDetailGroupWithTypeView.qml => src/imports/Ubuntu/Contacts/ContactDetailGroupWithTypeView.qml

src/imports/ContactView/ContactDetailOnlineAccountsView.qml => src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountsView.qml

src/imports/ContactView/ContactDetailOrganizationsView.qml => src/imports/Ubuntu/Contacts/ContactDetailOrganizationsView.qml

src/imports/ContactView/ContactDetailPhoneNumberView.qml => src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberView.qml

src/imports/ContactView/ContactDetailPhoneNumbersView.qml => src/imports/Ubuntu/Contacts/ContactDetailPhoneNumbersView.qml

src/imports/ContactView/ContactDetailWithTypeView.qml => src/imports/Ubuntu/Contacts/ContactDetailWithTypeView.qml

src/imports/ContactList/PageWithBottomEdge.qml => src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml

files modified:
CMakeLists.txt

data/CMakeLists.txt

debian/changelog

debian/control

po/CMakeLists.txt

po/address-book-app.pot

po/ar.po

po/ast.po

po/bg.po

po/bn.po

po/br.po

po/ca.po

po/ckb.po

po/cs.po

po/de.po

po/en_GB.po

po/es.po

po/eu.po

po/fi.po

po/fr.po

po/gd.po

po/gl.po

po/he.po

po/hr.po

po/hu.po

po/it.po

po/ja.po

po/km.po

po/lv.po

po/ms.po

po/my.po

po/nb.po

po/nl.po

po/pl.po

po/pt_BR.po

po/ru.po

po/sl.po

po/sv.po

po/ta.po

po/tr.po

po/ug.po

po/uk.po

po/zh_CN.po

po/zh_HK.po

po/zh_TW.po

src/app/addressbookapp.cpp

src/app/addressbookapp.h

src/app/imagescalethread.cpp

src/artwork/CMakeLists.txt

src/imports/CMakeLists.txt

src/imports/Common/CMakeLists.txt

src/imports/Common/ContactDetailItem.qml

src/imports/Common/RemoveContactsDialog.qml

src/imports/ContactEdit/AvatarImport.qml

src/imports/ContactEdit/CMakeLists.txt

src/imports/ContactEdit/ContactDetailAddressesEditor.qml

src/imports/ContactEdit/ContactDetailAvatarEditor.qml

src/imports/ContactEdit/ContactDetailEmailsEditor.qml

src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml

src/imports/ContactEdit/ContactDetailNameEditor.qml

src/imports/ContactEdit/ContactDetailOnlineAccountsEditor.qml

src/imports/ContactEdit/ContactDetailOrganizationsEditor.qml

src/imports/ContactEdit/ContactDetailPhoneNumbersEditor.qml

src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml

src/imports/ContactEdit/ContactDetailWithTypeEditor.qml

src/imports/ContactEdit/ContactEditor.qml

src/imports/ContactEdit/TextInputDetail.qml

src/imports/ContactEdit/ValueSelector.qml

src/imports/ContactList/CMakeLists.txt

src/imports/ContactList/ContactListPage.qml

src/imports/ContactList/VCardImportDialog.qml

src/imports/ContactShare/ContactSharePage.qml

src/imports/ContactView/CMakeLists.txt

src/imports/ContactView/ContactDetailNameView.qml

src/imports/ContactView/ContactDetailSyncTargetView.qml

src/imports/ContactView/ContactFetchError.qml

src/imports/ContactView/ContactHeaderView.qml

src/imports/ContactView/ContactView.qml

src/imports/MainWindow.qml

src/imports/Ubuntu/Contacts/CMakeLists.txt

src/imports/Ubuntu/Contacts/ContactAvatar.qml

src/imports/Ubuntu/Contacts/ContactDelegate.qml

src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml

src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml

src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml

src/imports/Ubuntu/Contacts/ContactListView.qml

src/imports/Ubuntu/Contacts/ContactSimpleListView.qml

src/imports/Ubuntu/Contacts/Contacts.js

src/imports/Ubuntu/Contacts/FastScroll.qml

src/imports/Ubuntu/Contacts/ListItemWithActions.qml

src/imports/Ubuntu/Contacts/MostCalledModel.qml

src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml

src/imports/Ubuntu/Contacts/contacts.cpp

src/imports/Ubuntu/Contacts/contacts.h

src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp

src/imports/Ubuntu/Contacts/mostcalledproxymodel.h

src/imports/Ubuntu/Contacts/qmldir

tests/autopilot/address_book_app/__init__.py

tests/autopilot/address_book_app/pages/_common.py

tests/autopilot/address_book_app/pages/_contact_editor.py

tests/autopilot/address_book_app/pages/_contact_list_page.py

tests/autopilot/address_book_app/tests/__init__.py

tests/autopilot/address_book_app/tests/test_create_new_from_uri.py

tests/autopilot/address_book_app/tests/test_delete_contact.py

tests/autopilot/address_book_app/tests/test_multiple_pick_mode.py

tests/autopilot/address_book_app/tests/test_single_pick_mode.py

tests/data/CMakeLists.txt

tests/qml/CMakeLists.txt

tests/qml/tst_ContactEditor.qml

Show diffs side-by-side

added added

removed removed

src/imports/Ubuntu/Contacts/contacts.h

28

28

UbuntuContacts(QObject *parent = 0);

29

29

30

30

Q_INVOKABLE QString contactInitialsFromString(const QString &value);

31

Q_INVOKABLE QString normalized(const QString &value);

31

32

};

32

33

33

34

#endif //_UBUNTU_CONTACTS_H_

Older »