diff --git a/Classes/LinphoneUI/UICompositeViewController.m b/Classes/LinphoneUI/UICompositeViewController.m index 775e8c1eb..433987ad1 100644 --- a/Classes/LinphoneUI/UICompositeViewController.m +++ b/Classes/LinphoneUI/UICompositeViewController.m @@ -527,7 +527,7 @@ tabFrame.origin.y = viewFrame.size.height; tabFrame.origin.x = viewFrame.size.width; tabFrame.size.height = self.tabBarViewController.view.frame.size.height; - tabFrame.size.width = self.tabBarViewController.view.frame.size.width; + //tabFrame.size.width = self.tabBarViewController.view.frame.size.width; tabFrame.origin.y -= tabFrame.size.height; tabFrame.origin.x -= tabFrame.size.width; contentFrame.size.height = tabFrame.origin.y - contentFrame.origin.y; diff --git a/Classes/LinphoneUI/en.lproj/UICallBar.xib b/Classes/LinphoneUI/en.lproj/UICallBar.xib index 26e33847b..3398db0d7 100644 --- a/Classes/LinphoneUI/en.lproj/UICallBar.xib +++ b/Classes/LinphoneUI/en.lproj/UICallBar.xib @@ -2,9 +2,9 @@ 1536 - 11E53 + 11G63 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -35,13 +35,14 @@ - 301 + 266 - -2147483356 + -2147483355 {{0, 335}, {320, 125}} + _NS:9 1 @@ -56,13 +57,14 @@ - 288 + 293 274 {281, 260} + _NS:9 2 @@ -78,6 +80,7 @@ 292 {{-20, 10}, {107, 54}} + 1 @@ -121,6 +124,7 @@ 292 {{87, 10}, {106, 54}} + NO NO @@ -148,6 +152,7 @@ 292 {{193, 10}, {107, 54}} + NO NO @@ -175,6 +180,7 @@ 292 {{-20, 72}, {107, 54}} + NO NO @@ -202,6 +208,7 @@ 292 {{87, 72}, {106, 54}} + NO NO @@ -229,6 +236,7 @@ 292 {{193, 72}, {107, 54}} + NO NO @@ -256,6 +264,7 @@ 292 {{-20, 134}, {107, 54}} + NO NO @@ -283,6 +292,7 @@ 292 {{87, 134}, {106, 54}} + NO NO @@ -310,6 +320,7 @@ 292 {{193, 134}, {107, 54}} + NO NO @@ -337,6 +348,7 @@ 292 {{-20, 196}, {107, 54}} + NO NO @@ -364,6 +376,7 @@ 292 {{87, 196}, {106, 54}} + NO NO @@ -391,6 +404,7 @@ 292 {{193, 196}, {107, 54}} + NO NO @@ -416,6 +430,7 @@ {{20, 57}, {281, 260}} + _NS:9 @@ -427,13 +442,14 @@ - 292 + 293 292 {{3, 0}, {77, 68}} + _NS:9 NO @@ -491,6 +507,7 @@ 292 {{3, 58}, {77, 68}} + _NS:9 NO @@ -530,6 +547,7 @@ {{240, 208}, {80, 126}} + _NS:9 @@ -538,13 +556,46 @@ - 292 + 293 + + + 292 + {{-44, -8}, {44, 90}} + + + + _NS:9 + 100 + NO + IBCocoaTouchFramework + + NSImage + callbar_left_padding.png + + + + + 292 + {{320, -8}, {44, 90}} + + + + _NS:9 + 101 + NO + IBCocoaTouchFramework + + NSImage + callbar_right_padding.png + + 290 {{0, 135}, {320, 2000}} + _NS:9 @@ -559,6 +610,7 @@ 292 {80, 67} + _NS:9 NO @@ -605,6 +657,7 @@ -2147483356 {{20, 20}, {37, 37}} + _NS:9 NO @@ -617,6 +670,7 @@ 292 {{80, 0}, {80, 67}} + _NS:9 NO @@ -663,6 +717,7 @@ 292 {{160, 0}, {80, 67}} + _NS:9 NO @@ -709,6 +764,7 @@ 292 {{240, 0}, {80, 67}} + _NS:9 NO @@ -755,6 +811,7 @@ 264 {{0, 67}, {105, 68}} + _NS:9 NO @@ -791,6 +848,7 @@ -2147483384 {{0, 67}, {105, 68}} + _NS:9 NO @@ -820,6 +878,7 @@ 264 {{105, 67}, {111, 68}} + _NS:9 NO @@ -849,7 +908,8 @@ 264 {{215, 67}, {105, 68}} - + + _NS:9 NO 27 @@ -884,7 +944,8 @@ {{0, 325}, {320, 135}} - + + _NS:9 18 @@ -893,21 +954,22 @@ {320, 460} + _NS:9 - NO IBCocoaTouchFramework - 301 + 266 - -2147483356 + -2147483355 {{0, 248}, {480, 72}} + _NS:9 @@ -923,13 +985,14 @@ - 288 + 293 274 {281, 260} + _NS:9 2 @@ -942,6 +1005,7 @@ 292 {{-20, 10}, {107, 54}} + 1 @@ -964,6 +1028,7 @@ 292 {{87, 10}, {106, 54}} + NO NO @@ -982,6 +1047,7 @@ 292 {{193, 10}, {107, 54}} + NO NO @@ -1000,6 +1066,7 @@ 292 {{-20, 72}, {107, 54}} + NO NO @@ -1018,6 +1085,7 @@ 292 {{87, 72}, {106, 54}} + NO NO @@ -1036,6 +1104,7 @@ 292 {{193, 72}, {107, 54}} + NO NO @@ -1054,6 +1123,7 @@ 292 {{-20, 134}, {107, 54}} + NO NO @@ -1072,6 +1142,7 @@ 292 {{87, 134}, {106, 54}} + NO NO @@ -1090,6 +1161,7 @@ 292 {{193, 134}, {107, 54}} + NO NO @@ -1108,6 +1180,7 @@ 292 {{-20, 196}, {107, 54}} + NO NO @@ -1126,6 +1199,7 @@ 292 {{87, 196}, {106, 54}} + NO NO @@ -1144,6 +1218,7 @@ 292 {{193, 196}, {107, 54}} + NO NO 14 @@ -1159,6 +1234,7 @@ {{91, 0}, {281, 260}} + _NS:9 @@ -1167,13 +1243,14 @@ - 292 + 293 292 {65, 55} + _NS:9 NO @@ -1215,6 +1292,7 @@ 292 {{0, 51}, {65, 55}} + _NS:9 NO @@ -1254,6 +1332,7 @@ {{415, 140}, {65, 105}} + _NS:9 @@ -1262,13 +1341,40 @@ - 292 + 293 + + + 292 + {{-44, -8}, {44, 90}} + + + + _NS:9 + 100 + NO + IBCocoaTouchFramework + + + + + 292 + {{480, -8}, {44, 90}} + + + + _NS:9 + 101 + NO + IBCocoaTouchFramework + + 290 {{0, 82}, {480, 2000}} + _NS:9 @@ -1283,6 +1389,7 @@ 292 {{65, 0}, {65, 82}} + _NS:9 NO @@ -1329,6 +1436,7 @@ -2147483356 {{79, 20}, {37, 37}} + _NS:9 NO @@ -1341,6 +1449,7 @@ 292 {{130, 0}, {65, 82}} + _NS:9 NO @@ -1387,6 +1496,7 @@ 292 {{285, 0}, {65, 82}} + _NS:9 NO @@ -1433,6 +1543,7 @@ 292 {{350, 0}, {65, 82}} + _NS:9 NO @@ -1479,6 +1590,7 @@ 264 {65, 82} + _NS:9 NO @@ -1512,6 +1624,7 @@ -2147483384 {65, 82} + _NS:9 NO @@ -1541,6 +1654,7 @@ 264 {{195, 0}, {90, 82}} + _NS:9 NO @@ -1570,7 +1684,8 @@ 264 {{415, 0}, {65, 82}} - + + _NS:9 NO 27 @@ -1602,7 +1717,8 @@ {{0, 238}, {480, 82}} - + + _NS:9 18 @@ -1611,10 +1727,10 @@ {480, 320} + _NS:9 - NO 3 3 @@ -2035,6 +2151,8 @@ + + buttons @@ -2361,6 +2479,8 @@ + + buttons @@ -2437,6 +2557,30 @@ background + + 143 + + + leftPadding + + + 144 + + + rightPadding + + + 145 + + + rightPadding + + + 146 + + + leftPadding + @@ -2535,6 +2679,10 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2605,14 +2753,296 @@ - 142 + 163 + + + + + TPMultiLayoutViewController + UIViewController + + UIView + UIView + + + + landscapeView + UIView + + + portraitView + UIView + + + + IBProjectSource + ./Classes/TPMultiLayoutViewController.h + + + + UICallBar + TPMultiLayoutViewController + + id + id + id + id + id + + + + onConferenceClick: + id + + + onOptionsAddClick: + id + + + onOptionsClick: + id + + + onOptionsTransferClick: + id + + + onPadClick: + id + + + + UIButton + UIToggleButton + UIDigitButton + UIDigitButton + UIDigitButton + UIHangUpButton + UIMicroButton + UIDigitButton + UIDigitButton + UIButton + UIToggleButton + UIButton + UIView + UIView + UIPauseButton + UIDigitButton + UIDigitButton + UIDigitButton + UISpeakerButton + UIDigitButton + UIDigitButton + UIDigitButton + UIVideoButton + UIDigitButton + + + + conferenceButton + UIButton + + + dialerButton + UIToggleButton + + + eightButton + UIDigitButton + + + fiveButton + UIDigitButton + + + fourButton + UIDigitButton + + + hangupButton + UIHangUpButton + + + microButton + UIMicroButton + + + nineButton + UIDigitButton + + + oneButton + UIDigitButton + + + optionsAddButton + UIButton + + + optionsButton + UIToggleButton + + + optionsTransferButton + UIButton + + + optionsView + UIView + + + padView + UIView + + + pauseButton + UIPauseButton + + + sevenButton + UIDigitButton + + + sharpButton + UIDigitButton + + + sixButton + UIDigitButton + + + speakerButton + UISpeakerButton + + + starButton + UIDigitButton + + + threeButton + UIDigitButton + + + twoButton + UIDigitButton + + + videoButton + UIVideoButton + + + zeroButton + UIDigitButton + + + + IBProjectSource + ./Classes/UICallBar.h + + + + UIDigitButton + UILongTouchButton + + addressField + UITextField + + + addressField + + addressField + UITextField + + + + IBProjectSource + ./Classes/UIDigitButton.h + + + + UIHangUpButton + UIButton + + IBProjectSource + ./Classes/UIHangUpButton.h + + + + UILongTouchButton + UIButton + + IBProjectSource + ./Classes/UILongTouchButton.h + + + + UIMicroButton + UIToggleButton + + IBProjectSource + ./Classes/UIMicroButton.h + + + + UIPauseButton + UIToggleButton + + IBProjectSource + ./Classes/UIPauseButton.h + + + + UISpeakerButton + UIToggleButton + + IBProjectSource + ./Classes/UISpeakerButton.h + + + + UIToggleButton + UIButton + + IBProjectSource + ./Classes/UIToggleButton.h + + + + UITransparentView + UIView + + IBProjectSource + ./Classes/UITransparentView.h + + + + UIVideoButton + UIToggleButton + + waitView + UIActivityIndicatorView + + + waitView + + waitView + UIActivityIndicatorView + + + + IBProjectSource + ./Classes/UIVideoButton.h + + + - 0 IBCocoaTouchFramework YES 3 + {88, 180} + {88, 180} {209, 136} {130, 163} {209, 136} diff --git a/Classes/LinphoneUI/fr.lproj/UICallBar.xib b/Classes/LinphoneUI/fr.lproj/UICallBar.xib index 6fa108778..04797317e 100644 --- a/Classes/LinphoneUI/fr.lproj/UICallBar.xib +++ b/Classes/LinphoneUI/fr.lproj/UICallBar.xib @@ -1,21 +1,21 @@ - 1280 - 11E53 - 1938 - 1138.47 + 1536 + 11G63 + 2840 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1926 - IBUIButton - IBUIActivityIndicatorView - IBUIView - IBUIImageView IBProxyObject + IBUIActivityIndicatorView + IBUIButton + IBUIImageView + IBUIView com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -35,11 +35,11 @@ - 301 + 266 - -2147483356 + -2147483355 {{0, 335}, {320, 125}} _NS:9 @@ -56,7 +56,7 @@ - 288 + 293 @@ -427,7 +427,7 @@ - 292 + 293 @@ -538,8 +538,38 @@ - 292 + 293 + + + 292 + {{-44, -8}, {44, 90}} + + + _NS:9 + 100 + NO + IBCocoaTouchFramework + + NSImage + callbar_left_padding.png + + + + + 292 + {{320, -8}, {44, 90}} + + + _NS:9 + 101 + NO + IBCocoaTouchFramework + + NSImage + callbar_right_padding.png + + 290 @@ -849,7 +879,7 @@ 264 {{215, 67}, {105, 68}} - + _NS:9 NO 27 @@ -884,7 +914,7 @@ {{0, 325}, {320, 135}} - + _NS:9 18 @@ -895,16 +925,15 @@ _NS:9 - NO IBCocoaTouchFramework - 301 + 266 - -2147483356 + -2147483355 {{0, 248}, {480, 72}} @@ -922,7 +951,7 @@ - 288 + 293 @@ -1166,7 +1195,7 @@ - 292 + 293 @@ -1261,8 +1290,32 @@ - 292 + 293 + + + 292 + {{-44, -8}, {44, 90}} + + + _NS:9 + 100 + NO + IBCocoaTouchFramework + + + + + 292 + {{480, -8}, {44, 90}} + + + _NS:9 + 101 + NO + IBCocoaTouchFramework + + 290 @@ -1569,7 +1622,7 @@ 264 {{415, 0}, {65, 82}} - + _NS:9 NO 27 @@ -1601,7 +1654,7 @@ {{0, 238}, {480, 82}} - + _NS:9 18 @@ -1612,7 +1665,6 @@ _NS:9 - NO 3 3 @@ -2033,6 +2085,8 @@ + + buttons @@ -2359,6 +2413,8 @@ + + buttons @@ -2435,6 +2491,30 @@ background + + 143 + + + leftPadding + + + 144 + + + rightPadding + + + 145 + + + rightPadding + + + 146 + + + leftPadding + @@ -2533,6 +2613,10 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2603,14 +2687,296 @@ - 142 + 163 + + + + + TPMultiLayoutViewController + UIViewController + + UIView + UIView + + + + landscapeView + UIView + + + portraitView + UIView + + + + IBProjectSource + ./Classes/TPMultiLayoutViewController.h + + + + UICallBar + TPMultiLayoutViewController + + id + id + id + id + id + + + + onConferenceClick: + id + + + onOptionsAddClick: + id + + + onOptionsClick: + id + + + onOptionsTransferClick: + id + + + onPadClick: + id + + + + UIButton + UIToggleButton + UIDigitButton + UIDigitButton + UIDigitButton + UIHangUpButton + UIMicroButton + UIDigitButton + UIDigitButton + UIButton + UIToggleButton + UIButton + UIView + UIView + UIPauseButton + UIDigitButton + UIDigitButton + UIDigitButton + UISpeakerButton + UIDigitButton + UIDigitButton + UIDigitButton + UIVideoButton + UIDigitButton + + + + conferenceButton + UIButton + + + dialerButton + UIToggleButton + + + eightButton + UIDigitButton + + + fiveButton + UIDigitButton + + + fourButton + UIDigitButton + + + hangupButton + UIHangUpButton + + + microButton + UIMicroButton + + + nineButton + UIDigitButton + + + oneButton + UIDigitButton + + + optionsAddButton + UIButton + + + optionsButton + UIToggleButton + + + optionsTransferButton + UIButton + + + optionsView + UIView + + + padView + UIView + + + pauseButton + UIPauseButton + + + sevenButton + UIDigitButton + + + sharpButton + UIDigitButton + + + sixButton + UIDigitButton + + + speakerButton + UISpeakerButton + + + starButton + UIDigitButton + + + threeButton + UIDigitButton + + + twoButton + UIDigitButton + + + videoButton + UIVideoButton + + + zeroButton + UIDigitButton + + + + IBProjectSource + ./Classes/UICallBar.h + + + + UIDigitButton + UILongTouchButton + + addressField + UITextField + + + addressField + + addressField + UITextField + + + + IBProjectSource + ./Classes/UIDigitButton.h + + + + UIHangUpButton + UIButton + + IBProjectSource + ./Classes/UIHangUpButton.h + + + + UILongTouchButton + UIButton + + IBProjectSource + ./Classes/UILongTouchButton.h + + + + UIMicroButton + UIToggleButton + + IBProjectSource + ./Classes/UIMicroButton.h + + + + UIPauseButton + UIToggleButton + + IBProjectSource + ./Classes/UIPauseButton.h + + + + UISpeakerButton + UIToggleButton + + IBProjectSource + ./Classes/UISpeakerButton.h + + + + UIToggleButton + UIButton + + IBProjectSource + ./Classes/UIToggleButton.h + + + + UITransparentView + UIView + + IBProjectSource + ./Classes/UITransparentView.h + + + + UIVideoButton + UIToggleButton + + waitView + UIActivityIndicatorView + + + waitView + + waitView + UIActivityIndicatorView + + + + IBProjectSource + ./Classes/UIVideoButton.h + + + - 0 IBCocoaTouchFramework YES 3 + {88, 180} + {88, 180} {209, 136} {130, 163} {209, 136} @@ -2702,6 +3068,6 @@ {160, 134} {130, 163} - 933 + 1926 diff --git a/Resources/callbar_left_padding.png b/Resources/callbar_left_padding.png new file mode 100644 index 000000000..c54a13b3c Binary files /dev/null and b/Resources/callbar_left_padding.png differ diff --git a/Resources/callbar_right_padding.png b/Resources/callbar_right_padding.png new file mode 100644 index 000000000..fc859f667 Binary files /dev/null and b/Resources/callbar_right_padding.png differ diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index 6307ec04b..f3a73709f 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -7504,17 +7504,17 @@ backup - 10 + 11 class BLWrapperHandle name - LinphoneUI/UICallBar/10/UICallBar.xib + LinphoneUI/UICallBar/11/UICallBar.xib change date - 2012-09-27T09:31:07Z + 2012-11-09T09:15:46Z changed values class @@ -7524,7 +7524,7 @@ flags 0 hash - c5958759098558a4f8f5d1c18abc0e21 + 18fba1eaf5f411c2e245f79b882aa7b1 name UICallBar.xib @@ -8626,9 +8626,9 @@ versions en - 10 + 11 fr - 10 + 11 diff --git a/linphone.ldb/Resources/LinphoneUI/UICallBar/10/UICallBar.xib b/linphone.ldb/Resources/LinphoneUI/UICallBar/11/UICallBar.xib similarity index 87% rename from linphone.ldb/Resources/LinphoneUI/UICallBar/10/UICallBar.xib rename to linphone.ldb/Resources/LinphoneUI/UICallBar/11/UICallBar.xib index 26e33847b..343b085af 100644 --- a/linphone.ldb/Resources/LinphoneUI/UICallBar/10/UICallBar.xib +++ b/linphone.ldb/Resources/LinphoneUI/UICallBar/11/UICallBar.xib @@ -2,9 +2,9 @@ 1536 - 11E53 + 11G63 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -35,13 +35,14 @@ - 301 + 266 - -2147483356 + -2147483355 {{0, 335}, {320, 125}} + _NS:9 1 @@ -56,13 +57,14 @@ - 288 + 293 274 {281, 260} + _NS:9 2 @@ -78,6 +80,7 @@ 292 {{-20, 10}, {107, 54}} + 1 @@ -121,6 +124,7 @@ 292 {{87, 10}, {106, 54}} + NO NO @@ -148,6 +152,7 @@ 292 {{193, 10}, {107, 54}} + NO NO @@ -175,6 +180,7 @@ 292 {{-20, 72}, {107, 54}} + NO NO @@ -202,6 +208,7 @@ 292 {{87, 72}, {106, 54}} + NO NO @@ -229,6 +236,7 @@ 292 {{193, 72}, {107, 54}} + NO NO @@ -256,6 +264,7 @@ 292 {{-20, 134}, {107, 54}} + NO NO @@ -283,6 +292,7 @@ 292 {{87, 134}, {106, 54}} + NO NO @@ -310,6 +320,7 @@ 292 {{193, 134}, {107, 54}} + NO NO @@ -337,6 +348,7 @@ 292 {{-20, 196}, {107, 54}} + NO NO @@ -364,6 +376,7 @@ 292 {{87, 196}, {106, 54}} + NO NO @@ -391,6 +404,7 @@ 292 {{193, 196}, {107, 54}} + NO NO @@ -416,6 +430,7 @@ {{20, 57}, {281, 260}} + _NS:9 @@ -427,13 +442,14 @@ - 292 + 293 292 {{3, 0}, {77, 68}} + _NS:9 NO @@ -491,6 +507,7 @@ 292 {{3, 58}, {77, 68}} + _NS:9 NO @@ -530,6 +547,7 @@ {{240, 208}, {80, 126}} + _NS:9 @@ -538,13 +556,46 @@ - 292 + 293 + + + 292 + {{-44, -8}, {44, 90}} + + + + _NS:9 + 100 + NO + IBCocoaTouchFramework + + NSImage + callbar_left_padding.png + + + + + 292 + {{320, -8}, {44, 90}} + + + + _NS:9 + 101 + NO + IBCocoaTouchFramework + + NSImage + callbar_right_padding.png + + 290 {{0, 135}, {320, 2000}} + _NS:9 @@ -559,6 +610,7 @@ 292 {80, 67} + _NS:9 NO @@ -605,6 +657,7 @@ -2147483356 {{20, 20}, {37, 37}} + _NS:9 NO @@ -617,6 +670,7 @@ 292 {{80, 0}, {80, 67}} + _NS:9 NO @@ -663,6 +717,7 @@ 292 {{160, 0}, {80, 67}} + _NS:9 NO @@ -709,6 +764,7 @@ 292 {{240, 0}, {80, 67}} + _NS:9 NO @@ -755,6 +811,7 @@ 264 {{0, 67}, {105, 68}} + _NS:9 NO @@ -791,6 +848,7 @@ -2147483384 {{0, 67}, {105, 68}} + _NS:9 NO @@ -820,6 +878,7 @@ 264 {{105, 67}, {111, 68}} + _NS:9 NO @@ -849,7 +908,8 @@ 264 {{215, 67}, {105, 68}} - + + _NS:9 NO 27 @@ -884,7 +944,8 @@ {{0, 325}, {320, 135}} - + + _NS:9 18 @@ -893,21 +954,22 @@ {320, 460} + _NS:9 - NO IBCocoaTouchFramework - 301 + 266 - -2147483356 + -2147483355 {{0, 248}, {480, 72}} + _NS:9 @@ -923,13 +985,14 @@ - 288 + 293 274 {281, 260} + _NS:9 2 @@ -942,6 +1005,7 @@ 292 {{-20, 10}, {107, 54}} + 1 @@ -964,6 +1028,7 @@ 292 {{87, 10}, {106, 54}} + NO NO @@ -982,6 +1047,7 @@ 292 {{193, 10}, {107, 54}} + NO NO @@ -1000,6 +1066,7 @@ 292 {{-20, 72}, {107, 54}} + NO NO @@ -1018,6 +1085,7 @@ 292 {{87, 72}, {106, 54}} + NO NO @@ -1036,6 +1104,7 @@ 292 {{193, 72}, {107, 54}} + NO NO @@ -1054,6 +1123,7 @@ 292 {{-20, 134}, {107, 54}} + NO NO @@ -1072,6 +1142,7 @@ 292 {{87, 134}, {106, 54}} + NO NO @@ -1090,6 +1161,7 @@ 292 {{193, 134}, {107, 54}} + NO NO @@ -1108,6 +1180,7 @@ 292 {{-20, 196}, {107, 54}} + NO NO @@ -1126,6 +1199,7 @@ 292 {{87, 196}, {106, 54}} + NO NO @@ -1144,6 +1218,7 @@ 292 {{193, 196}, {107, 54}} + NO NO 14 @@ -1159,6 +1234,7 @@ {{91, 0}, {281, 260}} + _NS:9 @@ -1167,13 +1243,14 @@ - 292 + 293 292 {65, 55} + _NS:9 NO @@ -1215,6 +1292,7 @@ 292 {{0, 51}, {65, 55}} + _NS:9 NO @@ -1254,6 +1332,7 @@ {{415, 140}, {65, 105}} + _NS:9 @@ -1262,13 +1341,40 @@ - 292 + 293 + + + 292 + {{-44, -8}, {44, 90}} + + + + _NS:9 + 100 + NO + IBCocoaTouchFramework + + + + + 292 + {{480, -8}, {44, 90}} + + + + _NS:9 + 101 + NO + IBCocoaTouchFramework + + 290 {{0, 82}, {480, 2000}} + _NS:9 @@ -1283,6 +1389,7 @@ 292 {{65, 0}, {65, 82}} + _NS:9 NO @@ -1329,6 +1436,7 @@ -2147483356 {{79, 20}, {37, 37}} + _NS:9 NO @@ -1341,6 +1449,7 @@ 292 {{130, 0}, {65, 82}} + _NS:9 NO @@ -1387,6 +1496,7 @@ 292 {{285, 0}, {65, 82}} + _NS:9 NO @@ -1433,6 +1543,7 @@ 292 {{350, 0}, {65, 82}} + _NS:9 NO @@ -1479,6 +1590,7 @@ 264 {65, 82} + _NS:9 NO @@ -1512,6 +1624,7 @@ -2147483384 {65, 82} + _NS:9 NO @@ -1541,6 +1654,7 @@ 264 {{195, 0}, {90, 82}} + _NS:9 NO @@ -1570,7 +1684,8 @@ 264 {{415, 0}, {65, 82}} - + + _NS:9 NO 27 @@ -1602,7 +1717,8 @@ {{0, 238}, {480, 82}} - + + _NS:9 18 @@ -1611,10 +1727,10 @@ {480, 320} + _NS:9 - NO 3 3 @@ -2035,6 +2151,8 @@ + + buttons @@ -2361,6 +2479,8 @@ + + buttons @@ -2437,6 +2557,30 @@ background + + 143 + + + leftPadding + + + 144 + + + rightPadding + + + 145 + + + rightPadding + + + 146 + + + leftPadding + @@ -2535,6 +2679,10 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2605,14 +2753,296 @@ - 142 + 163 + + + + + TPMultiLayoutViewController + UIViewController + + UIView + UIView + + + + landscapeView + UIView + + + portraitView + UIView + + + + IBProjectSource + ./Classes/TPMultiLayoutViewController.h + + + + UICallBar + TPMultiLayoutViewController + + id + id + id + id + id + + + + onConferenceClick: + id + + + onOptionsAddClick: + id + + + onOptionsClick: + id + + + onOptionsTransferClick: + id + + + onPadClick: + id + + + + UIButton + UIToggleButton + UIDigitButton + UIDigitButton + UIDigitButton + UIHangUpButton + UIMicroButton + UIDigitButton + UIDigitButton + UIButton + UIToggleButton + UIButton + UIView + UIView + UIPauseButton + UIDigitButton + UIDigitButton + UIDigitButton + UISpeakerButton + UIDigitButton + UIDigitButton + UIDigitButton + UIVideoButton + UIDigitButton + + + + conferenceButton + UIButton + + + dialerButton + UIToggleButton + + + eightButton + UIDigitButton + + + fiveButton + UIDigitButton + + + fourButton + UIDigitButton + + + hangupButton + UIHangUpButton + + + microButton + UIMicroButton + + + nineButton + UIDigitButton + + + oneButton + UIDigitButton + + + optionsAddButton + UIButton + + + optionsButton + UIToggleButton + + + optionsTransferButton + UIButton + + + optionsView + UIView + + + padView + UIView + + + pauseButton + UIPauseButton + + + sevenButton + UIDigitButton + + + sharpButton + UIDigitButton + + + sixButton + UIDigitButton + + + speakerButton + UISpeakerButton + + + starButton + UIDigitButton + + + threeButton + UIDigitButton + + + twoButton + UIDigitButton + + + videoButton + UIVideoButton + + + zeroButton + UIDigitButton + + + + IBProjectSource + ./Classes/UICallBar.h + + + + UIDigitButton + UILongTouchButton + + addressField + UITextField + + + addressField + + addressField + UITextField + + + + IBProjectSource + ./Classes/UIDigitButton.h + + + + UIHangUpButton + UIButton + + IBProjectSource + ./Classes/UIHangUpButton.h + + + + UILongTouchButton + UIButton + + IBProjectSource + ./Classes/UILongTouchButton.h + + + + UIMicroButton + UIToggleButton + + IBProjectSource + ./Classes/UIMicroButton.h + + + + UIPauseButton + UIToggleButton + + IBProjectSource + ./Classes/UIPauseButton.h + + + + UISpeakerButton + UIToggleButton + + IBProjectSource + ./Classes/UISpeakerButton.h + + + + UIToggleButton + UIButton + + IBProjectSource + ./Classes/UIToggleButton.h + + + + UITransparentView + UIView + + IBProjectSource + ./Classes/UITransparentView.h + + + + UIVideoButton + UIToggleButton + + waitView + UIActivityIndicatorView + + + waitView + + waitView + UIActivityIndicatorView + + + + IBProjectSource + ./Classes/UIVideoButton.h + + + - 0 IBCocoaTouchFramework YES 3 + {88, 180} + {88, 180} {209, 136} {130, 163} {209, 136} diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 57e51dc3a..1007a8f6b 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -326,6 +326,10 @@ D33CF34B15D3A03400CD4B85 /* linphone_icon_57@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D33CF34815D3A03400CD4B85 /* linphone_icon_57@2x.png */; }; D33CF34C15D3A03400CD4B85 /* linphone_icon_72@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D33CF34915D3A03400CD4B85 /* linphone_icon_72@2x.png */; }; D33CF34D15D3A03400CD4B85 /* linphone_icon_72@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D33CF34915D3A03400CD4B85 /* linphone_icon_72@2x.png */; }; + D33E1F08164CF35100CFA363 /* callbar_left_padding.png in Resources */ = {isa = PBXBuildFile; fileRef = D33E1F06164CF35100CFA363 /* callbar_left_padding.png */; }; + D33E1F09164CF35100CFA363 /* callbar_left_padding.png in Resources */ = {isa = PBXBuildFile; fileRef = D33E1F06164CF35100CFA363 /* callbar_left_padding.png */; }; + D33E1F0A164CF35100CFA363 /* callbar_right_padding.png in Resources */ = {isa = PBXBuildFile; fileRef = D33E1F07164CF35100CFA363 /* callbar_right_padding.png */; }; + D33E1F0B164CF35100CFA363 /* callbar_right_padding.png in Resources */ = {isa = PBXBuildFile; fileRef = D33E1F07164CF35100CFA363 /* callbar_right_padding.png */; }; D3432A62158A4446001C6B0B /* led_connected.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A5C158A4446001C6B0B /* led_connected.png */; }; D3432A64158A4446001C6B0B /* led_error.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A5D158A4446001C6B0B /* led_error.png */; }; D3432A66158A4446001C6B0B /* call_quality_indicator_0.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A5E158A4446001C6B0B /* call_quality_indicator_0.png */; }; @@ -1757,6 +1761,8 @@ D339890515C6E16F00CAF1E4 /* dialer_alt_back_over_landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "dialer_alt_back_over_landscape~ipad.png"; path = "Resources/dialer_alt_back_over_landscape~ipad.png"; sourceTree = ""; }; D33CF34815D3A03400CD4B85 /* linphone_icon_57@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone_icon_57@2x.png"; path = "Resources/linphone_icon_57@2x.png"; sourceTree = ""; }; D33CF34915D3A03400CD4B85 /* linphone_icon_72@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone_icon_72@2x.png"; path = "Resources/linphone_icon_72@2x.png"; sourceTree = ""; }; + D33E1F06164CF35100CFA363 /* callbar_left_padding.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = callbar_left_padding.png; path = Resources/callbar_left_padding.png; sourceTree = ""; }; + D33E1F07164CF35100CFA363 /* callbar_right_padding.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = callbar_right_padding.png; path = Resources/callbar_right_padding.png; sourceTree = ""; }; D3432A5C158A4446001C6B0B /* led_connected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = led_connected.png; path = Resources/led_connected.png; sourceTree = ""; }; D3432A5D158A4446001C6B0B /* led_error.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = led_error.png; path = Resources/led_error.png; sourceTree = ""; }; D3432A5E158A4446001C6B0B /* call_quality_indicator_0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = call_quality_indicator_0.png; path = Resources/call_quality_indicator_0.png; sourceTree = ""; }; @@ -2998,6 +3004,8 @@ D31C9C8D158A1C1000756B45 /* call_status_incoming.png */, D31C9C8E158A1C1000756B45 /* call_status_missed.png */, D31C9C8F158A1C1000756B45 /* call_status_outgoing.png */, + D33E1F06164CF35100CFA363 /* callbar_left_padding.png */, + D33E1F07164CF35100CFA363 /* callbar_right_padding.png */, D3E84F1715B00F4100420DAC /* cancel_default.png */, D3E84F1815B00F4100420DAC /* cancel_over.png */, D36C43CC158F2F370048BA40 /* cell_call.png */, @@ -4201,6 +4209,8 @@ D3103926162C3C5200C00C18 /* linphone_splashscreen-Landscape@2x.png in Resources */, D3103928162C3C5200C00C18 /* linphone_splashscreen-Portrait.png in Resources */, D310392A162C3C5200C00C18 /* linphone_splashscreen-Portrait@2x.png in Resources */, + D33E1F08164CF35100CFA363 /* callbar_left_padding.png in Resources */, + D33E1F0A164CF35100CFA363 /* callbar_right_padding.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4707,6 +4717,8 @@ D3103927162C3C5200C00C18 /* linphone_splashscreen-Landscape@2x.png in Resources */, D3103929162C3C5200C00C18 /* linphone_splashscreen-Portrait.png in Resources */, D310392B162C3C5200C00C18 /* linphone_splashscreen-Portrait@2x.png in Resources */, + D33E1F09164CF35100CFA363 /* callbar_left_padding.png in Resources */, + D33E1F0B164CF35100CFA363 /* callbar_right_padding.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; };