Fix placeholder of Dialer view

Fix callbar wrong button state
Fix Incoming call view (only landscape on iPad)
This commit is contained in:
Yann Diorcet 2012-08-06 16:44:37 +02:00
parent c3f2b45e3e
commit 06ed4eba05
4 changed files with 7 additions and 12 deletions

View file

@ -77,7 +77,7 @@
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentVerticalAlignment">0</int>
<string key="IBUIText"/>
<string key="IBUIPlaceholder">sip:</string>
<string key="IBUIPlaceholder">Enter sip address or phone number...</string>
<object class="NSColor" key="IBUITextColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
@ -606,6 +606,7 @@
<string key="NSFrame">{{214, 0}, {106, 69}}</string>
<reference key="NSSuperview" ref="32193173"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -1385,7 +1386,6 @@
<string>addressField</string>
<string>backButton</string>
<string>callButton</string>
<string>cancelButton</string>
<string>eightButton</string>
<string>eraseButton</string>
<string>fiveButton</string>
@ -1409,7 +1409,6 @@
<string>UIButton</string>
<string>UICallButton</string>
<string>UIButton</string>
<string>UIButton</string>
<string>UIEraseButton</string>
<string>UIButton</string>
<string>UIButton</string>
@ -1434,7 +1433,6 @@
<string>addressField</string>
<string>backButton</string>
<string>callButton</string>
<string>cancelButton</string>
<string>eightButton</string>
<string>eraseButton</string>
<string>fiveButton</string>
@ -1472,10 +1470,6 @@
<string key="name">callButton</string>
<string key="candidateClassName">UICallButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">cancelButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">eightButton</string>
<string key="candidateClassName">UIButton</string>

View file

@ -72,7 +72,7 @@
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentVerticalAlignment">0</int>
<string key="IBUIText"/>
<string key="IBUIPlaceholder">sip:</string>
<string key="IBUIPlaceholder">Enter sip address or phone number...</string>
<object class="NSColor" key="IBUITextColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
@ -603,6 +603,7 @@
<string key="NSFrame">{{126, 0}, {186, 85}}</string>
<reference key="NSSuperview" ref="683359487"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>

View file

@ -78,7 +78,7 @@ static UICompositeViewDescription *compositeDescription = nil;
tabBar:nil
tabBarEnabled:false
fullscreen:false
landscapeMode:true
landscapeMode:[LinphoneManager runningOnIpad]
portraitMode:true];
}
return compositeDescription;

View file

@ -211,8 +211,8 @@
LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]);
LinphoneCallState state = (call != NULL)?linphone_call_get_state(call): 0;
[self callUpdate:call state:state];
[optionsView setHidden:TRUE];
[padView setHidden:TRUE];
[self hideOptions];
[self hidePad];
}
- (void)viewWillDisappear:(BOOL)animated {