First integration

This commit is contained in:
Yann Diorcet 2012-07-12 11:51:05 +02:00
parent c4d8a9ee63
commit d0daf5b3ca
165 changed files with 167 additions and 89 deletions

View file

@ -4587,6 +4587,8 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<object class="NSColor" key="IBUINormalTitleShadowColor" id="365714543">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC41AA</bytes>
@ -4595,6 +4597,10 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">accept_over.png</string>
</object>
<object class="NSCustomResource" key="IBUIDisabledImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">accept_disabled.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">accept_default.png</string>
@ -4624,6 +4630,8 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<reference key="IBUINormalTitleShadowColor" ref="365714543"/>
<object class="NSCustomResource" key="IBUIHighlightedImage">
<string key="NSClassName">NSImage</string>
@ -4832,7 +4840,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="6.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="7.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<real value="3" key="7.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary>
@ -4900,10 +4908,11 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="accept_default.png">{320, 154}</string>
<string key="accept_disabled.png">{320, 154}</string>
<string key="accept_over.png">{320, 154}</string>
<string key="avatar_shadow.png">{640, 523}</string>
<string key="avatar_unknown.png">{320, 339}</string>
<string key="background.png">{16, 16}</string>
<string key="background.png">{640, 523}</string>
<string key="cell_call_first.png">{640, 125}</string>
<string key="decline_default.png">{320, 154}</string>
<string key="decline_over.png">{320, 154}</string>

View file

@ -146,12 +146,13 @@ int __aeabi_idiv(int a, int b) {
[[PhoneMainView instance] changeView: PhoneView_FirstLogin];
} else {
// Change to default view
/* MODIFICATION: Disable Wizard
const MSList *list = linphone_core_get_proxy_config_list([LinphoneManager getLc]);
if(list != NULL) {
if(list != NULL) {*/
[[PhoneMainView instance] changeView: PhoneView_Dialer];
} else {
/*} else {
[[PhoneMainView instance] changeView: PhoneView_Wizard];
}
}*/
}
[UIDevice currentDevice].batteryMonitoringEnabled = YES;

View file

