linphone-ios/Classes/LinphoneUI
Yann Diorcet 31accecfde Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui
Conflicts:
	Classes/AboutViewController.h
	Classes/ChatRoomTableViewController.h
	Classes/ChatRoomTableViewController.m
	Classes/ChatRoomViewController.h
	Classes/ChatRoomViewController.m
	Classes/ChatViewController.m
	Classes/ConsoleViewController.m
	Classes/ConsoleViewController.xib
	Classes/ContactDetailsLabelViewController.m
	Classes/ContactDetailsTableViewController.m
	Classes/ContactDetailsViewController.m
	Classes/ContactsViewController.m
	Classes/DialerViewController.m
	Classes/HistoryViewController.m
	Classes/ImagePickerViewController.h
	Classes/ImageViewController.h
	Classes/ImageViewController.m
	Classes/InCallTableViewController.m
	Classes/InCallViewController.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneUI/UICallBar.m
	Classes/LinphoneUI/UICallCell.h
	Classes/LinphoneUI/UICallCell.m
	Classes/LinphoneUI/UIChatCell.h
	Classes/LinphoneUI/UIChatCell.m
	Classes/LinphoneUI/UIChatCell.xib
	Classes/LinphoneUI/UIChatRoomCell.h
	Classes/LinphoneUI/UIChatRoomCell.m
	Classes/LinphoneUI/UIChatRoomCell.xib
	Classes/LinphoneUI/UICompositeViewController.h
	Classes/LinphoneUI/UIContactDetailsHeader.m
	Classes/LinphoneUI/UIHistoryCell.xib
	Classes/LinphoneUI/UIMainBar.m
	Classes/LinphoneUI/UIStateBar.xib
	Classes/LinphoneUI/en.lproj/UICallBar.xib
	Classes/LinphoneUI/en.lproj/UICallBar~ipad.xib
	Classes/LinphoneUI/en.lproj/UICallCell.xib
	Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib
	Classes/LinphoneUI/en.lproj/UIContactDetailsFooter.xib
	Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib
	Classes/LinphoneUI/en.lproj/UIMainBar.xib
	Classes/LinphoneUI/en.lproj/UIMainBar~ipad.xib
	Classes/LinphoneUI/fr.lproj/UICallBar.xib
	Classes/LinphoneUI/fr.lproj/UICallBar~ipad.xib
	Classes/LinphoneUI/fr.lproj/UICallCell.xib
	Classes/LinphoneUI/fr.lproj/UIConferenceHeader.xib
	Classes/LinphoneUI/fr.lproj/UIContactDetailsFooter.xib
	Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib
	Classes/LinphoneUI/fr.lproj/UIMainBar.xib
	Classes/LinphoneUI/fr.lproj/UIMainBar~ipad.xib
	Classes/Model/ChatModel.h
	Classes/Model/ChatModel.m
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
	Classes/PhoneMainView.xib
	Classes/SettingsViewController.m
	Classes/SettingsViewController.xib
	Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj
	Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj
	Classes/WizardViewController.h
	Classes/WizardViewController.m
	Classes/en.lproj/ChatRoomViewController.xib
	Classes/en.lproj/ChatViewController.xib
	Classes/en.lproj/ContactDetailsLabelViewController.xib
	Classes/en.lproj/ContactDetailsViewController.xib
	Classes/en.lproj/ContactsViewController.xib
	Classes/en.lproj/DialerViewController.xib
	Classes/en.lproj/DialerViewController~ipad.xib
	Classes/en.lproj/FirstLoginViewController.xib
	Classes/en.lproj/HistoryDetailsViewController.xib
	Classes/en.lproj/HistoryViewController.xib
	Classes/en.lproj/InCallViewController.xib
	Classes/en.lproj/IncomingCallViewController.xib
	Classes/en.lproj/WizardViewController.xib
	Classes/fr.lproj/ChatRoomViewController.xib
	Classes/fr.lproj/ChatViewController.xib
	Classes/fr.lproj/ContactDetailsLabelViewController.xib
	Classes/fr.lproj/ContactDetailsViewController.xib
	Classes/fr.lproj/ContactsViewController.xib
	Classes/fr.lproj/DialerViewController.xib
	Classes/fr.lproj/DialerViewController~ipad.xib
	Classes/fr.lproj/FirstLoginViewController.xib
	Classes/fr.lproj/HistoryDetailsViewController.xib
	Classes/fr.lproj/HistoryViewController.xib
	Classes/fr.lproj/InCallViewController.xib
	Classes/fr.lproj/IncomingCallViewController.xib
	Classes/fr.lproj/WizardViewController.xib
	README
	Resources/accept_default.png
	Resources/accept_over.png
	Resources/cancel_default.png
	Resources/cancel_over.png
	Resources/chat_add_default.png
	Resources/chat_add_over.png
	Resources/chat_back_default.png
	Resources/chat_back_over.png
	Resources/chat_default.png
	Resources/chat_default_landscape~ipad.png
	Resources/chat_default~ipad.png
	Resources/chat_edit_default.png
	Resources/chat_edit_over.png
	Resources/chat_message_delivered.png
	Resources/chat_message_inprogress.png
	Resources/chat_message_not_delivered.png
	Resources/chat_ok_default.png
	Resources/chat_ok_over.png
	Resources/chat_over.png
	Resources/chat_over_landscape~ipad.png
	Resources/chat_over~ipad.png
	Resources/chat_selected.png
	Resources/chat_selected_landscape~ipad.png
	Resources/chat_selected~ipad.png
	Resources/chat_send_default.png
	Resources/chat_send_disabled.png
	Resources/chat_send_over.png
	Resources/contact_back_default.png
	Resources/contact_back_over.png
	Resources/contact_cancel_default.png
	Resources/contact_cancel_over.png
	Resources/contact_edit_default.png
	Resources/contact_edit_over.png
	Resources/contact_ok_default.png
	Resources/contact_ok_disabled.png
	Resources/contact_ok_over.png
	Resources/contacts_add_default.png
	Resources/contacts_add_over.png
	Resources/contacts_all_default.png
	Resources/contacts_all_selected.png
	Resources/contacts_back_default.png
	Resources/contacts_back_over.png
	Resources/contacts_default.png
	Resources/contacts_default_landscape~ipad.png
	Resources/contacts_default~ipad.png
	Resources/contacts_linphone_default.png
	Resources/contacts_linphone_selected.png
	Resources/contacts_over.png
	Resources/contacts_over_landscape~ipad.png
	Resources/contacts_over~ipad.png
	Resources/contacts_selected.png
	Resources/contacts_selected_landscape~ipad.png
	Resources/contacts_selected~ipad.png
	Resources/decline_default.png
	Resources/decline_over.png
	Resources/dialer_address_background_landscape~ipad.png
	Resources/dialer_address_background~ipad.png
	Resources/dialer_default.png
	Resources/dialer_over.png
	Resources/dialer_selected.png
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	Resources/header_conference.png
	Resources/header_incoming.png
	Resources/history_all_default.png
	Resources/history_all_selected.png
	Resources/history_default.png
	Resources/history_default_landscape~ipad.png
	Resources/history_default~ipad.png
	Resources/history_details_add_default.png
	Resources/history_details_add_over.png
	Resources/history_details_back_default.png
	Resources/history_details_back_over.png
	Resources/history_edit_default.png
	Resources/history_edit_over.png
	Resources/history_missed_default.png
	Resources/history_missed_selected.png
	Resources/history_ok_default.png
	Resources/history_ok_over.png
	Resources/history_over.png
	Resources/history_over_landscape~ipad.png
	Resources/history_over~ipad.png
	Resources/history_selected.png
	Resources/history_selected_landscape~ipad.png
	Resources/history_selected~ipad.png
	Resources/linphonerc-factory
	Resources/linphonerc-factory~ipad
	Resources/micro_off_default.png
	Resources/micro_off_default_landscape.png
	Resources/micro_off_default_landscape~ipad.png
	Resources/micro_off_default~ipad.png
	Resources/micro_off_disabled.png
	Resources/micro_off_disabled_landscape.png
	Resources/micro_off_disabled_landscape~ipad.png
	Resources/micro_off_disabled~ipad.png
	Resources/micro_off_over.png
	Resources/micro_off_over_landscape.png
	Resources/micro_off_over_landscape~ipad.png
	Resources/micro_off_over~ipad.png
	Resources/micro_on_default.png
	Resources/micro_on_default_landscape.png
	Resources/micro_on_default_landscape~ipad.png
	Resources/micro_on_default~ipad.png
	Resources/micro_on_disabled.png
	Resources/micro_on_disabled_landscape.png
	Resources/micro_on_disabled_landscape~ipad.png
	Resources/micro_on_disabled~ipad.png
	Resources/micro_on_over.png
	Resources/micro_on_over_landscape.png
	Resources/micro_on_over_landscape~ipad.png
	Resources/micro_on_over~ipad.png
	Resources/options_add_default.png
	Resources/options_add_default_landscape.png
	Resources/options_add_default_landscape~ipad.png
	Resources/options_add_default~ipad.png
	Resources/options_add_disabled.png
	Resources/options_add_disabled_landscape.png
	Resources/options_add_disabled_landscape~ipad.png
	Resources/options_add_disabled~ipad.png
	Resources/options_add_over.png
	Resources/options_add_over_landscape.png
	Resources/options_add_over_landscape~ipad.png
	Resources/options_add_over~ipad.png
	Resources/options_default.png
	Resources/options_default_landscape.png
	Resources/options_default_landscape~ipad.png
	Resources/options_default~ipad.png
	Resources/options_disabled.png
	Resources/options_disabled_landscape.png
	Resources/options_disabled_landscape~ipad.png
	Resources/options_disabled~ipad.png
	Resources/options_over.png
	Resources/options_over_landscape.png
	Resources/options_over_landscape~ipad.png
	Resources/options_over~ipad.png
	Resources/options_selected.png
	Resources/options_selected_landscape.png
	Resources/options_selected_landscape~ipad.png
	Resources/options_selected~ipad.png
	Resources/options_transfer_default.png
	Resources/options_transfer_default_landscape.png
	Resources/options_transfer_default_landscape~ipad.png
	Resources/options_transfer_default~ipad.png
	Resources/options_transfer_disabled.png
	Resources/options_transfer_disabled_landscape.png
	Resources/options_transfer_disabled_landscape~ipad.png
	Resources/options_transfer_disabled~ipad.png
	Resources/options_transfer_over.png
	Resources/options_transfer_over_landscape.png
	Resources/options_transfer_over_landscape~ipad.png
	Resources/options_transfer_over~ipad.png
	Resources/settings_default.png
	Resources/settings_default_landscape~ipad.png
	Resources/settings_default~ipad.png
	Resources/settings_over.png
	Resources/settings_over_landscape~ipad.png
	Resources/settings_over~ipad.png
	Resources/settings_selected.png
	Resources/settings_selected_landscape~ipad.png
	Resources/settings_selected~ipad.png
	Resources/setup_back_default.png
	Resources/setup_back_disabled.png
	Resources/setup_back_over.png
	Resources/setup_cancel_default.png
	Resources/setup_cancel_disabled.png
	Resources/setup_cancel_over.png
	Resources/setup_start_default.png
	Resources/setup_start_disabled.png
	Resources/setup_start_over.png
	Resources/setup_welcome_logo.png
	Resources/speaker_off_default.png
	Resources/speaker_off_default_landscape.png
	Resources/speaker_off_default_landscape~ipad.png
	Resources/speaker_off_default~ipad.png
	Resources/speaker_off_disabled.png
	Resources/speaker_off_disabled_landscape.png
	Resources/speaker_off_disabled_landscape~ipad.png
	Resources/speaker_off_disabled~ipad.png
	Resources/speaker_off_over.png
	Resources/speaker_off_over_landscape.png
	Resources/speaker_off_over_landscape~ipad.png
	Resources/speaker_off_over~ipad.png
	Resources/speaker_on_default.png
	Resources/speaker_on_default_landscape.png
	Resources/speaker_on_default_landscape~ipad.png
	Resources/speaker_on_default~ipad.png
	Resources/speaker_on_disabled.png
	Resources/speaker_on_disabled_landscape.png
	Resources/speaker_on_disabled_landscape~ipad.png
	Resources/speaker_on_disabled~ipad.png
	Resources/speaker_on_over.png
	Resources/speaker_on_over_landscape.png
	Resources/speaker_on_over_landscape~ipad.png
	Resources/speaker_on_over~ipad.png
	Resources/switch_camera_default.png
	Resources/switch_camera_over.png
	Resources/toolsbar_background.png
	Resources/video_off_default.png
	Resources/video_off_default_landscape.png
	Resources/video_off_default_landscape~ipad.png
	Resources/video_off_default~ipad.png
	Resources/video_off_disabled.png
	Resources/video_off_disabled_landscape.png
	Resources/video_off_disabled_landscape~ipad.png
	Resources/video_off_disabled~ipad.png
	Resources/video_off_over.png
	Resources/video_off_over_landscape.png
	Resources/video_off_over_landscape~ipad.png
	Resources/video_off_over~ipad.png
	Resources/video_on_default.png
	Resources/video_on_default_landscape.png
	Resources/video_on_default_landscape~ipad.png
	Resources/video_on_default~ipad.png
	Resources/video_on_disabled.png
	Resources/video_on_disabled_landscape.png
	Resources/video_on_disabled_landscape~ipad.png
	Resources/video_on_disabled~ipad.png
	Resources/video_on_over.png
	Resources/video_on_over_landscape.png
	Resources/video_on_over_landscape~ipad.png
	Resources/video_on_over~ipad.png
	linphone-Info.plist
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Classes/ChatRoomViewController/37/ChatRoomViewController.xib
	linphone.ldb/Resources/Classes/ChatViewController/16/ChatViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsViewController/4/ContactDetailsViewController.xib
	linphone.ldb/Resources/Classes/ContactsViewController/13/ContactsViewController.xib
	linphone.ldb/Resources/Classes/DialerViewController/4/DialerViewController.xib
	linphone.ldb/Resources/Classes/DialerViewController~ipad/12/DialerViewController~ipad.xib
	linphone.ldb/Resources/Classes/FirstLoginViewController/5/FirstLoginViewController.xib
	linphone.ldb/Resources/Classes/HistoryDetailsViewController/5/HistoryDetailsViewController.xib
	linphone.ldb/Resources/Classes/HistoryViewController/12/HistoryViewController.xib
	linphone.ldb/Resources/Classes/InCallViewController/5/InCallViewController.xib
	linphone.ldb/Resources/Classes/IncomingCallViewController/6/IncomingCallViewController.xib
	linphone.ldb/Resources/Classes/WizardViews/17/WizardViews.xib
	linphone.ldb/Resources/LinphoneUI/UICallBar/9/UICallBar.xib
	linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/7/UICallBar~ipad.xib
	linphone.ldb/Resources/LinphoneUI/UICallCell/9/UICallCell.xib
	linphone.ldb/Resources/LinphoneUI/UIContactDetailsFooter/3/UIContactDetailsFooter.xib
	linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/4/UIContactDetailsHeader.xib
	linphone.ldb/Resources/LinphoneUI/UIMainBar/9/UIMainBar.xib
	linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/8/UIMainBar~ipad.xib
	linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
	linphone.xcodeproj/project.pbxproj
