Skip to content

Commit

Permalink
Merged with central repository.
Browse files Browse the repository at this point in the history
  • Loading branch information
@eofster
eofster committed Feb 28, 2010
2 parents 19e4700 + f4d1272 commit 7a57a3b
Show file tree
Hide file tree
Showing 6 changed files with 123 additions and 36 deletions.
101 changes: 80 additions & 21 deletions ActiveAccountTransferView.xib
View file
Expand Up @@ -40,9 +40,45 @@
</object>
<object class="NSCustomView" id="668293740">
<reference key="NSNextResponder"/>
<int key="NSvFlags">266</int>
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTextField" id="983948330">
<reference key="NSNextResponder" ref="668293740"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 78}, {78, 17}}</string>
<reference key="NSSuperview" ref="668293740"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="662386032">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Transfer to:</string>
<object class="NSFont" key="NSSupport" id="791053555">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
<reference key="NSControlView" ref="983948330"/>
<object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="29322367">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlTextColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
</object>
</object>
</object>
</object>
<object class="NSTokenField" id="647165724">
<reference key="NSNextResponder" ref="668293740"/>
<int key="NSvFlags">266</int>
Expand All @@ -59,11 +95,7 @@
<object class="NSTokenFieldCell" key="NSCell" id="499563810">
<int key="NSCellFlags">341966336</int>
<int key="NSCellFlags2">0</int>
<object class="NSFont" key="NSSupport" id="791053555">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
<reference key="NSSupport" ref="791053555"/>
<reference key="NSControlView" ref="647165724"/>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSColor" key="NSBackgroundColor">
Expand All @@ -75,15 +107,7 @@
<bytes key="NSWhite">MQA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlTextColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
</object>
</object>
<reference key="NSTextColor" ref="29322367"/>
<reference key="NSDelegate" ref="647165724"/>
<double key="NSCompletionDelay">0.0</double>
<int key="NSTokenStyle">0</int>
Expand Down Expand Up @@ -119,7 +143,7 @@
<object class="NSButtonCell" key="NSCell" id="812438068">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Dial</string>
<string key="NSContents">Call</string>
<reference key="NSSupport" ref="791053555"/>
<reference key="NSControlView" ref="74877265"/>
<int key="NSButtonFlags">-2038284033</int>
Expand All @@ -131,7 +155,7 @@
</object>
</object>
</object>
<string key="NSFrameSize">{320, 90}</string>
<string key="NSFrameSize">{320, 115}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
Expand Down Expand Up @@ -220,6 +244,7 @@
<reference key="object" ref="668293740"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="983948330"/>
<reference ref="74877265"/>
<reference ref="302113528"/>
<reference ref="647165724"/>
Expand Down Expand Up @@ -269,6 +294,20 @@
<reference key="object" ref="499563810"/>
<reference key="parent" ref="647165724"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">17</int>
<reference key="object" ref="983948330"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="662386032"/>
</object>
<reference key="parent" ref="668293740"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">18</int>
<reference key="object" ref="662386032"/>
<reference key="parent" ref="983948330"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
Expand All @@ -277,6 +316,8 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>1.IBEditorWindowLastContentRect</string>
<string>1.IBPluginDependency</string>
<string>17.IBPluginDependency</string>
<string>18.IBPluginDependency</string>
<string>4.IBPluginDependency</string>
<string>5.IBPluginDependency</string>
<string>6.IBPluginDependency</string>
Expand All @@ -286,7 +327,9 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{{518, 667}, {320, 90}}</string>
<string>{{379, 523}, {320, 115}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
Expand All @@ -312,7 +355,7 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">16</int>
<int key="maxID">18</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
Expand Down Expand Up @@ -444,6 +487,13 @@
<string key="minorKey">AuthenticationFailureController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">CallController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">CallController+Protected.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">CallController</string>
<string key="superclassName">XSWindowController</string>
Expand All @@ -456,8 +506,17 @@
<string key="className">CallTransferController</string>
<string key="superclassName">CallController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">closeSheet:</string>
<string key="NS.object.0">id</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>closeSheet:</string>
<string>showInitialState:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
Expand Down
4 changes: 2 additions & 2 deletions ActiveCallTransferView.xib
View file
Expand Up @@ -154,7 +154,7 @@
</object>
</object>
</object>
<string key="NSFrameSize">{320, 98}</string>
<string key="NSFrameSize">{320, 115}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">AKActiveCallView</string>
</object>
Expand Down Expand Up @@ -449,7 +449,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{340, 758}, {320, 98}}</string>
<string>{{340, 741}, {320, 115}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
Expand Down
2 changes: 0 additions & 2 deletions ActiveCallViewController.m
View file
Expand Up @@ -150,8 +150,6 @@ - (IBAction)showCallTransferSheet:(id)sender {
modalDelegate:nil
didEndSelector:NULL
contextInfo:NULL];

[callTransferController showInitialState:self];
}

- (void)startCallTimer {
Expand Down
37 changes: 28 additions & 9 deletions CallTransfer.xib
View file
Expand Up @@ -41,16 +41,16 @@
<object class="NSWindowTemplate" id="899398855">
<int key="NSWindowStyleMask">7</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{235, 289}, {320, 90}}</string>
<int key="NSWTFlags">611844096</int>
<string key="NSWindowRect">{{235, 289}, {320, 115}}</string>
<int key="NSWTFlags">1685585920</int>
<string key="NSWindowTitle">Call Transfer</string>
<string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<object class="NSView" key="NSWindowView" id="834523497">
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{320, 90}</string>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{320, 115}</string>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
Expand Down Expand Up @@ -108,6 +108,9 @@
<object class="IBObjectRecord">
<int key="objectID">2</int>
<reference key="object" ref="834523497"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="parent" ref="899398855"/>
</object>
</object>
Expand All @@ -128,9 +131,9 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{{231, 920}, {320, 90}}</string>
<string>{{281, 388}, {320, 115}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{231, 920}, {320, 90}}</string>
<string>{{281, 388}, {320, 115}}</string>
<boolean value="NO"/>
<boolean value="NO"/>
<boolean value="NO"/>
Expand All @@ -155,11 +158,18 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">5</int>
<int key="maxID">8</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">CallController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">CallController+Protected.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">CallController</string>
<string key="superclassName">XSWindowController</string>
Expand All @@ -172,8 +182,17 @@
<string key="className">CallTransferController</string>
<string key="superclassName">CallController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">closeSheet:</string>
<string key="NS.object.0">id</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>closeSheet:</string>
<string>showInitialState:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
Expand Down
4 changes: 4 additions & 0 deletions CallTransferController.m
View file
Expand Up @@ -65,6 +65,10 @@ - (void)dealloc {
[super dealloc];
}

- (void)windowDidLoad {
[self showInitialState:self];
}

- (void)transferCall {
[[[self sourceCallController] call] attendedTransferToCall:[self call]];
}
Expand Down
11 changes: 9 additions & 2 deletions EndedCallTransferView.xib
View file
Expand Up @@ -172,7 +172,7 @@
</object>
</object>
</object>
<string key="NSFrameSize">{320, 98}</string>
<string key="NSFrameSize">{320, 115}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
Expand Down Expand Up @@ -370,7 +370,7 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{{335, 519}, {320, 98}}</string>
<string>{{335, 502}, {320, 115}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
Expand Down Expand Up @@ -413,6 +413,13 @@
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">CallController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">CallController+Protected.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">CallController</string>
<string key="superclassName">XSWindowController</string>
Expand Down

0 comments on commit 7a57a3b

Please sign in to comment.