@ -357,6 +357,7 @@
- (IBAction)onOptionsTransferClick:(id)sender {
[self hideOptions];
/* MODIFICATION: Disable tansfer
// Go to dialer view
NSDictionary *dict = [[[NSDictionary alloc] initWithObjectsAndKeys:
[[[NSArray alloc] initWithObjects: @"", nil] autorelease]
@ -365,6 +366,7 @@
, @"setTransferMode:",
nil] autorelease];
[[PhoneMainView instance] changeView:PhoneView_Dialer dict:dict];
*/
}
- (IBAction)onOptionsAddClick:(id)sender {

View file

@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1296</int>
<string key="IBDocument.SystemVersion">11D50</string>
<string key="IBDocument.SystemVersion">11E53</string>
<string key="IBDocument.InterfaceBuilderVersion">2182</string>
<string key="IBDocument.AppKitVersion">1138.32</string>
<string key="IBDocument.HIToolboxVersion">568.00</string>
<string key="IBDocument.AppKitVersion">1138.47</string>
<string key="IBDocument.HIToolboxVersion">569.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">1181</string>
@ -14,6 +14,7 @@
<string>IBUIButton</string>
<string>IBUIActivityIndicatorView</string>
<string>IBUIView</string>
<string>IBUIImageView</string>
<string>IBProxyObject</string>
</array>
<array key="IBDocument.PluginDependencies">
@ -42,7 +43,6 @@
<string key="NSFrame">{{0, 335}, {320, 125}}</string>
<reference key="NSSuperview" ref="931774220"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
@ -59,10 +59,27 @@
<reference key="NSNextResponder" ref="931774220"/>
<int key="NSvFlags">-2147483360</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIImageView" id="650366159">
<reference key="NSNextResponder" ref="556199520"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{320, 460}</string>
<reference key="NSSuperview" ref="556199520"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel"/>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">background.png</string>
</object>
</object>
<object class="IBUIButton" id="291142801">
<reference key="NSNextResponder" ref="556199520"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{-20, 10}, {107, 54}}</string>
<string key="NSFrame">{{0, 67}, {107, 54}}</string>
<reference key="NSSuperview" ref="556199520"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="612787992"/>
@ -102,7 +119,7 @@
<object class="IBUIButton" id="612787992">
<reference key="NSNextResponder" ref="556199520"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{87, 10}, {106, 54}}</string>
<string key="NSFrame">{{107, 67}, {106, 54}}</string>
<reference key="NSSuperview" ref="556199520"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="843780954"/>
@ -126,7 +143,7 @@
<object class="IBUIButton" id="843780954">
<reference key="NSNextResponder" ref="556199520"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{193, 10}, {107, 54}}</string>
<string key="NSFrame">{{213, 67}, {107, 54}}</string>
<reference key="NSSuperview" ref="556199520"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1070521404"/>
@ -150,7 +167,7 @@
<object class="IBUIButton" id="1070521404">
<reference key="NSNextResponder" ref="556199520"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{-20, 72}, {107, 54}}</string>
<string key="NSFrame">{{0, 129}, {107, 54}}</string>
<reference key="NSSuperview" ref="556199520"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="736263510"/>
@ -174,7 +191,7 @@
<object class="IBUIButton" id="736263510">
<reference key="NSNextResponder" ref="556199520"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{87, 72}, {106, 54}}</string>
<string key="NSFrame">{{107, 129}, {106, 54}}</string>
<reference key="NSSuperview" ref="556199520"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="977745568"/>
@ -198,7 +215,7 @@
<object class="IBUIButton" id="977745568">
<reference key="NSNextResponder" ref="556199520"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{193, 72}, {107, 54}}</string>
<string key="NSFrame">{{213, 129}, {107, 54}}</string>
<reference key="NSSuperview" ref="556199520"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="308872469"/>
@ -222,7 +239,7 @@
<object class="IBUIButton" id="308872469">
<reference key="NSNextResponder" ref="556199520"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{-20, 134}, {107, 54}}</string>
<string key="NSFrame">{{0, 191}, {107, 54}}</string>
<reference key="NSSuperview" ref="556199520"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="809465959"/>
@ -246,7 +263,7 @@
<object class="IBUIButton" id="809465959">
<reference key="NSNextResponder" ref="556199520"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{87, 134}, {106, 54}}</string>
<string key="NSFrame">{{107, 191}, {106, 54}}</string>
<reference key="NSSuperview" ref="556199520"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="193555513"/>
@ -270,7 +287,7 @@
<object class="IBUIButton" id="193555513">
<reference key="NSNextResponder" ref="556199520"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{193, 134}, {107, 54}}</string>
<string key="NSFrame">{{213, 191}, {107, 54}}</string>
<reference key="NSSuperview" ref="556199520"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="357389737"/>
@ -294,7 +311,7 @@
<object class="IBUIButton" id="357389737">
<reference key="NSNextResponder" ref="556199520"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{-20, 196}, {107, 54}}</string>
<string key="NSFrame">{{0, 253}, {107, 54}}</string>
<reference key="NSSuperview" ref="556199520"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="525082175"/>
@ -318,7 +335,7 @@
<object class="IBUIButton" id="525082175">
<reference key="NSNextResponder" ref="556199520"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{87, 196}, {106, 54}}</string>
<string key="NSFrame">{{107, 253}, {106, 54}}</string>
<reference key="NSSuperview" ref="556199520"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="951243834"/>
@ -342,7 +359,7 @@
<object class="IBUIButton" id="951243834">
<reference key="NSNextResponder" ref="556199520"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{193, 196}, {107, 54}}</string>
<string key="NSFrame">{{213, 253}, {107, 54}}</string>
<reference key="NSSuperview" ref="556199520"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="143533231"/>
@ -364,7 +381,7 @@
<reference key="IBUIFont" ref="315645433"/>
</object>
</array>
<string key="NSFrame">{{20, 57}, {281, 260}}</string>
<string key="NSFrameSize">{320, 460}</string>
<reference key="NSSuperview" ref="931774220"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="291142801"/>
@ -384,7 +401,7 @@
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIButton" id="322088049">
<reference key="NSNextResponder" ref="1070539677"/>
<int key="NSvFlags">292</int>
<int key="NSvFlags">-2147483356</int>
<string key="NSFrameSize">{80, 67}</string>
<reference key="NSSuperview" ref="1070539677"/>
<reference key="NSWindow"/>
@ -1150,6 +1167,7 @@
<reference ref="843780954"/>
<reference ref="612787992"/>
<reference ref="291142801"/>
<reference ref="650366159"/>
</array>
<reference key="parent" ref="931774220"/>
<string key="objectName">pad</string>
@ -1254,6 +1272,12 @@
<reference key="parent" ref="1070539677"/>
<string key="objectName">optionsTansferButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">99</int>
<reference key="object" ref="650366159"/>
<reference key="parent" ref="556199520"/>
<string key="objectName">background</string>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@ -1329,12 +1353,13 @@
<real value="3" key="9.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="90.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="3" key="90.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="99.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">98</int>
<int key="maxID">99</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -1599,6 +1624,7 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="background.png">{640, 523}</string>
<string key="conference_default.png">{209, 136}</string>
<string key="conference_over.png">{209, 136}</string>
<string key="dialer_alt_default.png">{209, 136}</string>
@ -1633,9 +1659,9 @@
<string key="numpad_two_over.png">{220, 113}</string>
<string key="numpad_zero_default.png">{220, 113}</string>
<string key="numpad_zero_over.png">{220, 113}</string>
<string key="options_add_default.png">{155, 137}</string>
<string key="options_add_disabled.png">{155, 137}</string>
<string key="options_add_over.png">{155, 137}</string>
<string key="options_add_default.png">{160, 134}</string>
<string key="options_add_disabled.png">{160, 134}</string>
<string key="options_add_over.png">{160, 134}</string>
<string key="options_default.png">{160, 134}</string>
<string key="options_disabled.png">{160, 134}</string>
<string key="options_over.png">{160, 134}</string>