2012-09-26 12:34:12 +02:00
..
UIAddressTextField.h Add animation 2012-06-21 18:38:40 +02:00
UIAddressTextField.m Don't use anymore shouldAutorotateToInterfaceOrientation: Private interface rotation 2012-08-10 13:21:14 +02:00
UIBluetoothButton.h fix mistake in license notice. 2011-08-12 17:54:29 +02:00
UIBluetoothButton.m Clean Linphone Manager 2012-07-17 10:48:14 +02:00
UICallButton.h Remove useless variables (with property defined) 2012-08-20 13:23:03 +02:00
UICallButton.m Disable fastaddressbook 2012-09-20 11:07:03 +02:00
UICamSwitch.h Remove useless variables (with property defined) 2012-08-20 13:23:03 +02:00
UICamSwitch.m Add preview in dialer view on iPad 2012-09-14 11:13:18 +02:00
UIDigitButton.h Remove useless variables (with property defined) 2012-08-20 13:23:03 +02:00
UIDigitButton.m Remove useless variables (with property defined) 2012-08-20 13:23:03 +02:00
UIEditableTableViewCell.h Remove useless variables (with property defined) 2012-08-20 13:23:03 +02:00
UIEditableTableViewCell.m Improve Contact stuff 2012-07-16 11:05:38 +02:00
UIEraseButton.h Remove useless variables (with property defined) 2012-08-20 13:23:03 +02:00
UIEraseButton.m Clean Linphone Manager 2012-07-17 10:48:14 +02:00
UIHangUpButton.h Improve UI 2012-06-28 18:42:47 +02:00
UIHangUpButton.m implement message delivery status notification 2012-08-30 08:52:39 +02:00
UIHistoryCell.h Add history details view 2012-08-24 14:25:43 +02:00
UIHistoryCell.m Add ringtone settings 2012-09-12 11:25:36 +02:00
UIHistoryCell.xib Improve UI 2012-09-20 18:43:39 +02:00
UIHistoryDetailsCell.h Add history details view 2012-08-24 14:25:43 +02:00
UIHistoryDetailsCell.m Add history details view 2012-08-24 14:25:43 +02:00
UIHistoryDetailsCell.xib Fix for iPad version 2012-09-17 15:05:34 +02:00
UILightButton.h Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-09-19 10:47:11 +02:00
UILightButton.m Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
UILinphone.h Fix Chat image loading/lag 2012-09-25 16:14:45 +02:00
UILinphone.m Fix Chat image loading/lag 2012-09-25 16:14:45 +02:00
UILinphoneButton.h UI Fixes 2012-09-21 17:14:42 +02:00
UILinphoneButton.m UI Fixes 2012-09-21 17:14:42 +02:00
UILinphoneTextField.h UI Fixes 2012-09-21 17:14:42 +02:00
UILinphoneTextField.m UI Fixes 2012-09-21 17:14:42 +02:00
UILoadingImageView.h Add zoom and scroll on image viewer 2012-09-25 18:08:14 +02:00
UILoadingImageView.m Add zoom and scroll on image viewer 2012-09-25 18:08:14 +02:00
UILongTouchButton.h Cleaning and continue working on new ui 2012-06-15 16:54:46 +02:00
UILongTouchButton.m Advanced memory leak fixes 2012-08-10 00:08:40 +02:00
UIMicroButton.h Rename classes ... split buttons enable/disable stuff 2012-06-14 18:31:09 +02:00
UIMicroButton.m Clean Linphone Manager 2012-07-17 10:48:14 +02:00
UIPauseButton.h Improve UI 2012-06-28 18:42:47 +02:00
UIPauseButton.m implement message delivery status notification 2012-08-30 08:52:39 +02:00
UIRemoteImageView.h Add history details view 2012-08-24 14:25:43 +02:00
UIRemoteImageView.m Add history details view 2012-08-24 14:25:43 +02:00
UISpeakerButton.h Rename classes ... split buttons enable/disable stuff 2012-06-14 18:31:09 +02:00
UISpeakerButton.m Split Speaker fix in linphone manager 2012-09-11 17:24:42 +02:00
UIStationCell.h Start history view 2012-08-23 16:18:24 +02:00
UIStationCell.m Start history view 2012-08-23 16:18:24 +02:00
UIStationCell.xib Start history view 2012-08-23 16:18:24 +02:00
UIToggleButton.h Add multi call support 2012-06-27 18:06:59 +02:00
UIToggleButton.m Improve UI 2012-07-02 18:49:14 +02:00
UITransferButton.h Remove useless variables (with property defined) 2012-08-20 13:23:03 +02:00
UITransferButton.m Start Contact views 2012-07-09 18:00:03 +02:00
UITransparentView.h Clean Linphone Manager 2012-07-17 10:48:14 +02:00
UITransparentView.m Clean Linphone Manager 2012-07-17 10:48:14 +02:00
UIVideoButton.h Fix video button disabled state 2012-08-21 14:50:33 +02:00
UIVideoButton.m Fix video button disabled state 2012-08-21 14:50:33 +02:00
VideoZoomHandler.h Cleaning and continue working on new ui 2012-06-15 16:54:46 +02:00
VideoZoomHandler.m Cleaning and continue working on new ui 2012-06-15 16:54:46 +02:00