Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added call waiting option.

Call waiting can be enabled or disabled in preferences. Previously it was always turned on.

Fixes issue 396.
  • Loading branch information...
commit a2feb1b3176db9bdadd0241437c3baa206d97455 1 parent 73a5805
@eofster authored
View
3  AKSIPCall.h
@@ -194,6 +194,9 @@ extern NSString * const AKSIPCallTransferStatusDidChangeNotification;
// Replies with 480 Temporarily Unavailable.
- (void)replyWithTemporarilyUnavailable;
+// Replies with 486 Busy Here.
+- (void)replyWithBusyHere;
+
// Starts local ringback sound.
- (void)ringbackStart;
View
8 AKSIPCall.m
@@ -301,6 +301,14 @@ - (void)replyWithTemporarilyUnavailable {
NSLog(@"Error replying with 480 Temporarily Unavailable");
}
+- (void)replyWithBusyHere {
+ pj_status_t status = pjsua_call_answer([self identifier], PJSIP_SC_BUSY_HERE,
+ NULL, NULL);
+ if (status != PJ_SUCCESS) {
+ NSLog(@"Error replying with 486 Busy Here");
+ }
+}
+
- (void)ringbackStart {
AKSIPUserAgent *userAgent = [AKSIPUserAgent sharedUserAgent];
View
15 AccountController.m
@@ -852,11 +852,22 @@ - (void)callWindowWillClose:(NSNotification *)notification {
#pragma mark AKSIPAccountDelegate protocol
- (void)SIPAccountDidReceiveCall:(AKSIPCall *)aCall {
- // Just reply with 480 Temporarily Unavailable if the user selected
- // Unavailable account state.
if ([self isAccountUnavailable]) {
+ // Reply with 480 Temporarily Unavailable if the user selected Unavailable
+ // account state.
[aCall replyWithTemporarilyUnavailable];
+
return;
+
+ } else if (![[NSUserDefaults standardUserDefaults] boolForKey:kCallWaiting]) {
+ // Reply with 486 Busy Here if needed.
+ for (CallController *callController in [self callControllers]) {
+ if ([callController isCallActive]) {
+ [aCall replyWithBusyHere];
+
+ return;
+ }
+ }
}
[[NSApp delegate] pauseITunes];
View
1  AppController.m
@@ -281,6 +281,7 @@ + (void)initialize {
forKey:kAutoCloseCallWindow];
[defaultsDict setObject:[NSNumber numberWithBool:NO]
forKey:kAutoCloseMissedCallWindow];
+ [defaultsDict setObject:[NSNumber numberWithBool:YES] forKey:kCallWaiting];
NSString *preferredLocalization
= [[[NSBundle mainBundle] preferredLocalizations] objectAtIndex:0];
View
135 English.lproj/GeneralPreferencesView.xib
@@ -2,15 +2,17 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">10B504</string>
- <string key="IBDocument.InterfaceBuilderVersion">732</string>
- <string key="IBDocument.AppKitVersion">1038.2</string>
- <string key="IBDocument.HIToolboxVersion">437.00</string>
+ <string key="IBDocument.SystemVersion">10H574</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
+ <string key="IBDocument.AppKitVersion">1038.35</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">732</string>
+ <string key="NS.object.0">823</string>
</object>
- <array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>
+ <array class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <integer value="150"/>
+ </array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</array>
@@ -26,31 +28,34 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSUserDefaultsController" id="456522789">
+ <array class="NSMutableArray" key="NSDeclaredKeys">
+ <string>CallWaiting</string>
+ </array>
<bool key="NSSharedInstance">YES</bool>
</object>
<object class="NSCustomView" id="544735637">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSButton" id="623880427">
+ <object class="NSButton" id="564615667">
<reference key="NSNextResponder" ref="544735637"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{83, 78}, {258, 18}}</string>
+ <string key="NSFrame">{{83, 18}, {96, 18}}</string>
<reference key="NSSuperview" ref="544735637"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="575335877">
+ <object class="NSButtonCell" key="NSCell" id="454468671">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Automatically format phone numbers</string>
+ <string key="NSContents">Call waiting</string>
<object class="NSFont" key="NSSupport" id="632429488">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
- <reference key="NSControlView" ref="623880427"/>
+ <reference key="NSControlView" ref="564615667"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
- <object class="NSCustomResource" key="NSNormalImage" id="878572023">
+ <object class="NSCustomResource" key="NSNormalImage" id="828364283">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSSwitch</string>
</object>
@@ -63,10 +68,32 @@
<int key="NSPeriodicInterval">25</int>
</object>
</object>
+ <object class="NSButton" id="623880427">
+ <reference key="NSNextResponder" ref="544735637"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{83, 98}, {258, 18}}</string>
+ <reference key="NSSuperview" ref="544735637"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="575335877">
+ <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">Automatically format phone numbers</string>
+ <reference key="NSSupport" ref="632429488"/>
+ <reference key="NSControlView" ref="623880427"/>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">2</int>
+ <reference key="NSNormalImage" ref="828364283"/>
+ <reference key="NSAlternateImage" ref="90334372"/>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
<object class="NSButton" id="374192320">
<reference key="NSNextResponder" ref="544735637"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{103, 58}, {197, 18}}</string>
+ <string key="NSFrame">{{103, 78}, {197, 18}}</string>
<reference key="NSSuperview" ref="544735637"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="588255250">
@@ -77,7 +104,7 @@
<reference key="NSControlView" ref="374192320"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="878572023"/>
+ <reference key="NSNormalImage" ref="828364283"/>
<reference key="NSAlternateImage" ref="90334372"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
@@ -88,7 +115,7 @@
<object class="NSButton" id="195739532">
<reference key="NSNextResponder" ref="544735637"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{83, 38}, {176, 18}}</string>
+ <string key="NSFrame">{{83, 58}, {176, 18}}</string>
<reference key="NSSuperview" ref="544735637"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="730421258">
@@ -99,7 +126,7 @@
<reference key="NSControlView" ref="195739532"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="878572023"/>
+ <reference key="NSNormalImage" ref="828364283"/>
<reference key="NSAlternateImage" ref="90334372"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
@@ -110,7 +137,7 @@
<object class="NSButton" id="340144577">
<reference key="NSNextResponder" ref="544735637"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{83, 18}, {229, 18}}</string>
+ <string key="NSFrame">{{83, 38}, {229, 18}}</string>
<reference key="NSSuperview" ref="544735637"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="492749651">
@@ -121,7 +148,7 @@
<reference key="NSControlView" ref="340144577"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="878572023"/>
+ <reference key="NSNormalImage" ref="828364283"/>
<reference key="NSAlternateImage" ref="90334372"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
@@ -130,7 +157,8 @@
</object>
</object>
</array>
- <string key="NSFrameSize">{508, 108}</string>
+ <string key="NSFrameSize">{508, 128}</string>
+ <reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
</array>
@@ -224,6 +252,22 @@
</object>
<int key="connectionID">528</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: values.CallWaiting</string>
+ <reference key="source" ref="564615667"/>
+ <reference key="destination" ref="456522789"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="564615667"/>
+ <reference key="NSDestination" ref="456522789"/>
+ <string key="NSLabel">value: values.CallWaiting</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">values.CallWaiting</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">532</int>
+ </object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@@ -264,6 +308,7 @@
<reference ref="195739532"/>
<reference ref="374192320"/>
<reference ref="623880427"/>
+ <reference ref="564615667"/>
</array>
<reference key="parent" ref="0"/>
<string key="objectName">General</string>
@@ -320,11 +365,24 @@
<reference key="object" ref="492749651"/>
<reference key="parent" ref="340144577"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">529</int>
+ <reference key="object" ref="564615667"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="454468671"/>
+ </array>
+ <reference key="parent" ref="544735637"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">530</int>
+ <reference key="object" ref="454468671"/>
+ <reference key="parent" ref="564615667"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="150.IBEditorWindowLastContentRect">{{287, 404}, {508, 108}}</string>
+ <string key="150.IBEditorWindowLastContentRect">{{263, 414}, {508, 128}}</string>
<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array class="NSMutableArray" key="150.IBUserGuides"/>
<string key="201.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -336,12 +394,17 @@
<string key="521.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="524.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="525.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="529.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <object class="NSAffineTransform" key="529.IBViewBoundsToFrameTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABCpgAAwggAAA</bytes>
+ </object>
+ <string key="530.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">528</int>
+ <int key="maxID">532</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -721,20 +784,6 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Sparkle.framework/Headers/SUAppcast.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Sparkle.framework/Headers/SUUpdater.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">NSResponder</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
@@ -790,6 +839,13 @@
<string key="NS.key.0">view</string>
<string key="NS.object.0">NSView</string>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">view</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">view</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSViewController.h</string>
@@ -798,12 +854,17 @@
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1060" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">Telephone.xcodeproj</string>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../Telephone.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <string key="NS.key.0">NSSwitch</string>
+ <string key="NS.object.0">{15, 15}</string>
+ </object>
</data>
</archive>
View
123 German.lproj/GeneralPreferencesView.xib
@@ -2,15 +2,17 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">10B504</string>
- <string key="IBDocument.InterfaceBuilderVersion">732</string>
- <string key="IBDocument.AppKitVersion">1038.2</string>
- <string key="IBDocument.HIToolboxVersion">437.00</string>
+ <string key="IBDocument.SystemVersion">10H574</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
+ <string key="IBDocument.AppKitVersion">1038.35</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">732</string>
+ <string key="NS.object.0">823</string>
</object>
- <array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>
+ <array class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <integer value="150"/>
+ </array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</array>
@@ -29,28 +31,28 @@
<bool key="NSSharedInstance">YES</bool>
</object>
<object class="NSCustomView" id="275499278">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSButton" id="509554116">
+ <object class="NSButton" id="307692948">
<reference key="NSNextResponder" ref="275499278"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{83, 58}, {290, 18}}</string>
+ <string key="NSFrame">{{83, 18}, {87, 18}}</string>
<reference key="NSSuperview" ref="275499278"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="108792251">
+ <object class="NSButtonCell" key="NSCell" id="459711471">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Telefonnummern automatisch formatieren</string>
+ <string key="NSContents">Anklopfen</string>
<object class="NSFont" key="NSSupport" id="746461678">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
- <reference key="NSControlView" ref="509554116"/>
+ <reference key="NSControlView" ref="307692948"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
- <object class="NSCustomResource" key="NSNormalImage" id="863564702">
+ <object class="NSCustomResource" key="NSNormalImage" id="130562576">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSSwitch</string>
</object>
@@ -63,10 +65,32 @@
<int key="NSPeriodicInterval">25</int>
</object>
</object>
+ <object class="NSButton" id="509554116">
+ <reference key="NSNextResponder" ref="275499278"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{83, 78}, {290, 18}}</string>
+ <reference key="NSSuperview" ref="275499278"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="108792251">
+ <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">Telefonnummern automatisch formatieren</string>
+ <reference key="NSSupport" ref="746461678"/>
+ <reference key="NSControlView" ref="509554116"/>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">2</int>
+ <reference key="NSNormalImage" ref="130562576"/>
+ <reference key="NSAlternateImage" ref="399336460"/>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
<object class="NSButton" id="597793180">
<reference key="NSNextResponder" ref="275499278"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{83, 38}, {192, 18}}</string>
+ <string key="NSFrame">{{83, 58}, {192, 18}}</string>
<reference key="NSSuperview" ref="275499278"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="169896977">
@@ -77,7 +101,7 @@
<reference key="NSControlView" ref="597793180"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="863564702"/>
+ <reference key="NSNormalImage" ref="130562576"/>
<reference key="NSAlternateImage" ref="399336460"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
@@ -88,7 +112,7 @@
<object class="NSButton" id="50114494">
<reference key="NSNextResponder" ref="275499278"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{83, 18}, {246, 18}}</string>
+ <string key="NSFrame">{{83, 38}, {246, 18}}</string>
<reference key="NSSuperview" ref="275499278"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="386398823">
@@ -99,7 +123,7 @@
<reference key="NSControlView" ref="50114494"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="863564702"/>
+ <reference key="NSNormalImage" ref="130562576"/>
<reference key="NSAlternateImage" ref="399336460"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
@@ -108,7 +132,8 @@
</object>
</object>
</array>
- <string key="NSFrameSize">{540, 88}</string>
+ <string key="NSFrameSize">{540, 108}</string>
+ <reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
</array>
@@ -170,6 +195,22 @@
</object>
<int key="connectionID">423</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: values.CallWaiting</string>
+ <reference key="source" ref="307692948"/>
+ <reference key="destination" ref="210305965"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="307692948"/>
+ <reference key="NSDestination" ref="210305965"/>
+ <string key="NSLabel">value: values.CallWaiting</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">values.CallWaiting</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">427</int>
+ </object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@@ -197,6 +238,7 @@
<reference ref="50114494"/>
<reference ref="597793180"/>
<reference ref="509554116"/>
+ <reference ref="307692948"/>
</array>
<reference key="parent" ref="0"/>
<string key="objectName">General</string>
@@ -252,11 +294,24 @@
<reference key="object" ref="386398823"/>
<reference key="parent" ref="50114494"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">424</int>
+ <reference key="object" ref="307692948"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="459711471"/>
+ </array>
+ <reference key="parent" ref="275499278"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">425</int>
+ <reference key="object" ref="459711471"/>
+ <reference key="parent" ref="307692948"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="150.IBEditorWindowLastContentRect">{{255, 272}, {540, 88}}</string>
+ <string key="150.IBEditorWindowLastContentRect">{{255, 252}, {540, 108}}</string>
<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array class="NSMutableArray" key="150.IBUserGuides"/>
<string key="201.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -266,12 +321,14 @@
<string key="416.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="419.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="420.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="424.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="425.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">423</int>
+ <int key="maxID">427</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -651,20 +708,6 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Sparkle.framework/Headers/SUAppcast.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Sparkle.framework/Headers/SUUpdater.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">NSResponder</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
@@ -720,6 +763,13 @@
<string key="NS.key.0">view</string>
<string key="NS.object.0">NSView</string>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">view</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">view</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSViewController.h</string>
@@ -728,6 +778,7 @@
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1060" key="NS.object.0"/>
@@ -735,5 +786,9 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../Telephone.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <string key="NS.key.0">NSSwitch</string>
+ <string key="NS.object.0">{15, 15}</string>
+ </object>
</data>
</archive>
View
1  PreferencesController.h
@@ -65,6 +65,7 @@ extern NSString * const kSignificantPhoneNumberLength;
extern NSString * const kPauseITunes;
extern NSString * const kAutoCloseCallWindow;
extern NSString * const kAutoCloseMissedCallWindow;
+extern NSString * const kCallWaiting;
//
// Account keys
extern NSString * const kDescription;
View
1  PreferencesController.m
@@ -64,6 +64,7 @@
NSString * const kPauseITunes = @"PauseITunes";
NSString * const kAutoCloseCallWindow = @"AutoCloseCallWindow";
NSString * const kAutoCloseMissedCallWindow = @"AutoCloseMissedCallWindow";
+NSString * const kCallWaiting = @"CallWaiting";
NSString * const kDescription = @"Description";
NSString * const kFullName = @"FullName";
View
126 Russian.lproj/GeneralPreferencesView.xib
@@ -2,15 +2,17 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">10B504</string>
- <string key="IBDocument.InterfaceBuilderVersion">732</string>
- <string key="IBDocument.AppKitVersion">1038.2</string>
- <string key="IBDocument.HIToolboxVersion">437.00</string>
+ <string key="IBDocument.SystemVersion">10H574</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
+ <string key="IBDocument.AppKitVersion">1038.35</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">732</string>
+ <string key="NS.object.0">823</string>
</object>
- <array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>
+ <array class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <integer value="150"/>
+ </array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</array>
@@ -26,31 +28,34 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSUserDefaultsController" id="674396964">
+ <array class="NSMutableArray" key="NSDeclaredKeys">
+ <string>CallWaiting</string>
+ </array>
<bool key="NSSharedInstance">YES</bool>
</object>
<object class="NSCustomView" id="1027809137">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSButton" id="164791442">
+ <object class="NSButton" id="898079462">
<reference key="NSNextResponder" ref="1027809137"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{83, 58}, {258, 18}}</string>
+ <string key="NSFrame">{{83, 18}, {138, 18}}</string>
<reference key="NSSuperview" ref="1027809137"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="223347675">
+ <object class="NSButtonCell" key="NSCell" id="515634905">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Форматировать телефонные номера</string>
+ <string key="NSContents">Ожидание вызова</string>
<object class="NSFont" key="NSSupport" id="1050962167">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
- <reference key="NSControlView" ref="164791442"/>
+ <reference key="NSControlView" ref="898079462"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
- <object class="NSCustomResource" key="NSNormalImage" id="455629760">
+ <object class="NSCustomResource" key="NSNormalImage" id="35303410">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSSwitch</string>
</object>
@@ -63,10 +68,32 @@
<int key="NSPeriodicInterval">25</int>
</object>
</object>
+ <object class="NSButton" id="164791442">
+ <reference key="NSNextResponder" ref="1027809137"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{83, 78}, {258, 18}}</string>
+ <reference key="NSSuperview" ref="1027809137"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="223347675">
+ <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">Форматировать телефонные номера</string>
+ <reference key="NSSupport" ref="1050962167"/>
+ <reference key="NSControlView" ref="164791442"/>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">2</int>
+ <reference key="NSNormalImage" ref="35303410"/>
+ <reference key="NSAlternateImage" ref="632799627"/>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
<object class="NSButton" id="50296576">
<reference key="NSNextResponder" ref="1027809137"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{83, 38}, {296, 18}}</string>
+ <string key="NSFrame">{{83, 58}, {296, 18}}</string>
<reference key="NSSuperview" ref="1027809137"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="114421503">
@@ -77,7 +104,7 @@
<reference key="NSControlView" ref="50296576"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="455629760"/>
+ <reference key="NSNormalImage" ref="35303410"/>
<reference key="NSAlternateImage" ref="632799627"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
@@ -88,7 +115,7 @@
<object class="NSButton" id="1027677132">
<reference key="NSNextResponder" ref="1027809137"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{83, 18}, {273, 18}}</string>
+ <string key="NSFrame">{{83, 38}, {273, 18}}</string>
<reference key="NSSuperview" ref="1027809137"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="91906606">
@@ -99,7 +126,7 @@
<reference key="NSControlView" ref="1027677132"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="455629760"/>
+ <reference key="NSNormalImage" ref="35303410"/>
<reference key="NSAlternateImage" ref="632799627"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
@@ -108,7 +135,8 @@
</object>
</object>
</array>
- <string key="NSFrameSize">{539, 88}</string>
+ <string key="NSFrameSize">{539, 108}</string>
+ <reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
</array>
@@ -170,6 +198,22 @@
</object>
<int key="connectionID">426</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: values.CallWaiting</string>
+ <reference key="source" ref="898079462"/>
+ <reference key="destination" ref="674396964"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="898079462"/>
+ <reference key="NSDestination" ref="674396964"/>
+ <string key="NSLabel">value: values.CallWaiting</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">values.CallWaiting</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">430</int>
+ </object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@@ -209,6 +253,7 @@
<reference ref="1027677132"/>
<reference ref="50296576"/>
<reference ref="164791442"/>
+ <reference ref="898079462"/>
</array>
<reference key="parent" ref="0"/>
<string key="objectName">General</string>
@@ -252,11 +297,24 @@
<reference key="object" ref="91906606"/>
<reference key="parent" ref="1027677132"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">427</int>
+ <reference key="object" ref="898079462"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="515634905"/>
+ </array>
+ <reference key="parent" ref="1027809137"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">428</int>
+ <reference key="object" ref="515634905"/>
+ <reference key="parent" ref="898079462"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="150.IBEditorWindowLastContentRect">{{191, 533}, {539, 88}}</string>
+ <string key="150.IBEditorWindowLastContentRect">{{191, 513}, {539, 108}}</string>
<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array class="NSMutableArray" key="150.IBUserGuides"/>
<string key="201.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -266,12 +324,14 @@
<string key="419.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="422.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="427.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="428.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">426</int>
+ <int key="maxID">430</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -651,20 +711,6 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Sparkle.framework/Headers/SUAppcast.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Sparkle.framework/Headers/SUUpdater.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">NSResponder</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
@@ -720,6 +766,13 @@
<string key="NS.key.0">view</string>
<string key="NS.object.0">NSView</string>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">view</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">view</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSViewController.h</string>
@@ -728,6 +781,7 @@
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1060" key="NS.object.0"/>
@@ -735,5 +789,9 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../Telephone.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <string key="NS.key.0">NSSwitch</string>
+ <string key="NS.object.0">{15, 15}</string>
+ </object>
</data>
</archive>
Please sign in to comment.
Something went wrong with that request. Please try again.