View file

@ -24,17 +24,17 @@
UIButton *contactsButton;
UIButton *dialerButton;
UIButton *settingsButton;
UIButton *chatButton;
UIButton *moreButton;
}
@property (nonatomic, retain) IBOutlet UIButton* historyButton;
@property (nonatomic, retain) IBOutlet UIButton* contactsButton;
@property (nonatomic, retain) IBOutlet UIButton* dialerButton;
@property (nonatomic, retain) IBOutlet UIButton* settingsButton;
@property (nonatomic, retain) IBOutlet UIButton* chatButton;
@property (nonatomic, retain) IBOutlet UIButton* moreButton;
-(IBAction) onHistoryClick: (id) event;
-(IBAction) onContactsClick: (id) event;
-(IBAction) onDialerClick: (id) event;
-(IBAction) onSettingsClick: (id) event;
-(IBAction) onChatClick: (id) event;
-(IBAction) onMoreClick: (id) event;
@end

View file

@ -26,7 +26,7 @@
@synthesize contactsButton;
@synthesize dialerButton;
@synthesize settingsButton;
@synthesize chatButton;
@synthesize moreButton;
#pragma mark - Lifecycle Functions
@ -42,7 +42,7 @@
[contactsButton release];
[dialerButton release];
[settingsButton release];
[chatButton release];
[moreButton release];
[super dealloc];
}
@ -102,9 +102,9 @@
settingsButton.selected = FALSE;
}
if(view == PhoneView_Chat || view == PhoneView_ChatRoom) {
chatButton.selected = TRUE;
moreButton.selected = TRUE;
} else {
chatButton.selected = FALSE;
moreButton.selected = FALSE;
}
}
@ -127,7 +127,7 @@
[[PhoneMainView instance] changeView:PhoneView_Settings];
}
- (IBAction)onChatClick: (id) event {
- (IBAction)onMoreClick: (id) event {
[[PhoneMainView instance] changeView:PhoneView_Chat];
}

View file

@ -198,7 +198,6 @@
<string key="NSFrame">{{256, 0}, {64, 77}}</string>
<reference key="NSSuperview" ref="1018893129"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@ -211,15 +210,15 @@
<reference key="IBUINormalTitleShadowColor" ref="260229542"/>
<object class="NSCustomResource" key="IBUIHighlightedImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">chat_over.png</string>
<string key="NSResourceName">more_over.png</string>
</object>
<object class="NSCustomResource" key="IBUISelectedImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">chat_selected.png</string>
<string key="NSResourceName">more_selected.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">chat_default.png</string>
<string key="NSResourceName">more_default.png</string>
</object>
<reference key="IBUIFontDescription" ref="978094057"/>
<reference key="IBUIFont" ref="98882926"/>
@ -264,14 +263,6 @@
</object>
<int key="connectionID">27</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">chatButton</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="55915342"/>
</object>
<int key="connectionID">28</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">settingsButton</string>
@ -288,14 +279,22 @@
</object>
<int key="connectionID">12</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">moreButton</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="55915342"/>
</object>
<int key="connectionID">31</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onChatClick:</string>
<string key="label">onMoreClick:</string>
<reference key="source" ref="55915342"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">26</int>
<int key="connectionID">30</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
@ -374,12 +373,6 @@
<reference key="parent" ref="1018893129"/>
<string key="objectName">mask</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">5</int>
<reference key="object" ref="55915342"/>
<reference key="parent" ref="1018893129"/>
<string key="objectName">chat</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">6</int>
<reference key="object" ref="318948703"/>
@ -404,6 +397,12 @@
<reference key="parent" ref="1018893129"/>
<string key="objectName">dialer</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">5</int>
<reference key="object" ref="55915342"/>
<reference key="parent" ref="1018893129"/>
<string key="objectName">more</string>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@ -415,7 +414,7 @@
<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="2" key="5.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<real value="0.0" key="5.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="2" key="6.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -429,7 +428,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">29</int>
<int key="maxID">31</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -437,17 +436,13 @@
<string key="className">UIMainBar</string>
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="onChatClick:">id</string>
<string key="onContactsClick:">id</string>
<string key="onDialerClick:">id</string>
<string key="onHistoryClick:">id</string>
<string key="onMoreClick:">id</string>
<string key="onSettingsClick:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="onChatClick:">
<string key="name">onChatClick:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="onContactsClick:">
<string key="name">onContactsClick:</string>
<string key="candidateClassName">id</string>
@ -460,23 +455,23 @@
<string key="name">onHistoryClick:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="onMoreClick:">
<string key="name">onMoreClick:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="onSettingsClick:">
<string key="name">onSettingsClick:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="chatButton">UIButton</string>
<string key="contactsButton">UIButton</string>
<string key="dialerButton">UIButton</string>
<string key="historyButton">UIButton</string>
<string key="moreButton">UIButton</string>
<string key="settingsButton">UIButton</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="chatButton">
<string key="name">chatButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="contactsButton">
<string key="name">contactsButton</string>
<string key="candidateClassName">UIButton</string>
@ -489,6 +484,10 @@
<string key="name">historyButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="moreButton">
<string key="name">moreButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="settingsButton">
<string key="name">settingsButton</string>
<string key="candidateClassName">UIButton</string>
@ -510,9 +509,6 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="chat_default.png">{128, 154}</string>
<string key="chat_over.png">{128, 154}</string>
<string key="chat_selected.png">{128, 154}</string>
<string key="contacts_default.png">{128, 154}</string>
<string key="contacts_over.png">{128, 154}</string>
<string key="contacts_selected.png">{128, 154}</string>
@ -522,6 +518,9 @@
<string key="history_default.png">{128, 154}</string>
<string key="history_over.png">{128, 154}</string>
<string key="history_selected.png">{128, 154}</string>
<string key="more_default.png">{128, 154}</string>
<string key="more_over.png">{128, 154}</string>
<string key="more_selected.png">{128, 154}</string>
<string key="settings_default.png">{128, 154}</string>
<string key="settings_over.png">{128, 154}</string>
<string key="settings_selected.png">{128, 154}</string>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5 KiB

After

Width:  |  Height:  |  Size: 9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 862 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5 KiB

After

Width:  |  Height:  |  Size: 8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Some files were not shown because too many files have changed in this diff Show more