Merge lp:~jose-exposito89/ubuntuone-ios-files/i18n into lp:ubuntuone-ios-files
- i18n
- Merge into trunk
Proposed by
José Expósito
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Natalia Bidart | ||||
Proposed branch: | lp:~jose-exposito89/ubuntuone-ios-files/i18n | ||||
Merge into: | lp:ubuntuone-ios-files | ||||
Diff against target: |
2662 lines (+728/-481) 28 files modified
Dependencies/PullToRefresh/Classes/PullRefreshTableViewController.m (+3/-3) Files.xcodeproj/project.pbxproj (+22/-0) Files/U1FileDetailsViewController.h (+5/-0) Files/U1FileDetailsViewController.m (+18/-1) Files/U1FileDetailsViewController.xib (+48/-145) Files/U1FilePreviewViewController.h (+2/-0) Files/U1FilePreviewViewController.m (+5/-0) Files/U1FilePreviewViewController.xib (+24/-63) Files/U1FolderViewController.m (+3/-3) Files/U1LoginController.m (+1/-1) Files/U1SSOCredentialsViewController.h (+5/-0) Files/U1SSOCredentialsViewController.m (+10/-0) Files/U1SSOCredentialsViewController.xib (+128/-14) Files/U1SSOEmailVerificationViewController.m (+29/-1) Files/U1SSOEmailVerificationViewController.xib (+32/-29) Files/U1SSOLandingPageViewController.h (+3/-0) Files/U1SSOLandingPageViewController.m (+19/-1) Files/U1SSOLandingPageViewController.xib (+44/-10) Files/U1SSOSignUpViewController.m (+48/-0) Files/U1SSOSignUpViewController.xib (+139/-31) Files/U1SettingsViewController.h (+3/-0) Files/U1SettingsViewController.m (+23/-5) Files/U1SettingsViewController.xib (+44/-150) Files/U1UploadsPoolViewController.h (+2/-0) Files/U1UploadsPoolViewController.m (+9/-0) Files/U1UploadsPoolViewController.xib (+34/-13) Files/en.lproj/Localizable.strings (+14/-0) Files/iPhone/en.lproj/MainWindow_iPhone.xib (+11/-11) |
||||
To merge this branch: | bzr merge lp:~jose-exposito89/ubuntuone-ios-files/i18n | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zachery Bir | Approve | ||
Review via email:
|
Commit message
Description of the change
Added full support for translations and Spanish translation
To post a comment you must log in.
- 63. By José Expósito
-
Added mising translations in U1FilePreviewVi
ewController and U1UploadsPoolVi ewController
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Natalia Bidart (nataliabidart) wrote : | # |
Setting MP as Rejected to reduce numbers of landing candidates in @reviewlist.
Change status again if this MP is still current.
Unmerged revisions
- 63. By José Expósito
-
Added mising translations in U1FilePreviewVi
ewController and U1UploadsPoolVi ewController - 62. By José Expósito
-
Added missing files
- 61. By José Expósito
-
Added full support for translations and added spanish translation
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Dependencies/PullToRefresh/Classes/PullRefreshTableViewController.m' | |||
2 | --- Dependencies/PullToRefresh/Classes/PullRefreshTableViewController.m 2011-08-31 14:56:30 +0000 | |||
3 | +++ Dependencies/PullToRefresh/Classes/PullRefreshTableViewController.m 2012-08-27 11:27:21 +0000 | |||
4 | @@ -67,9 +67,9 @@ | |||
5 | 67 | } | 67 | } |
6 | 68 | 68 | ||
7 | 69 | - (void)setupStrings{ | 69 | - (void)setupStrings{ |
11 | 70 | textPull = [[NSString alloc] initWithString:@"Pull down to refresh..."]; | 70 | textPull = [[NSString alloc] initWithString:NSLocalizedString(@"Pull down to refresh...", nil)]; |
12 | 71 | textRelease = [[NSString alloc] initWithString:@"Release to refresh..."]; | 71 | textRelease = [[NSString alloc] initWithString:NSLocalizedString(@"Release to refresh...", nil)]; |
13 | 72 | textLoading = [[NSString alloc] initWithString:@"Loading..."]; | 72 | textLoading = [[NSString alloc] initWithString:NSLocalizedString(@"Loading...", nil)]; |
14 | 73 | } | 73 | } |
15 | 74 | 74 | ||
16 | 75 | - (void)addPullToRefreshHeader { | 75 | - (void)addPullToRefreshHeader { |
17 | 76 | 76 | ||
18 | === modified file 'Files.xcodeproj/project.pbxproj' | |||
19 | --- Files.xcodeproj/project.pbxproj 2012-08-10 03:19:46 +0000 | |||
20 | +++ Files.xcodeproj/project.pbxproj 2012-08-27 11:27:21 +0000 | |||
21 | @@ -7,6 +7,7 @@ | |||
22 | 7 | objects = { | 7 | objects = { |
23 | 8 | 8 | ||
24 | 9 | /* Begin PBXBuildFile section */ | 9 | /* Begin PBXBuildFile section */ |
25 | 10 | 8291508C15EA62A700052570 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8291508E15EA62A700052570 /* Localizable.strings */; }; | ||
26 | 10 | 910393E81475B118004DE69D /* U1AutoUploadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 910393E71475B118004DE69D /* U1AutoUploadOperation.m */; }; | 11 | 910393E81475B118004DE69D /* U1AutoUploadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 910393E71475B118004DE69D /* U1AutoUploadOperation.m */; }; |
27 | 11 | 913A54AF1451EFE70081FD67 /* progress_view_background.png in Resources */ = {isa = PBXBuildFile; fileRef = 913A54AD1451EFE70081FD67 /* progress_view_background.png */; }; | 12 | 913A54AF1451EFE70081FD67 /* progress_view_background.png in Resources */ = {isa = PBXBuildFile; fileRef = 913A54AD1451EFE70081FD67 /* progress_view_background.png */; }; |
28 | 12 | 913A54B01451EFE70081FD67 /* progress_view_background@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 913A54AE1451EFE70081FD67 /* progress_view_background@2x.png */; }; | 13 | 913A54B01451EFE70081FD67 /* progress_view_background@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 913A54AE1451EFE70081FD67 /* progress_view_background@2x.png */; }; |
29 | @@ -232,6 +233,8 @@ | |||
30 | 232 | /* End PBXContainerItemProxy section */ | 233 | /* End PBXContainerItemProxy section */ |
31 | 233 | 234 | ||
32 | 234 | /* Begin PBXFileReference section */ | 235 | /* Begin PBXFileReference section */ |
33 | 236 | 821195B515EA64E200C6F3BC /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; }; | ||
34 | 237 | 8291508D15EA62A700052570 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; }; | ||
35 | 235 | 910393E61475B118004DE69D /* U1AutoUploadOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1AutoUploadOperation.h; sourceTree = "<group>"; }; | 238 | 910393E61475B118004DE69D /* U1AutoUploadOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1AutoUploadOperation.h; sourceTree = "<group>"; }; |
36 | 236 | 910393E71475B118004DE69D /* U1AutoUploadOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1AutoUploadOperation.m; sourceTree = "<group>"; }; | 239 | 910393E71475B118004DE69D /* U1AutoUploadOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1AutoUploadOperation.m; sourceTree = "<group>"; }; |
37 | 237 | 913A54AD1451EFE70081FD67 /* progress_view_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = progress_view_background.png; path = Assets/progress_view_background.png; sourceTree = "<group>"; }; | 240 | 913A54AD1451EFE70081FD67 /* progress_view_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = progress_view_background.png; path = Assets/progress_view_background.png; sourceTree = "<group>"; }; |
38 | @@ -591,6 +594,14 @@ | |||
39 | 591 | /* End PBXFrameworksBuildPhase section */ | 594 | /* End PBXFrameworksBuildPhase section */ |
40 | 592 | 595 | ||
41 | 593 | /* Begin PBXGroup section */ | 596 | /* Begin PBXGroup section */ |
42 | 597 | 8291508815EA628000052570 /* Translations */ = { | ||
43 | 598 | isa = PBXGroup; | ||
44 | 599 | children = ( | ||
45 | 600 | 8291508E15EA62A700052570 /* Localizable.strings */, | ||
46 | 601 | ); | ||
47 | 602 | name = Translations; | ||
48 | 603 | sourceTree = "<group>"; | ||
49 | 604 | }; | ||
50 | 594 | 960D45F91409E09F00B73177 /* PullToRefresh */ = { | 605 | 960D45F91409E09F00B73177 /* PullToRefresh */ = { |
51 | 595 | isa = PBXGroup; | 606 | isa = PBXGroup; |
52 | 596 | children = ( | 607 | children = ( |
53 | @@ -859,6 +870,7 @@ | |||
54 | 859 | 96E860BB13F7251D0026783D /* Files */ = { | 870 | 96E860BB13F7251D0026783D /* Files */ = { |
55 | 860 | isa = PBXGroup; | 871 | isa = PBXGroup; |
56 | 861 | children = ( | 872 | children = ( |
57 | 873 | 8291508815EA628000052570 /* Translations */, | ||
58 | 862 | 96783E6513F8ABC70092C6A1 /* Assets */, | 874 | 96783E6513F8ABC70092C6A1 /* Assets */, |
59 | 863 | 96E860BC13F7251D0026783D /* Supporting Files */, | 875 | 96E860BC13F7251D0026783D /* Supporting Files */, |
60 | 864 | 96733AEC140DFABB0074D545 /* SSO */, | 876 | 96733AEC140DFABB0074D545 /* SSO */, |
61 | @@ -1253,6 +1265,7 @@ | |||
62 | 1253 | 96C2C17D14C633A7006E1D57 /* U1SSOSignUpViewController.xib in Resources */, | 1265 | 96C2C17D14C633A7006E1D57 /* U1SSOSignUpViewController.xib in Resources */, |
63 | 1254 | 9656A78914C692450033A4D7 /* U1SSOEmailVerificationViewController.xib in Resources */, | 1266 | 9656A78914C692450033A4D7 /* U1SSOEmailVerificationViewController.xib in Resources */, |
64 | 1255 | 96DF409514D7A86A00896B6E /* SVProgressHUD.bundle in Resources */, | 1267 | 96DF409514D7A86A00896B6E /* SVProgressHUD.bundle in Resources */, |
65 | 1268 | 8291508C15EA62A700052570 /* Localizable.strings in Resources */, | ||
66 | 1256 | ); | 1269 | ); |
67 | 1257 | runOnlyForDeploymentPostprocessing = 0; | 1270 | runOnlyForDeploymentPostprocessing = 0; |
68 | 1258 | }; | 1271 | }; |
69 | @@ -1413,6 +1426,15 @@ | |||
70 | 1413 | /* End PBXTargetDependency section */ | 1426 | /* End PBXTargetDependency section */ |
71 | 1414 | 1427 | ||
72 | 1415 | /* Begin PBXVariantGroup section */ | 1428 | /* Begin PBXVariantGroup section */ |
73 | 1429 | 8291508E15EA62A700052570 /* Localizable.strings */ = { | ||
74 | 1430 | isa = PBXVariantGroup; | ||
75 | 1431 | children = ( | ||
76 | 1432 | 8291508D15EA62A700052570 /* en */, | ||
77 | 1433 | 821195B515EA64E200C6F3BC /* es */, | ||
78 | 1434 | ); | ||
79 | 1435 | name = Localizable.strings; | ||
80 | 1436 | sourceTree = "<group>"; | ||
81 | 1437 | }; | ||
82 | 1416 | 96E860BE13F7251D0026783D /* InfoPlist.strings */ = { | 1438 | 96E860BE13F7251D0026783D /* InfoPlist.strings */ = { |
83 | 1417 | isa = PBXVariantGroup; | 1439 | isa = PBXVariantGroup; |
84 | 1418 | children = ( | 1440 | children = ( |
85 | 1419 | 1441 | ||
86 | === modified file 'Files/U1FileDetailsViewController.h' | |||
87 | --- Files/U1FileDetailsViewController.h 2011-12-08 19:23:49 +0000 | |||
88 | +++ Files/U1FileDetailsViewController.h 2012-08-27 11:27:21 +0000 | |||
89 | @@ -42,4 +42,9 @@ | |||
90 | 42 | 42 | ||
91 | 43 | - (id)initWithNode:(U1FileNode*)node; | 43 | - (id)initWithNode:(U1FileNode*)node; |
92 | 44 | 44 | ||
93 | 45 | @property (retain, nonatomic) IBOutlet UILabel *sizeLabelDescription; | ||
94 | 46 | @property (retain, nonatomic) IBOutlet UILabel *modifiedLabelDescription; | ||
95 | 47 | @property (retain, nonatomic) IBOutlet UILabel *viewCellLabel; | ||
96 | 48 | @property (retain, nonatomic) IBOutlet UILabel *publishCellLabel; | ||
97 | 49 | |||
98 | 45 | @end | 50 | @end |
99 | 46 | 51 | ||
100 | === modified file 'Files/U1FileDetailsViewController.m' | |||
101 | --- Files/U1FileDetailsViewController.m 2012-04-27 02:27:26 +0000 | |||
102 | +++ Files/U1FileDetailsViewController.m 2012-08-27 11:27:21 +0000 | |||
103 | @@ -52,6 +52,10 @@ | |||
104 | 52 | 52 | ||
105 | 53 | 53 | ||
106 | 54 | @implementation U1FileDetailsViewController | 54 | @implementation U1FileDetailsViewController |
107 | 55 | @synthesize sizeLabelDescription; | ||
108 | 56 | @synthesize modifiedLabelDescription; | ||
109 | 57 | @synthesize viewCellLabel; | ||
110 | 58 | @synthesize publishCellLabel; | ||
111 | 55 | 59 | ||
112 | 56 | @synthesize loadingContainerView, fileAncillaryDetailsView, iconImageView, nameLabel, loadingActivityView, sizeLabel, createdLabel, modifiedLabel, toolbar, publicURLLabel, renameTextField, sectionOneCells, sectionTwoCells, actionsTableView, publishSwitch, publishStatusLabel; | 60 | @synthesize loadingContainerView, fileAncillaryDetailsView, iconImageView, nameLabel, loadingActivityView, sizeLabel, createdLabel, modifiedLabel, toolbar, publicURLLabel, renameTextField, sectionOneCells, sectionTwoCells, actionsTableView, publishSwitch, publishStatusLabel; |
113 | 57 | @synthesize node, docController, filesClient, contentURL, fileInfo; | 61 | @synthesize node, docController, filesClient, contentURL, fileInfo; |
114 | @@ -127,6 +131,10 @@ | |||
115 | 127 | [actionsTableView release]; | 131 | [actionsTableView release]; |
116 | 128 | [publishSwitch release]; | 132 | [publishSwitch release]; |
117 | 129 | [publishStatusLabel release]; | 133 | [publishStatusLabel release]; |
118 | 134 | [sizeLabelDescription release]; | ||
119 | 135 | [modifiedLabelDescription release]; | ||
120 | 136 | [viewCellLabel release]; | ||
121 | 137 | [publishCellLabel release]; | ||
122 | 130 | [super dealloc]; | 138 | [super dealloc]; |
123 | 131 | } | 139 | } |
124 | 132 | 140 | ||
125 | @@ -144,6 +152,11 @@ | |||
126 | 144 | { | 152 | { |
127 | 145 | [super viewDidLoad]; | 153 | [super viewDidLoad]; |
128 | 146 | 154 | ||
129 | 155 | self.sizeLabelDescription.text = NSLocalizedString(@"Size:", nil); | ||
130 | 156 | self.modifiedLabelDescription.text = NSLocalizedString(@"Modified:", nil); | ||
131 | 157 | self.viewCellLabel.text = NSLocalizedString(@"View", nil); | ||
132 | 158 | self.publishCellLabel.text = NSLocalizedString(@"Published", nil); | ||
133 | 159 | |||
134 | 147 | [self.nameLabel setText:self.title]; | 160 | [self.nameLabel setText:self.title]; |
135 | 148 | NSString *sizeString = [sizeTransformer() transformedValue:[self.node size]]; | 161 | NSString *sizeString = [sizeTransformer() transformedValue:[self.node size]]; |
136 | 149 | [self.sizeLabel setText:sizeString]; | 162 | [self.sizeLabel setText:sizeString]; |
137 | @@ -188,6 +201,10 @@ | |||
138 | 188 | [actionsTableView release], actionsTableView = nil; | 201 | [actionsTableView release], actionsTableView = nil; |
139 | 189 | [publishSwitch release], publishSwitch = nil; | 202 | [publishSwitch release], publishSwitch = nil; |
140 | 190 | [publishStatusLabel release], publishStatusLabel = nil; | 203 | [publishStatusLabel release], publishStatusLabel = nil; |
141 | 204 | [self setSizeLabelDescription:nil]; | ||
142 | 205 | [self setModifiedLabelDescription:nil]; | ||
143 | 206 | [self setViewCellLabel:nil]; | ||
144 | 207 | [self setPublishCellLabel:nil]; | ||
145 | 191 | [super viewDidUnload]; | 208 | [super viewDidUnload]; |
146 | 192 | } | 209 | } |
147 | 193 | 210 | ||
148 | @@ -262,7 +279,7 @@ | |||
149 | 262 | 279 | ||
150 | 263 | - (IBAction)deleteItem:(UIBarButtonItem*)sender; | 280 | - (IBAction)deleteItem:(UIBarButtonItem*)sender; |
151 | 264 | { | 281 | { |
153 | 265 | UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Are you sure you want to delete this file?\nIt will be deleted everywhere in the Ubuntu One service.", @"") | 282 | UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Are you sure you want to delete this file?\nIt will be deleted everywhere in the Ubuntu One service", @"") |
154 | 266 | delegate:self | 283 | delegate:self |
155 | 267 | cancelButtonTitle:NSLocalizedString(@"Cancel", @"") | 284 | cancelButtonTitle:NSLocalizedString(@"Cancel", @"") |
156 | 268 | destructiveButtonTitle:NSLocalizedString(@"Delete", @"") | 285 | destructiveButtonTitle:NSLocalizedString(@"Delete", @"") |
157 | 269 | 286 | ||
158 | === modified file 'Files/U1FileDetailsViewController.xib' | |||
159 | --- Files/U1FileDetailsViewController.xib 2012-04-27 02:27:26 +0000 | |||
160 | +++ Files/U1FileDetailsViewController.xib 2012-08-27 11:27:21 +0000 | |||
161 | @@ -2,24 +2,24 @@ | |||
162 | 2 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> | 2 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> |
163 | 3 | <data> | 3 | <data> |
164 | 4 | <int key="IBDocument.SystemTarget">1296</int> | 4 | <int key="IBDocument.SystemTarget">1296</int> |
169 | 5 | <string key="IBDocument.SystemVersion">11D50</string> | 5 | <string key="IBDocument.SystemVersion">12B19</string> |
170 | 6 | <string key="IBDocument.InterfaceBuilderVersion">2182</string> | 6 | <string key="IBDocument.InterfaceBuilderVersion">2549</string> |
171 | 7 | <string key="IBDocument.AppKitVersion">1138.32</string> | 7 | <string key="IBDocument.AppKitVersion">1187</string> |
172 | 8 | <string key="IBDocument.HIToolboxVersion">568.00</string> | 8 | <string key="IBDocument.HIToolboxVersion">624.00</string> |
173 | 9 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> | 9 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> |
174 | 10 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | 10 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
176 | 11 | <string key="NS.object.0">1181</string> | 11 | <string key="NS.object.0">1498</string> |
177 | 12 | </object> | 12 | </object> |
178 | 13 | <array key="IBDocument.IntegratedClassDependencies"> | 13 | <array key="IBDocument.IntegratedClassDependencies"> |
179 | 14 | <string>IBProxyObject</string> | 14 | <string>IBProxyObject</string> |
180 | 15 | <string>IBUIBarButtonItem</string> | ||
181 | 15 | <string>IBUIImageView</string> | 16 | <string>IBUIImageView</string> |
182 | 16 | <string>IBUILabel</string> | 17 | <string>IBUILabel</string> |
183 | 17 | <string>IBUIToolbar</string> | ||
184 | 18 | <string>IBUISwitch</string> | 18 | <string>IBUISwitch</string> |
185 | 19 | <string>IBUITextField</string> | ||
186 | 20 | <string>IBUIBarButtonItem</string> | ||
187 | 21 | <string>IBUITableView</string> | 19 | <string>IBUITableView</string> |
188 | 22 | <string>IBUITableViewCell</string> | 20 | <string>IBUITableViewCell</string> |
189 | 21 | <string>IBUITextField</string> | ||
190 | 22 | <string>IBUIToolbar</string> | ||
191 | 23 | <string>IBUIView</string> | 23 | <string>IBUIView</string> |
192 | 24 | </array> | 24 | </array> |
193 | 25 | <array key="IBDocument.PluginDependencies"> | 25 | <array key="IBDocument.PluginDependencies"> |
194 | @@ -47,7 +47,6 @@ | |||
195 | 47 | <int key="NSvFlags">-2147483356</int> | 47 | <int key="NSvFlags">-2147483356</int> |
196 | 48 | <string key="NSFrameSize">{320, 416}</string> | 48 | <string key="NSFrameSize">{320, 416}</string> |
197 | 49 | <reference key="NSSuperview" ref="191373211"/> | 49 | <reference key="NSSuperview" ref="191373211"/> |
198 | 50 | <reference key="NSWindow"/> | ||
199 | 51 | <reference key="NSNextKeyView" ref="959604046"/> | 50 | <reference key="NSNextKeyView" ref="959604046"/> |
200 | 52 | <object class="NSColor" key="IBUIBackgroundColor"> | 51 | <object class="NSColor" key="IBUIBackgroundColor"> |
201 | 53 | <int key="NSColorSpace">3</int> | 52 | <int key="NSColorSpace">3</int> |
202 | @@ -75,7 +74,6 @@ | |||
203 | 75 | <int key="NSvFlags">292</int> | 74 | <int key="NSvFlags">292</int> |
204 | 76 | <string key="NSFrame">{{20, 20}, {64, 64}}</string> | 75 | <string key="NSFrame">{{20, 20}, {64, 64}}</string> |
205 | 77 | <reference key="NSSuperview" ref="346642923"/> | 76 | <reference key="NSSuperview" ref="346642923"/> |
206 | 78 | <reference key="NSWindow"/> | ||
207 | 79 | <reference key="NSNextKeyView" ref="675538218"/> | 77 | <reference key="NSNextKeyView" ref="675538218"/> |
208 | 80 | <int key="IBUIContentMode">1</int> | 78 | <int key="IBUIContentMode">1</int> |
209 | 81 | <bool key="IBUIUserInteractionEnabled">NO</bool> | 79 | <bool key="IBUIUserInteractionEnabled">NO</bool> |
210 | @@ -86,7 +84,6 @@ | |||
211 | 86 | <int key="NSvFlags">292</int> | 84 | <int key="NSvFlags">292</int> |
212 | 87 | <string key="NSFrame">{{105, 20}, {195, 48}}</string> | 85 | <string key="NSFrame">{{105, 20}, {195, 48}}</string> |
213 | 88 | <reference key="NSSuperview" ref="346642923"/> | 86 | <reference key="NSSuperview" ref="346642923"/> |
214 | 89 | <reference key="NSWindow"/> | ||
215 | 90 | <reference key="NSNextKeyView" ref="1038751454"/> | 87 | <reference key="NSNextKeyView" ref="1038751454"/> |
216 | 91 | <bool key="IBUIOpaque">NO</bool> | 88 | <bool key="IBUIOpaque">NO</bool> |
217 | 92 | <bool key="IBUIClipsSubviews">YES</bool> | 89 | <bool key="IBUIClipsSubviews">YES</bool> |
218 | @@ -119,7 +116,6 @@ | |||
219 | 119 | <int key="NSvFlags">-2147483356</int> | 116 | <int key="NSvFlags">-2147483356</int> |
220 | 120 | <string key="NSFrame">{{105, 20}, {195, 31}}</string> | 117 | <string key="NSFrame">{{105, 20}, {195, 31}}</string> |
221 | 121 | <reference key="NSSuperview" ref="346642923"/> | 118 | <reference key="NSSuperview" ref="346642923"/> |
222 | 122 | <reference key="NSWindow"/> | ||
223 | 123 | <reference key="NSNextKeyView" ref="12890828"/> | 119 | <reference key="NSNextKeyView" ref="12890828"/> |
224 | 124 | <bool key="IBUIOpaque">NO</bool> | 120 | <bool key="IBUIOpaque">NO</bool> |
225 | 125 | <bool key="IBUIClipsSubviews">YES</bool> | 121 | <bool key="IBUIClipsSubviews">YES</bool> |
226 | @@ -146,9 +142,8 @@ | |||
227 | 146 | <object class="IBUILabel" id="723802363"> | 142 | <object class="IBUILabel" id="723802363"> |
228 | 147 | <reference key="NSNextResponder" ref="12890828"/> | 143 | <reference key="NSNextResponder" ref="12890828"/> |
229 | 148 | <int key="NSvFlags">292</int> | 144 | <int key="NSvFlags">292</int> |
231 | 149 | <string key="NSFrame">{{40, 0}, {155, 20}}</string> | 145 | <string key="NSFrame">{{83, 0}, {112, 20}}</string> |
232 | 150 | <reference key="NSSuperview" ref="12890828"/> | 146 | <reference key="NSSuperview" ref="12890828"/> |
233 | 151 | <reference key="NSWindow"/> | ||
234 | 152 | <reference key="NSNextKeyView" ref="215006113"/> | 147 | <reference key="NSNextKeyView" ref="215006113"/> |
235 | 153 | <bool key="IBUIOpaque">NO</bool> | 148 | <bool key="IBUIOpaque">NO</bool> |
236 | 154 | <bool key="IBUIClipsSubviews">YES</bool> | 149 | <bool key="IBUIClipsSubviews">YES</bool> |
237 | @@ -175,9 +170,8 @@ | |||
238 | 175 | <object class="IBUILabel" id="568016573"> | 170 | <object class="IBUILabel" id="568016573"> |
239 | 176 | <reference key="NSNextResponder" ref="12890828"/> | 171 | <reference key="NSNextResponder" ref="12890828"/> |
240 | 177 | <int key="NSvFlags">292</int> | 172 | <int key="NSvFlags">292</int> |
242 | 178 | <string key="NSFrame">{{0, 1}, {32, 18}}</string> | 173 | <string key="NSFrame">{{0, 1}, {75, 18}}</string> |
243 | 179 | <reference key="NSSuperview" ref="12890828"/> | 174 | <reference key="NSSuperview" ref="12890828"/> |
244 | 180 | <reference key="NSWindow"/> | ||
245 | 181 | <reference key="NSNextKeyView" ref="723802363"/> | 175 | <reference key="NSNextKeyView" ref="723802363"/> |
246 | 182 | <bool key="IBUIOpaque">NO</bool> | 176 | <bool key="IBUIOpaque">NO</bool> |
247 | 183 | <bool key="IBUIClipsSubviews">YES</bool> | 177 | <bool key="IBUIClipsSubviews">YES</bool> |
248 | @@ -204,9 +198,8 @@ | |||
249 | 204 | <object class="IBUILabel" id="215006113"> | 198 | <object class="IBUILabel" id="215006113"> |
250 | 205 | <reference key="NSNextResponder" ref="12890828"/> | 199 | <reference key="NSNextResponder" ref="12890828"/> |
251 | 206 | <int key="NSvFlags">292</int> | 200 | <int key="NSvFlags">292</int> |
253 | 207 | <string key="NSFrame">{{0, 21}, {63, 18}}</string> | 201 | <string key="NSFrame">{{0, 21}, {75, 18}}</string> |
254 | 208 | <reference key="NSSuperview" ref="12890828"/> | 202 | <reference key="NSSuperview" ref="12890828"/> |
255 | 209 | <reference key="NSWindow"/> | ||
256 | 210 | <reference key="NSNextKeyView" ref="759648964"/> | 203 | <reference key="NSNextKeyView" ref="759648964"/> |
257 | 211 | <bool key="IBUIOpaque">NO</bool> | 204 | <bool key="IBUIOpaque">NO</bool> |
258 | 212 | <bool key="IBUIClipsSubviews">YES</bool> | 205 | <bool key="IBUIClipsSubviews">YES</bool> |
259 | @@ -224,9 +217,8 @@ | |||
260 | 224 | <object class="IBUILabel" id="759648964"> | 217 | <object class="IBUILabel" id="759648964"> |
261 | 225 | <reference key="NSNextResponder" ref="12890828"/> | 218 | <reference key="NSNextResponder" ref="12890828"/> |
262 | 226 | <int key="NSvFlags">292</int> | 219 | <int key="NSvFlags">292</int> |
264 | 227 | <string key="NSFrame">{{71, 21}, {124, 19}}</string> | 220 | <string key="NSFrame">{{83, 21}, {112, 19}}</string> |
265 | 228 | <reference key="NSSuperview" ref="12890828"/> | 221 | <reference key="NSSuperview" ref="12890828"/> |
266 | 229 | <reference key="NSWindow"/> | ||
267 | 230 | <reference key="NSNextKeyView" ref="591885325"/> | 222 | <reference key="NSNextKeyView" ref="591885325"/> |
268 | 231 | <bool key="IBUIOpaque">NO</bool> | 223 | <bool key="IBUIOpaque">NO</bool> |
269 | 232 | <bool key="IBUIClipsSubviews">YES</bool> | 224 | <bool key="IBUIClipsSubviews">YES</bool> |
270 | @@ -244,7 +236,6 @@ | |||
271 | 244 | </array> | 236 | </array> |
272 | 245 | <string key="NSFrame">{{105, 76}, {195, 59}}</string> | 237 | <string key="NSFrame">{{105, 76}, {195, 59}}</string> |
273 | 246 | <reference key="NSSuperview" ref="346642923"/> | 238 | <reference key="NSSuperview" ref="346642923"/> |
274 | 247 | <reference key="NSWindow"/> | ||
275 | 248 | <reference key="NSNextKeyView" ref="568016573"/> | 239 | <reference key="NSNextKeyView" ref="568016573"/> |
276 | 249 | <object class="NSColor" key="IBUIBackgroundColor" id="436719790"> | 240 | <object class="NSColor" key="IBUIBackgroundColor" id="436719790"> |
277 | 250 | <int key="NSColorSpace">3</int> | 241 | <int key="NSColorSpace">3</int> |
278 | @@ -256,7 +247,6 @@ | |||
279 | 256 | </array> | 247 | </array> |
280 | 257 | <string key="NSFrameSize">{320, 104}</string> | 248 | <string key="NSFrameSize">{320, 104}</string> |
281 | 258 | <reference key="NSSuperview" ref="149170707"/> | 249 | <reference key="NSSuperview" ref="149170707"/> |
282 | 259 | <reference key="NSWindow"/> | ||
283 | 260 | <reference key="NSNextKeyView" ref="749932571"/> | 250 | <reference key="NSNextKeyView" ref="749932571"/> |
284 | 261 | <reference key="IBUIBackgroundColor" ref="436719790"/> | 251 | <reference key="IBUIBackgroundColor" ref="436719790"/> |
285 | 262 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 252 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
286 | @@ -264,7 +254,6 @@ | |||
287 | 264 | </array> | 254 | </array> |
288 | 265 | <string key="NSFrameSize">{320, 372}</string> | 255 | <string key="NSFrameSize">{320, 372}</string> |
289 | 266 | <reference key="NSSuperview" ref="959604046"/> | 256 | <reference key="NSSuperview" ref="959604046"/> |
290 | 267 | <reference key="NSWindow"/> | ||
291 | 268 | <reference key="NSNextKeyView" ref="346642923"/> | 257 | <reference key="NSNextKeyView" ref="346642923"/> |
292 | 269 | <object class="NSColor" key="IBUIBackgroundColor"> | 258 | <object class="NSColor" key="IBUIBackgroundColor"> |
293 | 270 | <int key="NSColorSpace">10</int> | 259 | <int key="NSColorSpace">10</int> |
294 | @@ -340,7 +329,6 @@ | |||
295 | 340 | </array> | 329 | </array> |
296 | 341 | <string key="NSFrameSize">{320, 372}</string> | 330 | <string key="NSFrameSize">{320, 372}</string> |
297 | 342 | <reference key="NSSuperview" ref="191373211"/> | 331 | <reference key="NSSuperview" ref="191373211"/> |
298 | 343 | <reference key="NSWindow"/> | ||
299 | 344 | <reference key="NSNextKeyView" ref="149170707"/> | 332 | <reference key="NSNextKeyView" ref="149170707"/> |
300 | 345 | <object class="NSColor" key="IBUIBackgroundColor"> | 333 | <object class="NSColor" key="IBUIBackgroundColor"> |
301 | 346 | <int key="NSColorSpace">3</int> | 334 | <int key="NSColorSpace">3</int> |
302 | @@ -354,7 +342,6 @@ | |||
303 | 354 | <int key="NSvFlags">266</int> | 342 | <int key="NSvFlags">266</int> |
304 | 355 | <string key="NSFrame">{{0, 372}, {320, 44}}</string> | 343 | <string key="NSFrame">{{0, 372}, {320, 44}}</string> |
305 | 356 | <reference key="NSSuperview" ref="191373211"/> | 344 | <reference key="NSSuperview" ref="191373211"/> |
306 | 357 | <reference key="NSWindow"/> | ||
307 | 358 | <bool key="IBUIOpaque">NO</bool> | 345 | <bool key="IBUIOpaque">NO</bool> |
308 | 359 | <bool key="IBUIClearsContextBeforeDrawing">NO</bool> | 346 | <bool key="IBUIClearsContextBeforeDrawing">NO</bool> |
309 | 360 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 347 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
310 | @@ -385,7 +372,6 @@ | |||
311 | 385 | </array> | 372 | </array> |
312 | 386 | <string key="NSFrame">{{0, 64}, {320, 416}}</string> | 373 | <string key="NSFrame">{{0, 64}, {320, 416}}</string> |
313 | 387 | <reference key="NSSuperview"/> | 374 | <reference key="NSSuperview"/> |
314 | 388 | <reference key="NSWindow"/> | ||
315 | 389 | <reference key="NSNextKeyView" ref="822782837"/> | 375 | <reference key="NSNextKeyView" ref="822782837"/> |
316 | 390 | <object class="NSColor" key="IBUIBackgroundColor"> | 376 | <object class="NSColor" key="IBUIBackgroundColor"> |
317 | 391 | <int key="NSColorSpace">3</int> | 377 | <int key="NSColorSpace">3</int> |
318 | @@ -411,7 +397,6 @@ | |||
319 | 411 | <int key="NSvFlags">256</int> | 397 | <int key="NSvFlags">256</int> |
320 | 412 | <string key="NSFrame">{{10, 0}, {280, 43}}</string> | 398 | <string key="NSFrame">{{10, 0}, {280, 43}}</string> |
321 | 413 | <reference key="NSSuperview" ref="277406904"/> | 399 | <reference key="NSSuperview" ref="277406904"/> |
322 | 414 | <reference key="NSWindow"/> | ||
323 | 415 | <bool key="IBUIOpaque">NO</bool> | 400 | <bool key="IBUIOpaque">NO</bool> |
324 | 416 | <bool key="IBUIClipsSubviews">YES</bool> | 401 | <bool key="IBUIClipsSubviews">YES</bool> |
325 | 417 | <int key="IBUIContentMode">4</int> | 402 | <int key="IBUIContentMode">4</int> |
326 | @@ -440,7 +425,6 @@ | |||
327 | 440 | </array> | 425 | </array> |
328 | 441 | <string key="NSFrameSize">{300, 43}</string> | 426 | <string key="NSFrameSize">{300, 43}</string> |
329 | 442 | <reference key="NSSuperview" ref="215257660"/> | 427 | <reference key="NSSuperview" ref="215257660"/> |
330 | 443 | <reference key="NSWindow"/> | ||
331 | 444 | <reference key="NSNextKeyView" ref="1062861027"/> | 428 | <reference key="NSNextKeyView" ref="1062861027"/> |
332 | 445 | <reference key="IBUIBackgroundColor" ref="436719790"/> | 429 | <reference key="IBUIBackgroundColor" ref="436719790"/> |
333 | 446 | <bool key="IBUIOpaque">NO</bool> | 430 | <bool key="IBUIOpaque">NO</bool> |
334 | @@ -452,7 +436,6 @@ | |||
335 | 452 | </array> | 436 | </array> |
336 | 453 | <string key="NSFrameSize">{320, 44}</string> | 437 | <string key="NSFrameSize">{320, 44}</string> |
337 | 454 | <reference key="NSSuperview"/> | 438 | <reference key="NSSuperview"/> |
338 | 455 | <reference key="NSWindow"/> | ||
339 | 456 | <reference key="NSNextKeyView" ref="277406904"/> | 439 | <reference key="NSNextKeyView" ref="277406904"/> |
340 | 457 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 440 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
341 | 458 | <int key="IBUISelectionStyle">2</int> | 441 | <int key="IBUISelectionStyle">2</int> |
342 | @@ -474,7 +457,6 @@ | |||
343 | 474 | <int key="NSvFlags">256</int> | 457 | <int key="NSvFlags">256</int> |
344 | 475 | <string key="NSFrame">{{10, 0}, {280, 43}}</string> | 458 | <string key="NSFrame">{{10, 0}, {280, 43}}</string> |
345 | 476 | <reference key="NSSuperview" ref="488107434"/> | 459 | <reference key="NSSuperview" ref="488107434"/> |
346 | 477 | <reference key="NSWindow"/> | ||
347 | 478 | <reference key="NSNextKeyView" ref="118953615"/> | 460 | <reference key="NSNextKeyView" ref="118953615"/> |
348 | 479 | <bool key="IBUIOpaque">NO</bool> | 461 | <bool key="IBUIOpaque">NO</bool> |
349 | 480 | <bool key="IBUIClipsSubviews">YES</bool> | 462 | <bool key="IBUIClipsSubviews">YES</bool> |
350 | @@ -493,7 +475,6 @@ | |||
351 | 493 | <int key="NSvFlags">289</int> | 475 | <int key="NSvFlags">289</int> |
352 | 494 | <string key="NSFrame">{{206, 8}, {94, 27}}</string> | 476 | <string key="NSFrame">{{206, 8}, {94, 27}}</string> |
353 | 495 | <reference key="NSSuperview" ref="488107434"/> | 477 | <reference key="NSSuperview" ref="488107434"/> |
354 | 496 | <reference key="NSWindow"/> | ||
355 | 497 | <reference key="IBUIBackgroundColor" ref="436719790"/> | 478 | <reference key="IBUIBackgroundColor" ref="436719790"/> |
356 | 498 | <bool key="IBUIOpaque">NO</bool> | 479 | <bool key="IBUIOpaque">NO</bool> |
357 | 499 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 480 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
358 | @@ -507,7 +488,6 @@ | |||
359 | 507 | </array> | 488 | </array> |
360 | 508 | <string key="NSFrameSize">{320, 43}</string> | 489 | <string key="NSFrameSize">{320, 43}</string> |
361 | 509 | <reference key="NSSuperview" ref="504068980"/> | 490 | <reference key="NSSuperview" ref="504068980"/> |
362 | 510 | <reference key="NSWindow"/> | ||
363 | 511 | <reference key="NSNextKeyView" ref="16747584"/> | 491 | <reference key="NSNextKeyView" ref="16747584"/> |
364 | 512 | <reference key="IBUIBackgroundColor" ref="436719790"/> | 492 | <reference key="IBUIBackgroundColor" ref="436719790"/> |
365 | 513 | <bool key="IBUIOpaque">NO</bool> | 493 | <bool key="IBUIOpaque">NO</bool> |
366 | @@ -519,7 +499,6 @@ | |||
367 | 519 | </array> | 499 | </array> |
368 | 520 | <string key="NSFrameSize">{320, 44}</string> | 500 | <string key="NSFrameSize">{320, 44}</string> |
369 | 521 | <reference key="NSSuperview"/> | 501 | <reference key="NSSuperview"/> |
370 | 522 | <reference key="NSWindow"/> | ||
371 | 523 | <reference key="NSNextKeyView" ref="488107434"/> | 502 | <reference key="NSNextKeyView" ref="488107434"/> |
372 | 524 | <int key="IBUITag">1</int> | 503 | <int key="IBUITag">1</int> |
373 | 525 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 504 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
374 | @@ -539,7 +518,6 @@ | |||
375 | 539 | <int key="NSvFlags">256</int> | 518 | <int key="NSvFlags">256</int> |
376 | 540 | <string key="NSFrame">{{10, 0}, {300, 43}}</string> | 519 | <string key="NSFrame">{{10, 0}, {300, 43}}</string> |
377 | 541 | <reference key="NSSuperview" ref="1037596391"/> | 520 | <reference key="NSSuperview" ref="1037596391"/> |
378 | 542 | <reference key="NSWindow"/> | ||
379 | 543 | <bool key="IBUIOpaque">NO</bool> | 521 | <bool key="IBUIOpaque">NO</bool> |
380 | 544 | <bool key="IBUIClipsSubviews">YES</bool> | 522 | <bool key="IBUIClipsSubviews">YES</bool> |
381 | 545 | <int key="IBUIContentMode">4</int> | 523 | <int key="IBUIContentMode">4</int> |
382 | @@ -565,7 +543,6 @@ | |||
383 | 565 | </array> | 543 | </array> |
384 | 566 | <string key="NSFrameSize">{320, 43}</string> | 544 | <string key="NSFrameSize">{320, 43}</string> |
385 | 567 | <reference key="NSSuperview" ref="502759082"/> | 545 | <reference key="NSSuperview" ref="502759082"/> |
386 | 568 | <reference key="NSWindow"/> | ||
387 | 569 | <reference key="NSNextKeyView" ref="827181736"/> | 546 | <reference key="NSNextKeyView" ref="827181736"/> |
388 | 570 | <reference key="IBUIBackgroundColor" ref="436719790"/> | 547 | <reference key="IBUIBackgroundColor" ref="436719790"/> |
389 | 571 | <bool key="IBUIOpaque">NO</bool> | 548 | <bool key="IBUIOpaque">NO</bool> |
390 | @@ -577,7 +554,6 @@ | |||
391 | 577 | </array> | 554 | </array> |
392 | 578 | <string key="NSFrameSize">{320, 44}</string> | 555 | <string key="NSFrameSize">{320, 44}</string> |
393 | 579 | <reference key="NSSuperview"/> | 556 | <reference key="NSSuperview"/> |
394 | 580 | <reference key="NSWindow"/> | ||
395 | 581 | <reference key="NSNextKeyView" ref="1037596391"/> | 557 | <reference key="NSNextKeyView" ref="1037596391"/> |
396 | 582 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 558 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
397 | 583 | <int key="IBUISelectionStyle">2</int> | 559 | <int key="IBUISelectionStyle">2</int> |
398 | @@ -716,6 +692,38 @@ | |||
399 | 716 | </object> | 692 | </object> |
400 | 717 | <object class="IBConnectionRecord"> | 693 | <object class="IBConnectionRecord"> |
401 | 718 | <object class="IBCocoaTouchOutletConnection" key="connection"> | 694 | <object class="IBCocoaTouchOutletConnection" key="connection"> |
402 | 695 | <string key="label">modifiedLabelDescription</string> | ||
403 | 696 | <reference key="source" ref="372490531"/> | ||
404 | 697 | <reference key="destination" ref="215006113"/> | ||
405 | 698 | </object> | ||
406 | 699 | <int key="connectionID">111</int> | ||
407 | 700 | </object> | ||
408 | 701 | <object class="IBConnectionRecord"> | ||
409 | 702 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
410 | 703 | <string key="label">sizeLabelDescription</string> | ||
411 | 704 | <reference key="source" ref="372490531"/> | ||
412 | 705 | <reference key="destination" ref="568016573"/> | ||
413 | 706 | </object> | ||
414 | 707 | <int key="connectionID">112</int> | ||
415 | 708 | </object> | ||
416 | 709 | <object class="IBConnectionRecord"> | ||
417 | 710 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
418 | 711 | <string key="label">viewCellLabel</string> | ||
419 | 712 | <reference key="source" ref="372490531"/> | ||
420 | 713 | <reference key="destination" ref="1062861027"/> | ||
421 | 714 | </object> | ||
422 | 715 | <int key="connectionID">113</int> | ||
423 | 716 | </object> | ||
424 | 717 | <object class="IBConnectionRecord"> | ||
425 | 718 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
426 | 719 | <string key="label">publishCellLabel</string> | ||
427 | 720 | <reference key="source" ref="372490531"/> | ||
428 | 721 | <reference key="destination" ref="16747584"/> | ||
429 | 722 | </object> | ||
430 | 723 | <int key="connectionID">114</int> | ||
431 | 724 | </object> | ||
432 | 725 | <object class="IBConnectionRecord"> | ||
433 | 726 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
434 | 719 | <string key="label">delegate</string> | 727 | <string key="label">delegate</string> |
435 | 720 | <reference key="source" ref="1038751454"/> | 728 | <reference key="source" ref="1038751454"/> |
436 | 721 | <reference key="destination" ref="372490531"/> | 729 | <reference key="destination" ref="372490531"/> |
437 | @@ -985,114 +993,9 @@ | |||
438 | 985 | <nil key="activeLocalization"/> | 993 | <nil key="activeLocalization"/> |
439 | 986 | <dictionary class="NSMutableDictionary" key="localizations"/> | 994 | <dictionary class="NSMutableDictionary" key="localizations"/> |
440 | 987 | <nil key="sourceID"/> | 995 | <nil key="sourceID"/> |
549 | 988 | <int key="maxID">108</int> | 996 | <int key="maxID">114</int> |
550 | 989 | </object> | 997 | </object> |
551 | 990 | <object class="IBClassDescriber" key="IBDocument.Classes"> | 998 | <object class="IBClassDescriber" key="IBDocument.Classes"/> |
444 | 991 | <array class="NSMutableArray" key="referencedPartialClassDescriptions"> | ||
445 | 992 | <object class="IBPartialClassDescription"> | ||
446 | 993 | <string key="className">U1FileDetailsViewController</string> | ||
447 | 994 | <string key="superclassName">UIViewController</string> | ||
448 | 995 | <dictionary class="NSMutableDictionary" key="outlets"> | ||
449 | 996 | <string key="actionsTableView">UITableView</string> | ||
450 | 997 | <string key="createdLabel">UILabel</string> | ||
451 | 998 | <string key="fileAncillaryDetailsView">UIView</string> | ||
452 | 999 | <string key="iconImageView">UIImageView</string> | ||
453 | 1000 | <string key="loadingActivityView">UIActivityIndicatorView</string> | ||
454 | 1001 | <string key="loadingContainerView">UIView</string> | ||
455 | 1002 | <string key="modifiedLabel">UILabel</string> | ||
456 | 1003 | <string key="nameLabel">UILabel</string> | ||
457 | 1004 | <string key="publicURLLabel">UITextView</string> | ||
458 | 1005 | <string key="publishStatusLabel">UILabel</string> | ||
459 | 1006 | <string key="publishSwitch">UISwitch</string> | ||
460 | 1007 | <string key="renameTextField">UITextField</string> | ||
461 | 1008 | <string key="sizeLabel">UILabel</string> | ||
462 | 1009 | <string key="toolbar">UIToolbar</string> | ||
463 | 1010 | </dictionary> | ||
464 | 1011 | <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName"> | ||
465 | 1012 | <object class="IBToOneOutletInfo" key="actionsTableView"> | ||
466 | 1013 | <string key="name">actionsTableView</string> | ||
467 | 1014 | <string key="candidateClassName">UITableView</string> | ||
468 | 1015 | </object> | ||
469 | 1016 | <object class="IBToOneOutletInfo" key="createdLabel"> | ||
470 | 1017 | <string key="name">createdLabel</string> | ||
471 | 1018 | <string key="candidateClassName">UILabel</string> | ||
472 | 1019 | </object> | ||
473 | 1020 | <object class="IBToOneOutletInfo" key="fileAncillaryDetailsView"> | ||
474 | 1021 | <string key="name">fileAncillaryDetailsView</string> | ||
475 | 1022 | <string key="candidateClassName">UIView</string> | ||
476 | 1023 | </object> | ||
477 | 1024 | <object class="IBToOneOutletInfo" key="iconImageView"> | ||
478 | 1025 | <string key="name">iconImageView</string> | ||
479 | 1026 | <string key="candidateClassName">UIImageView</string> | ||
480 | 1027 | </object> | ||
481 | 1028 | <object class="IBToOneOutletInfo" key="loadingActivityView"> | ||
482 | 1029 | <string key="name">loadingActivityView</string> | ||
483 | 1030 | <string key="candidateClassName">UIActivityIndicatorView</string> | ||
484 | 1031 | </object> | ||
485 | 1032 | <object class="IBToOneOutletInfo" key="loadingContainerView"> | ||
486 | 1033 | <string key="name">loadingContainerView</string> | ||
487 | 1034 | <string key="candidateClassName">UIView</string> | ||
488 | 1035 | </object> | ||
489 | 1036 | <object class="IBToOneOutletInfo" key="modifiedLabel"> | ||
490 | 1037 | <string key="name">modifiedLabel</string> | ||
491 | 1038 | <string key="candidateClassName">UILabel</string> | ||
492 | 1039 | </object> | ||
493 | 1040 | <object class="IBToOneOutletInfo" key="nameLabel"> | ||
494 | 1041 | <string key="name">nameLabel</string> | ||
495 | 1042 | <string key="candidateClassName">UILabel</string> | ||
496 | 1043 | </object> | ||
497 | 1044 | <object class="IBToOneOutletInfo" key="publicURLLabel"> | ||
498 | 1045 | <string key="name">publicURLLabel</string> | ||
499 | 1046 | <string key="candidateClassName">UITextView</string> | ||
500 | 1047 | </object> | ||
501 | 1048 | <object class="IBToOneOutletInfo" key="publishStatusLabel"> | ||
502 | 1049 | <string key="name">publishStatusLabel</string> | ||
503 | 1050 | <string key="candidateClassName">UILabel</string> | ||
504 | 1051 | </object> | ||
505 | 1052 | <object class="IBToOneOutletInfo" key="publishSwitch"> | ||
506 | 1053 | <string key="name">publishSwitch</string> | ||
507 | 1054 | <string key="candidateClassName">UISwitch</string> | ||
508 | 1055 | </object> | ||
509 | 1056 | <object class="IBToOneOutletInfo" key="renameTextField"> | ||
510 | 1057 | <string key="name">renameTextField</string> | ||
511 | 1058 | <string key="candidateClassName">UITextField</string> | ||
512 | 1059 | </object> | ||
513 | 1060 | <object class="IBToOneOutletInfo" key="sizeLabel"> | ||
514 | 1061 | <string key="name">sizeLabel</string> | ||
515 | 1062 | <string key="candidateClassName">UILabel</string> | ||
516 | 1063 | </object> | ||
517 | 1064 | <object class="IBToOneOutletInfo" key="toolbar"> | ||
518 | 1065 | <string key="name">toolbar</string> | ||
519 | 1066 | <string key="candidateClassName">UIToolbar</string> | ||
520 | 1067 | </object> | ||
521 | 1068 | </dictionary> | ||
522 | 1069 | <dictionary class="NSMutableDictionary" key="toManyOutletInfosByName"> | ||
523 | 1070 | <object class="IBToManyOutletInfo" key="sectionOneCells"> | ||
524 | 1071 | <string key="name">sectionOneCells</string> | ||
525 | 1072 | <string key="candidateClassName">UITableViewCell</string> | ||
526 | 1073 | <string key="collectionClassName">NSArray</string> | ||
527 | 1074 | </object> | ||
528 | 1075 | <object class="IBToManyOutletInfo" key="sectionTwoCells"> | ||
529 | 1076 | <string key="name">sectionTwoCells</string> | ||
530 | 1077 | <string key="candidateClassName">UITableViewCell</string> | ||
531 | 1078 | <string key="collectionClassName">NSArray</string> | ||
532 | 1079 | </object> | ||
533 | 1080 | </dictionary> | ||
534 | 1081 | <object class="IBClassDescriptionSource" key="sourceIdentifier"> | ||
535 | 1082 | <string key="majorKey">IBProjectSource</string> | ||
536 | 1083 | <string key="minorKey">./Classes/U1FileDetailsViewController.h</string> | ||
537 | 1084 | </object> | ||
538 | 1085 | </object> | ||
539 | 1086 | <object class="IBPartialClassDescription"> | ||
540 | 1087 | <string key="className">U1TopPinningLabel</string> | ||
541 | 1088 | <string key="superclassName">UILabel</string> | ||
542 | 1089 | <object class="IBClassDescriptionSource" key="sourceIdentifier"> | ||
543 | 1090 | <string key="majorKey">IBProjectSource</string> | ||
544 | 1091 | <string key="minorKey">./Classes/U1TopPinningLabel.h</string> | ||
545 | 1092 | </object> | ||
546 | 1093 | </object> | ||
547 | 1094 | </array> | ||
548 | 1095 | </object> | ||
552 | 1096 | <int key="IBDocument.localizationMode">0</int> | 999 | <int key="IBDocument.localizationMode">0</int> |
553 | 1097 | <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> | 1000 | <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> |
554 | 1098 | <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> | 1001 | <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> |
555 | @@ -1105,6 +1008,6 @@ | |||
556 | 1105 | </object> | 1008 | </object> |
557 | 1106 | <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> | 1009 | <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> |
558 | 1107 | <int key="IBDocument.defaultPropertyAccessControl">3</int> | 1010 | <int key="IBDocument.defaultPropertyAccessControl">3</int> |
560 | 1108 | <string key="IBCocoaTouchPluginVersion">1181</string> | 1011 | <string key="IBCocoaTouchPluginVersion">1498</string> |
561 | 1109 | </data> | 1012 | </data> |
562 | 1110 | </archive> | 1013 | </archive> |
563 | 1111 | 1014 | ||
564 | === modified file 'Files/U1FilePreviewViewController.h' | |||
565 | --- Files/U1FilePreviewViewController.h 2011-12-15 18:56:28 +0000 | |||
566 | +++ Files/U1FilePreviewViewController.h 2012-08-27 11:27:21 +0000 | |||
567 | @@ -28,6 +28,8 @@ | |||
568 | 28 | @property (nonatomic, retain) IBOutlet UIView *previewContainerView; | 28 | @property (nonatomic, retain) IBOutlet UIView *previewContainerView; |
569 | 29 | 29 | ||
570 | 30 | @property (nonatomic, retain) IBOutlet UIToolbar *toolBar; | 30 | @property (nonatomic, retain) IBOutlet UIToolbar *toolBar; |
571 | 31 | @property (retain, nonatomic) IBOutlet UILabel *downloadingFileLabel; | ||
572 | 32 | |||
573 | 31 | - (id)initWithNode:(U1FileNode*)node; | 33 | - (id)initWithNode:(U1FileNode*)node; |
574 | 32 | 34 | ||
575 | 33 | @end | 35 | @end |
576 | 34 | 36 | ||
577 | === modified file 'Files/U1FilePreviewViewController.m' | |||
578 | --- Files/U1FilePreviewViewController.m 2012-04-27 02:27:26 +0000 | |||
579 | +++ Files/U1FilePreviewViewController.m 2012-08-27 11:27:21 +0000 | |||
580 | @@ -32,6 +32,7 @@ | |||
581 | 32 | 32 | ||
582 | 33 | 33 | ||
583 | 34 | @implementation U1FilePreviewViewController | 34 | @implementation U1FilePreviewViewController |
584 | 35 | @synthesize downloadingFileLabel; | ||
585 | 35 | 36 | ||
586 | 36 | @synthesize containerView, downloadContainerView, downloadProgressView, previewContainerView; | 37 | @synthesize containerView, downloadContainerView, downloadProgressView, previewContainerView; |
587 | 37 | @synthesize node, filesClient, fileInfo, previewController, toolBar, docController; | 38 | @synthesize node, filesClient, fileInfo, previewController, toolBar, docController; |
588 | @@ -58,6 +59,7 @@ | |||
589 | 58 | [docController release]; | 59 | [docController release]; |
590 | 59 | [previewController release]; | 60 | [previewController release]; |
591 | 60 | [toolBar release]; | 61 | [toolBar release]; |
592 | 62 | [downloadingFileLabel release]; | ||
593 | 61 | [super dealloc]; | 63 | [super dealloc]; |
594 | 62 | } | 64 | } |
595 | 63 | 65 | ||
596 | @@ -69,6 +71,8 @@ | |||
597 | 69 | 71 | ||
598 | 70 | }]; | 72 | }]; |
599 | 71 | self.docController = [UIDocumentInteractionController interactionControllerWithURL:fileInfo.fileURL]; | 73 | self.docController = [UIDocumentInteractionController interactionControllerWithURL:fileInfo.fileURL]; |
600 | 74 | |||
601 | 75 | self.downloadingFileLabel.text = NSLocalizedString(@"Downloading File...", nil); | ||
602 | 72 | } | 76 | } |
603 | 73 | 77 | ||
604 | 74 | - (void)viewDidUnload; | 78 | - (void)viewDidUnload; |
605 | @@ -79,6 +83,7 @@ | |||
606 | 79 | [downloadContainerView release], downloadContainerView = nil; | 83 | [downloadContainerView release], downloadContainerView = nil; |
607 | 80 | [downloadProgressView release], downloadProgressView = nil; | 84 | [downloadProgressView release], downloadProgressView = nil; |
608 | 81 | [previewContainerView release], previewContainerView = nil; | 85 | [previewContainerView release], previewContainerView = nil; |
609 | 86 | [self setDownloadingFileLabel:nil]; | ||
610 | 82 | [super viewDidUnload]; | 87 | [super viewDidUnload]; |
611 | 83 | } | 88 | } |
612 | 84 | 89 | ||
613 | 85 | 90 | ||
614 | === modified file 'Files/U1FilePreviewViewController.xib' | |||
615 | --- Files/U1FilePreviewViewController.xib 2012-04-27 02:27:26 +0000 | |||
616 | +++ Files/U1FilePreviewViewController.xib 2012-08-27 11:27:21 +0000 | |||
617 | @@ -2,21 +2,21 @@ | |||
618 | 2 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> | 2 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> |
619 | 3 | <data> | 3 | <data> |
620 | 4 | <int key="IBDocument.SystemTarget">1296</int> | 4 | <int key="IBDocument.SystemTarget">1296</int> |
625 | 5 | <string key="IBDocument.SystemVersion">11D50</string> | 5 | <string key="IBDocument.SystemVersion">12B19</string> |
626 | 6 | <string key="IBDocument.InterfaceBuilderVersion">2182</string> | 6 | <string key="IBDocument.InterfaceBuilderVersion">2549</string> |
627 | 7 | <string key="IBDocument.AppKitVersion">1138.32</string> | 7 | <string key="IBDocument.AppKitVersion">1187</string> |
628 | 8 | <string key="IBDocument.HIToolboxVersion">568.00</string> | 8 | <string key="IBDocument.HIToolboxVersion">624.00</string> |
629 | 9 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> | 9 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> |
630 | 10 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | 10 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
632 | 11 | <string key="NS.object.0">1181</string> | 11 | <string key="NS.object.0">1498</string> |
633 | 12 | </object> | 12 | </object> |
634 | 13 | <array key="IBDocument.IntegratedClassDependencies"> | 13 | <array key="IBDocument.IntegratedClassDependencies"> |
635 | 14 | <string>IBProxyObject</string> | ||
636 | 15 | <string>IBUIBarButtonItem</string> | ||
637 | 16 | <string>IBUILabel</string> | ||
638 | 14 | <string>IBUIProgressView</string> | 17 | <string>IBUIProgressView</string> |
639 | 15 | <string>IBUIBarButtonItem</string> | ||
640 | 16 | <string>IBUIToolbar</string> | 18 | <string>IBUIToolbar</string> |
641 | 17 | <string>IBUIView</string> | 19 | <string>IBUIView</string> |
642 | 18 | <string>IBUILabel</string> | ||
643 | 19 | <string>IBProxyObject</string> | ||
644 | 20 | </array> | 20 | </array> |
645 | 21 | <array key="IBDocument.PluginDependencies"> | 21 | <array key="IBDocument.PluginDependencies"> |
646 | 22 | <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | 22 | <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
647 | @@ -43,7 +43,6 @@ | |||
648 | 43 | <int key="NSvFlags">266</int> | 43 | <int key="NSvFlags">266</int> |
649 | 44 | <string key="NSFrame">{{0, 372}, {320, 44}}</string> | 44 | <string key="NSFrame">{{0, 372}, {320, 44}}</string> |
650 | 45 | <reference key="NSSuperview" ref="191373211"/> | 45 | <reference key="NSSuperview" ref="191373211"/> |
651 | 46 | <reference key="NSWindow"/> | ||
652 | 47 | <bool key="IBUIOpaque">NO</bool> | 46 | <bool key="IBUIOpaque">NO</bool> |
653 | 48 | <bool key="IBUIClearsContextBeforeDrawing">NO</bool> | 47 | <bool key="IBUIClearsContextBeforeDrawing">NO</bool> |
654 | 49 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 48 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
655 | @@ -84,7 +83,6 @@ | |||
656 | 84 | <int key="NSvFlags">292</int> | 83 | <int key="NSvFlags">292</int> |
657 | 85 | <string key="NSFrame">{{125, 175}, {70, 21}}</string> | 84 | <string key="NSFrame">{{125, 175}, {70, 21}}</string> |
658 | 86 | <reference key="NSSuperview" ref="77920402"/> | 85 | <reference key="NSSuperview" ref="77920402"/> |
659 | 87 | <reference key="NSWindow"/> | ||
660 | 88 | <reference key="NSNextKeyView" ref="192602212"/> | 86 | <reference key="NSNextKeyView" ref="192602212"/> |
661 | 89 | <bool key="IBUIOpaque">NO</bool> | 87 | <bool key="IBUIOpaque">NO</bool> |
662 | 90 | <bool key="IBUIClipsSubviews">YES</bool> | 88 | <bool key="IBUIClipsSubviews">YES</bool> |
663 | @@ -112,7 +110,6 @@ | |||
664 | 112 | </array> | 110 | </array> |
665 | 113 | <string key="NSFrameSize">{320, 372}</string> | 111 | <string key="NSFrameSize">{320, 372}</string> |
666 | 114 | <reference key="NSSuperview" ref="747227964"/> | 112 | <reference key="NSSuperview" ref="747227964"/> |
667 | 115 | <reference key="NSWindow"/> | ||
668 | 116 | <reference key="NSNextKeyView" ref="748563573"/> | 113 | <reference key="NSNextKeyView" ref="748563573"/> |
669 | 117 | <object class="NSColor" key="IBUIBackgroundColor"> | 114 | <object class="NSColor" key="IBUIBackgroundColor"> |
670 | 118 | <int key="NSColorSpace">3</int> | 115 | <int key="NSColorSpace">3</int> |
671 | @@ -129,10 +126,9 @@ | |||
672 | 129 | <array class="NSMutableArray" key="NSSubviews"> | 126 | <array class="NSMutableArray" key="NSSubviews"> |
673 | 130 | <object class="IBUIProgressView" id="804375426"> | 127 | <object class="IBUIProgressView" id="804375426"> |
674 | 131 | <reference key="NSNextResponder" ref="192602212"/> | 128 | <reference key="NSNextResponder" ref="192602212"/> |
676 | 132 | <int key="NSvFlags">292</int> | 129 | <int key="NSvFlags">258</int> |
677 | 133 | <string key="NSFrame">{{85, 181}, {150, 9}}</string> | 130 | <string key="NSFrame">{{85, 181}, {150, 9}}</string> |
678 | 134 | <reference key="NSSuperview" ref="192602212"/> | 131 | <reference key="NSSuperview" ref="192602212"/> |
679 | 135 | <reference key="NSWindow"/> | ||
680 | 136 | <reference key="NSNextKeyView" ref="921128121"/> | 132 | <reference key="NSNextKeyView" ref="921128121"/> |
681 | 137 | <bool key="IBUIOpaque">NO</bool> | 133 | <bool key="IBUIOpaque">NO</bool> |
682 | 138 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 134 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
683 | @@ -143,10 +139,9 @@ | |||
684 | 143 | </object> | 139 | </object> |
685 | 144 | <object class="IBUILabel" id="149709600"> | 140 | <object class="IBUILabel" id="149709600"> |
686 | 145 | <reference key="NSNextResponder" ref="192602212"/> | 141 | <reference key="NSNextResponder" ref="192602212"/> |
689 | 146 | <int key="NSvFlags">292</int> | 142 | <int key="NSvFlags">290</int> |
690 | 147 | <string key="NSFrame">{{96, 154}, {129, 19}}</string> | 143 | <string key="NSFrame">{{20, 154}, {280, 19}}</string> |
691 | 148 | <reference key="NSSuperview" ref="192602212"/> | 144 | <reference key="NSSuperview" ref="192602212"/> |
692 | 149 | <reference key="NSWindow"/> | ||
693 | 150 | <reference key="NSNextKeyView" ref="804375426"/> | 145 | <reference key="NSNextKeyView" ref="804375426"/> |
694 | 151 | <bool key="IBUIOpaque">NO</bool> | 146 | <bool key="IBUIOpaque">NO</bool> |
695 | 152 | <bool key="IBUIClipsSubviews">YES</bool> | 147 | <bool key="IBUIClipsSubviews">YES</bool> |
696 | @@ -158,6 +153,7 @@ | |||
697 | 158 | <nil key="IBUIHighlightedColor"/> | 153 | <nil key="IBUIHighlightedColor"/> |
698 | 159 | <int key="IBUIBaselineAdjustment">1</int> | 154 | <int key="IBUIBaselineAdjustment">1</int> |
699 | 160 | <float key="IBUIMinimumFontSize">10</float> | 155 | <float key="IBUIMinimumFontSize">10</float> |
700 | 156 | <int key="IBUITextAlignment">1</int> | ||
701 | 161 | <object class="IBUIFontDescription" key="IBUIFontDescription"> | 157 | <object class="IBUIFontDescription" key="IBUIFontDescription"> |
702 | 162 | <int key="type">1</int> | 158 | <int key="type">1</int> |
703 | 163 | <double key="pointSize">15</double> | 159 | <double key="pointSize">15</double> |
704 | @@ -171,7 +167,6 @@ | |||
705 | 171 | </array> | 167 | </array> |
706 | 172 | <string key="NSFrameSize">{320, 372}</string> | 168 | <string key="NSFrameSize">{320, 372}</string> |
707 | 173 | <reference key="NSSuperview" ref="747227964"/> | 169 | <reference key="NSSuperview" ref="747227964"/> |
708 | 174 | <reference key="NSWindow"/> | ||
709 | 175 | <reference key="NSNextKeyView" ref="149709600"/> | 170 | <reference key="NSNextKeyView" ref="149709600"/> |
710 | 176 | <object class="NSColor" key="IBUIBackgroundColor"> | 171 | <object class="NSColor" key="IBUIBackgroundColor"> |
711 | 177 | <int key="NSColorSpace">3</int> | 172 | <int key="NSColorSpace">3</int> |
712 | @@ -183,7 +178,6 @@ | |||
713 | 183 | </array> | 178 | </array> |
714 | 184 | <string key="NSFrameSize">{320, 372}</string> | 179 | <string key="NSFrameSize">{320, 372}</string> |
715 | 185 | <reference key="NSSuperview" ref="191373211"/> | 180 | <reference key="NSSuperview" ref="191373211"/> |
716 | 186 | <reference key="NSWindow"/> | ||
717 | 187 | <reference key="NSNextKeyView" ref="77920402"/> | 181 | <reference key="NSNextKeyView" ref="77920402"/> |
718 | 188 | <object class="NSColor" key="IBUIBackgroundColor"> | 182 | <object class="NSColor" key="IBUIBackgroundColor"> |
719 | 189 | <int key="NSColorSpace">3</int> | 183 | <int key="NSColorSpace">3</int> |
720 | @@ -195,7 +189,6 @@ | |||
721 | 195 | </array> | 189 | </array> |
722 | 196 | <string key="NSFrame">{{0, 64}, {320, 416}}</string> | 190 | <string key="NSFrame">{{0, 64}, {320, 416}}</string> |
723 | 197 | <reference key="NSSuperview"/> | 191 | <reference key="NSSuperview"/> |
724 | 198 | <reference key="NSWindow"/> | ||
725 | 199 | <reference key="NSNextKeyView" ref="747227964"/> | 192 | <reference key="NSNextKeyView" ref="747227964"/> |
726 | 200 | <object class="NSColor" key="IBUIBackgroundColor"> | 193 | <object class="NSColor" key="IBUIBackgroundColor"> |
727 | 201 | <int key="NSColorSpace">3</int> | 194 | <int key="NSColorSpace">3</int> |
728 | @@ -279,6 +272,14 @@ | |||
729 | 279 | <int key="connectionID">25</int> | 272 | <int key="connectionID">25</int> |
730 | 280 | </object> | 273 | </object> |
731 | 281 | <object class="IBConnectionRecord"> | 274 | <object class="IBConnectionRecord"> |
732 | 275 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
733 | 276 | <string key="label">downloadingFileLabel</string> | ||
734 | 277 | <reference key="source" ref="372490531"/> | ||
735 | 278 | <reference key="destination" ref="149709600"/> | ||
736 | 279 | </object> | ||
737 | 280 | <int key="connectionID">26</int> | ||
738 | 281 | </object> | ||
739 | 282 | <object class="IBConnectionRecord"> | ||
740 | 282 | <object class="IBCocoaTouchEventConnection" key="connection"> | 283 | <object class="IBCocoaTouchEventConnection" key="connection"> |
741 | 283 | <string key="label">deleteItem:</string> | 284 | <string key="label">deleteItem:</string> |
742 | 284 | <reference key="source" ref="134023548"/> | 285 | <reference key="source" ref="134023548"/> |
743 | @@ -415,49 +416,9 @@ | |||
744 | 415 | <nil key="activeLocalization"/> | 416 | <nil key="activeLocalization"/> |
745 | 416 | <dictionary class="NSMutableDictionary" key="localizations"/> | 417 | <dictionary class="NSMutableDictionary" key="localizations"/> |
746 | 417 | <nil key="sourceID"/> | 418 | <nil key="sourceID"/> |
790 | 418 | <int key="maxID">25</int> | 419 | <int key="maxID">26</int> |
791 | 419 | </object> | 420 | </object> |
792 | 420 | <object class="IBClassDescriber" key="IBDocument.Classes"> | 421 | <object class="IBClassDescriber" key="IBDocument.Classes"/> |
750 | 421 | <array class="NSMutableArray" key="referencedPartialClassDescriptions"> | ||
751 | 422 | <object class="IBPartialClassDescription"> | ||
752 | 423 | <string key="className">U1FilePreviewViewController</string> | ||
753 | 424 | <string key="superclassName">UIViewController</string> | ||
754 | 425 | <dictionary class="NSMutableDictionary" key="outlets"> | ||
755 | 426 | <string key="containerView">UIView</string> | ||
756 | 427 | <string key="downloadContainerView">UIView</string> | ||
757 | 428 | <string key="downloadProgressView">UIProgressView</string> | ||
758 | 429 | <string key="previewContainerView">UIView</string> | ||
759 | 430 | <string key="toolBar">UIToolbar</string> | ||
760 | 431 | </dictionary> | ||
761 | 432 | <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName"> | ||
762 | 433 | <object class="IBToOneOutletInfo" key="containerView"> | ||
763 | 434 | <string key="name">containerView</string> | ||
764 | 435 | <string key="candidateClassName">UIView</string> | ||
765 | 436 | </object> | ||
766 | 437 | <object class="IBToOneOutletInfo" key="downloadContainerView"> | ||
767 | 438 | <string key="name">downloadContainerView</string> | ||
768 | 439 | <string key="candidateClassName">UIView</string> | ||
769 | 440 | </object> | ||
770 | 441 | <object class="IBToOneOutletInfo" key="downloadProgressView"> | ||
771 | 442 | <string key="name">downloadProgressView</string> | ||
772 | 443 | <string key="candidateClassName">UIProgressView</string> | ||
773 | 444 | </object> | ||
774 | 445 | <object class="IBToOneOutletInfo" key="previewContainerView"> | ||
775 | 446 | <string key="name">previewContainerView</string> | ||
776 | 447 | <string key="candidateClassName">UIView</string> | ||
777 | 448 | </object> | ||
778 | 449 | <object class="IBToOneOutletInfo" key="toolBar"> | ||
779 | 450 | <string key="name">toolBar</string> | ||
780 | 451 | <string key="candidateClassName">UIToolbar</string> | ||
781 | 452 | </object> | ||
782 | 453 | </dictionary> | ||
783 | 454 | <object class="IBClassDescriptionSource" key="sourceIdentifier"> | ||
784 | 455 | <string key="majorKey">IBProjectSource</string> | ||
785 | 456 | <string key="minorKey">./Classes/U1FilePreviewViewController.h</string> | ||
786 | 457 | </object> | ||
787 | 458 | </object> | ||
788 | 459 | </array> | ||
789 | 460 | </object> | ||
793 | 461 | <int key="IBDocument.localizationMode">0</int> | 422 | <int key="IBDocument.localizationMode">0</int> |
794 | 462 | <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> | 423 | <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> |
795 | 463 | <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> | 424 | <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> |
796 | @@ -466,6 +427,6 @@ | |||
797 | 466 | </object> | 427 | </object> |
798 | 467 | <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> | 428 | <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> |
799 | 468 | <int key="IBDocument.defaultPropertyAccessControl">3</int> | 429 | <int key="IBDocument.defaultPropertyAccessControl">3</int> |
801 | 469 | <string key="IBCocoaTouchPluginVersion">1181</string> | 430 | <string key="IBCocoaTouchPluginVersion">1498</string> |
802 | 470 | </data> | 431 | </data> |
803 | 471 | </archive> | 432 | </archive> |
804 | 472 | 433 | ||
805 | === modified file 'Files/U1FolderViewController.m' | |||
806 | --- Files/U1FolderViewController.m 2012-08-10 03:19:46 +0000 | |||
807 | +++ Files/U1FolderViewController.m 2012-08-27 11:27:21 +0000 | |||
808 | @@ -257,7 +257,7 @@ | |||
809 | 257 | { | 257 | { |
810 | 258 | [cell.imageView setImage:[UIImage imageNamed:@"ic_folder"]]; | 258 | [cell.imageView setImage:[UIImage imageNamed:@"ic_folder"]]; |
811 | 259 | NSString *fuzzyDate = [self.fuzzyDateTransformer transformedValue:aNode.modificationDate]; | 259 | NSString *fuzzyDate = [self.fuzzyDateTransformer transformedValue:aNode.modificationDate]; |
813 | 260 | [cell.detailLabel setText:[NSString stringWithFormat:@"modified %@", fuzzyDate]]; | 260 | [cell.detailLabel setText:[NSString stringWithFormat:NSLocalizedString(@"Modified %@", @"Folder modification time"), fuzzyDate]]; |
814 | 261 | } | 261 | } |
815 | 262 | else | 262 | else |
816 | 263 | { | 263 | { |
817 | @@ -274,7 +274,7 @@ | |||
818 | 274 | NSString *detailString = sizeString; | 274 | NSString *detailString = sizeString; |
819 | 275 | NSString *fuzzyDate = [self.fuzzyDateTransformer transformedValue:aNode.modificationDate]; | 275 | NSString *fuzzyDate = [self.fuzzyDateTransformer transformedValue:aNode.modificationDate]; |
820 | 276 | if (aNode.modificationDate) | 276 | if (aNode.modificationDate) |
822 | 277 | detailString = [sizeString stringByAppendingFormat:@", modified %@", fuzzyDate]; | 277 | detailString = [sizeString stringByAppendingFormat:NSLocalizedString(@", modified %@", @"File modification time"), fuzzyDate]; |
823 | 278 | [cell.detailLabel setText:detailString]; | 278 | [cell.detailLabel setText:detailString]; |
824 | 279 | } | 279 | } |
825 | 280 | } | 280 | } |
826 | @@ -439,7 +439,7 @@ | |||
827 | 439 | int numItems = [[[self.resultsController sections] objectAtIndex:0] numberOfObjects]; | 439 | int numItems = [[[self.resultsController sections] objectAtIndex:0] numberOfObjects]; |
828 | 440 | NSNumber *folderRawSize = [[self.resultsController fetchedObjects] valueForKeyPath:@"@sum.size"]; | 440 | NSNumber *folderRawSize = [[self.resultsController fetchedObjects] valueForKeyPath:@"@sum.size"]; |
829 | 441 | NSString *folderSize = [self.byteSizeTransformer transformedValue:folderRawSize]; | 441 | NSString *folderSize = [self.byteSizeTransformer transformedValue:folderRawSize]; |
831 | 442 | [self.footerLabel setText:[NSString stringWithFormat:@"%d items, %@", numItems, folderSize]]; | 442 | [self.footerLabel setText:[NSString stringWithFormat:NSLocalizedString(@"%d items, %@", @"N items, S.S MB"), numItems, folderSize]]; |
832 | 443 | } | 443 | } |
833 | 444 | 444 | ||
834 | 445 | @end | 445 | @end |
835 | 446 | 446 | ||
836 | === modified file 'Files/U1LoginController.m' | |||
837 | --- Files/U1LoginController.m 2012-05-18 18:40:15 +0000 | |||
838 | +++ Files/U1LoginController.m 2012-08-27 11:27:21 +0000 | |||
839 | @@ -326,7 +326,7 @@ | |||
840 | 326 | else if (errorMessage == nil) | 326 | else if (errorMessage == nil) |
841 | 327 | errorMessage = NSLocalizedString(@"An error occured trying to sign in, please try again.", @"Login Error Message"); | 327 | errorMessage = NSLocalizedString(@"An error occured trying to sign in, please try again.", @"Login Error Message"); |
842 | 328 | 328 | ||
844 | 329 | UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Ubuntu One", nil) message:errorMessage delegate:self cancelButtonTitle:@"Dismiss" otherButtonTitles:nil]; | 329 | UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Ubuntu One" message:errorMessage delegate:self cancelButtonTitle:NSLocalizedString(@"Ok", nil) otherButtonTitles:nil]; |
845 | 330 | [alert show]; | 330 | [alert show]; |
846 | 331 | [alert release]; | 331 | [alert release]; |
847 | 332 | [self.loginViewController.view setUserInteractionEnabled:YES]; | 332 | [self.loginViewController.view setUserInteractionEnabled:YES]; |
848 | 333 | 333 | ||
849 | === modified file 'Files/U1SSOCredentialsViewController.h' | |||
850 | --- Files/U1SSOCredentialsViewController.h 2012-01-19 15:52:37 +0000 | |||
851 | +++ Files/U1SSOCredentialsViewController.h 2012-08-27 11:27:21 +0000 | |||
852 | @@ -32,7 +32,12 @@ | |||
853 | 32 | @property (nonatomic, retain) IBOutlet UIButton *loginButton; | 32 | @property (nonatomic, retain) IBOutlet UIButton *loginButton; |
854 | 33 | @property (nonatomic, copy) void (^loginAction)(NSString *username, NSString *password); | 33 | @property (nonatomic, copy) void (^loginAction)(NSString *username, NSString *password); |
855 | 34 | 34 | ||
856 | 35 | @property (retain, nonatomic) IBOutlet UILabel *emailLabel; | ||
857 | 36 | @property (retain, nonatomic) IBOutlet UILabel *passwordLabel; | ||
858 | 37 | |||
859 | 35 | - (IBAction)logIn:(id)sender; | 38 | - (IBAction)logIn:(id)sender; |
860 | 36 | - (void)reset; | 39 | - (void)reset; |
861 | 37 | 40 | ||
862 | 41 | |||
863 | 42 | |||
864 | 38 | @end | 43 | @end |
865 | 39 | 44 | ||
866 | === modified file 'Files/U1SSOCredentialsViewController.m' | |||
867 | --- Files/U1SSOCredentialsViewController.m 2012-01-19 15:52:37 +0000 | |||
868 | +++ Files/U1SSOCredentialsViewController.m 2012-08-27 11:27:21 +0000 | |||
869 | @@ -17,6 +17,8 @@ | |||
870 | 17 | 17 | ||
871 | 18 | 18 | ||
872 | 19 | @implementation U1SSOCredentialsViewController | 19 | @implementation U1SSOCredentialsViewController |
873 | 20 | @synthesize emailLabel; | ||
874 | 21 | @synthesize passwordLabel; | ||
875 | 20 | 22 | ||
876 | 21 | @synthesize emailField; | 23 | @synthesize emailField; |
877 | 22 | @synthesize passwordField; | 24 | @synthesize passwordField; |
878 | @@ -33,6 +35,8 @@ | |||
879 | 33 | [patternView release]; | 35 | [patternView release]; |
880 | 34 | [loginButton release]; | 36 | [loginButton release]; |
881 | 35 | [spinner release]; | 37 | [spinner release]; |
882 | 38 | [emailLabel release]; | ||
883 | 39 | [passwordLabel release]; | ||
884 | 36 | [super dealloc]; | 40 | [super dealloc]; |
885 | 37 | } | 41 | } |
886 | 38 | 42 | ||
887 | @@ -43,6 +47,8 @@ | |||
888 | 43 | [self setPatternView:nil]; | 47 | [self setPatternView:nil]; |
889 | 44 | [self setLoginButton:nil]; | 48 | [self setLoginButton:nil]; |
890 | 45 | [self setSpinner:nil]; | 49 | [self setSpinner:nil]; |
891 | 50 | [self setEmailLabel:nil]; | ||
892 | 51 | [self setPasswordLabel:nil]; | ||
893 | 46 | [super viewDidUnload]; | 52 | [super viewDidUnload]; |
894 | 47 | } | 53 | } |
895 | 48 | 54 | ||
896 | @@ -57,6 +63,10 @@ | |||
897 | 57 | // The following should not be necessary but without it the pattern color is opaque... | 63 | // The following should not be necessary but without it the pattern color is opaque... |
898 | 58 | // http://stackoverflow.com/questions/3899398/uicolor-colorwithpatternimage-alpha-blending-problem-solution-ios-sdk-4-1/5348396#5348396 | 64 | // http://stackoverflow.com/questions/3899398/uicolor-colorwithpatternimage-alpha-blending-problem-solution-ios-sdk-4-1/5348396#5348396 |
899 | 59 | // [self.patternView.layer setOpaque:NO]; | 65 | // [self.patternView.layer setOpaque:NO]; |
900 | 66 | |||
901 | 67 | self.emailLabel.text = NSLocalizedString(@"Email", nil); | ||
902 | 68 | self.passwordLabel.text = NSLocalizedString(@"Password", nil); | ||
903 | 69 | [self.loginButton setTitle:NSLocalizedString(@"Sign in", nil) forState:UIControlStateNormal]; | ||
904 | 60 | } | 70 | } |
905 | 61 | 71 | ||
906 | 62 | - (IBAction)logIn:(id)sender; | 72 | - (IBAction)logIn:(id)sender; |
907 | 63 | 73 | ||
908 | === modified file 'Files/U1SSOCredentialsViewController.xib' | |||
909 | --- Files/U1SSOCredentialsViewController.xib 2012-01-19 15:52:37 +0000 | |||
910 | +++ Files/U1SSOCredentialsViewController.xib 2012-08-27 11:27:21 +0000 | |||
911 | @@ -1,23 +1,23 @@ | |||
912 | 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
913 | 2 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10"> | 2 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10"> |
914 | 3 | <data> | 3 | <data> |
920 | 4 | <int key="IBDocument.SystemTarget">1280</int> | 4 | <int key="IBDocument.SystemTarget">1296</int> |
921 | 5 | <string key="IBDocument.SystemVersion">10K549</string> | 5 | <string key="IBDocument.SystemVersion">12B19</string> |
922 | 6 | <string key="IBDocument.InterfaceBuilderVersion">1938</string> | 6 | <string key="IBDocument.InterfaceBuilderVersion">2549</string> |
923 | 7 | <string key="IBDocument.AppKitVersion">1038.36</string> | 7 | <string key="IBDocument.AppKitVersion">1187</string> |
924 | 8 | <string key="IBDocument.HIToolboxVersion">461.00</string> | 8 | <string key="IBDocument.HIToolboxVersion">624.00</string> |
925 | 9 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> | 9 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> |
926 | 10 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | 10 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
928 | 11 | <string key="NS.object.0">933</string> | 11 | <string key="NS.object.0">1498</string> |
929 | 12 | </object> | 12 | </object> |
930 | 13 | <object class="NSArray" key="IBDocument.IntegratedClassDependencies"> | 13 | <object class="NSArray" key="IBDocument.IntegratedClassDependencies"> |
931 | 14 | <bool key="EncodedWithXMLCoder">YES</bool> | 14 | <bool key="EncodedWithXMLCoder">YES</bool> |
932 | 15 | <string>IBProxyObject</string> | ||
933 | 16 | <string>IBUIActivityIndicatorView</string> | ||
934 | 17 | <string>IBUIButton</string> | ||
935 | 15 | <string>IBUILabel</string> | 18 | <string>IBUILabel</string> |
938 | 16 | <string>IBUIButton</string> | 19 | <string>IBUITextField</string> |
937 | 17 | <string>IBUIActivityIndicatorView</string> | ||
939 | 18 | <string>IBUIView</string> | 20 | <string>IBUIView</string> |
940 | 19 | <string>IBUITextField</string> | ||
941 | 20 | <string>IBProxyObject</string> | ||
942 | 21 | </object> | 21 | </object> |
943 | 22 | <object class="NSArray" key="IBDocument.PluginDependencies"> | 22 | <object class="NSArray" key="IBDocument.PluginDependencies"> |
944 | 23 | <bool key="EncodedWithXMLCoder">YES</bool> | 23 | <bool key="EncodedWithXMLCoder">YES</bool> |
945 | @@ -38,7 +38,7 @@ | |||
946 | 38 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 38 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
947 | 39 | </object> | 39 | </object> |
948 | 40 | <object class="IBUIView" id="191373211"> | 40 | <object class="IBUIView" id="191373211"> |
950 | 41 | <nil key="NSNextResponder"/> | 41 | <reference key="NSNextResponder"/> |
951 | 42 | <int key="NSvFlags">274</int> | 42 | <int key="NSvFlags">274</int> |
952 | 43 | <object class="NSMutableArray" key="NSSubviews"> | 43 | <object class="NSMutableArray" key="NSSubviews"> |
953 | 44 | <bool key="EncodedWithXMLCoder">YES</bool> | 44 | <bool key="EncodedWithXMLCoder">YES</bool> |
954 | @@ -47,6 +47,7 @@ | |||
955 | 47 | <int key="NSvFlags">292</int> | 47 | <int key="NSvFlags">292</int> |
956 | 48 | <string key="NSFrame">{{21, 33}, {279, 31}}</string> | 48 | <string key="NSFrame">{{21, 33}, {279, 31}}</string> |
957 | 49 | <reference key="NSSuperview" ref="191373211"/> | 49 | <reference key="NSSuperview" ref="191373211"/> |
958 | 50 | <reference key="NSWindow"/> | ||
959 | 50 | <reference key="NSNextKeyView" ref="1028176743"/> | 51 | <reference key="NSNextKeyView" ref="1028176743"/> |
960 | 51 | <bool key="IBUIOpaque">NO</bool> | 52 | <bool key="IBUIOpaque">NO</bool> |
961 | 52 | <bool key="IBUIClipsSubviews">YES</bool> | 53 | <bool key="IBUIClipsSubviews">YES</bool> |
962 | @@ -82,6 +83,7 @@ | |||
963 | 82 | <int key="NSvFlags">292</int> | 83 | <int key="NSvFlags">292</int> |
964 | 83 | <string key="NSFrame">{{20, 100}, {280, 31}}</string> | 84 | <string key="NSFrame">{{20, 100}, {280, 31}}</string> |
965 | 84 | <reference key="NSSuperview" ref="191373211"/> | 85 | <reference key="NSSuperview" ref="191373211"/> |
966 | 86 | <reference key="NSWindow"/> | ||
967 | 85 | <reference key="NSNextKeyView" ref="1065737352"/> | 87 | <reference key="NSNextKeyView" ref="1065737352"/> |
968 | 86 | <bool key="IBUIOpaque">NO</bool> | 88 | <bool key="IBUIOpaque">NO</bool> |
969 | 87 | <bool key="IBUIClipsSubviews">YES</bool> | 89 | <bool key="IBUIClipsSubviews">YES</bool> |
970 | @@ -107,6 +109,7 @@ | |||
971 | 107 | <int key="NSvFlags">292</int> | 109 | <int key="NSvFlags">292</int> |
972 | 108 | <string key="NSFrame">{{20, 11}, {40, 20}}</string> | 110 | <string key="NSFrame">{{20, 11}, {40, 20}}</string> |
973 | 109 | <reference key="NSSuperview" ref="191373211"/> | 111 | <reference key="NSSuperview" ref="191373211"/> |
974 | 112 | <reference key="NSWindow"/> | ||
975 | 110 | <reference key="NSNextKeyView" ref="391813410"/> | 113 | <reference key="NSNextKeyView" ref="391813410"/> |
976 | 111 | <bool key="IBUIOpaque">NO</bool> | 114 | <bool key="IBUIOpaque">NO</bool> |
977 | 112 | <bool key="IBUIClipsSubviews">YES</bool> | 115 | <bool key="IBUIClipsSubviews">YES</bool> |
978 | @@ -138,6 +141,7 @@ | |||
979 | 138 | <int key="NSvFlags">292</int> | 141 | <int key="NSvFlags">292</int> |
980 | 139 | <string key="NSFrame">{{20, 79}, {72, 20}}</string> | 142 | <string key="NSFrame">{{20, 79}, {72, 20}}</string> |
981 | 140 | <reference key="NSSuperview" ref="191373211"/> | 143 | <reference key="NSSuperview" ref="191373211"/> |
982 | 144 | <reference key="NSWindow"/> | ||
983 | 141 | <reference key="NSNextKeyView" ref="965235407"/> | 145 | <reference key="NSNextKeyView" ref="965235407"/> |
984 | 142 | <bool key="IBUIOpaque">NO</bool> | 146 | <bool key="IBUIOpaque">NO</bool> |
985 | 143 | <bool key="IBUIClipsSubviews">YES</bool> | 147 | <bool key="IBUIClipsSubviews">YES</bool> |
986 | @@ -157,6 +161,7 @@ | |||
987 | 157 | <int key="NSvFlags">292</int> | 161 | <int key="NSvFlags">292</int> |
988 | 158 | <string key="NSFrame">{{21, 143}, {275, 45}}</string> | 162 | <string key="NSFrame">{{21, 143}, {275, 45}}</string> |
989 | 159 | <reference key="NSSuperview" ref="191373211"/> | 163 | <reference key="NSSuperview" ref="191373211"/> |
990 | 164 | <reference key="NSWindow"/> | ||
991 | 160 | <bool key="IBUIOpaque">NO</bool> | 165 | <bool key="IBUIOpaque">NO</bool> |
992 | 161 | <string key="IBUIContentStretch">{{0.5, 0}, {0.5, 1}}</string> | 166 | <string key="IBUIContentStretch">{{0.5, 0}, {0.5, 1}}</string> |
993 | 162 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 167 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
994 | @@ -192,6 +197,7 @@ | |||
995 | 192 | <int key="NSvFlags">-2147483356</int> | 197 | <int key="NSvFlags">-2147483356</int> |
996 | 193 | <string key="NSFrame">{{278, 11}, {20, 20}}</string> | 198 | <string key="NSFrame">{{278, 11}, {20, 20}}</string> |
997 | 194 | <reference key="NSSuperview" ref="191373211"/> | 199 | <reference key="NSSuperview" ref="191373211"/> |
998 | 200 | <reference key="NSWindow"/> | ||
999 | 195 | <reference key="NSNextKeyView" ref="327454090"/> | 201 | <reference key="NSNextKeyView" ref="327454090"/> |
1000 | 196 | <bool key="IBUIOpaque">NO</bool> | 202 | <bool key="IBUIOpaque">NO</bool> |
1001 | 197 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 203 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
1002 | @@ -199,6 +205,8 @@ | |||
1003 | 199 | </object> | 205 | </object> |
1004 | 200 | </object> | 206 | </object> |
1005 | 201 | <string key="NSFrame">{{0, 64}, {320, 416}}</string> | 207 | <string key="NSFrame">{{0, 64}, {320, 416}}</string> |
1006 | 208 | <reference key="NSSuperview"/> | ||
1007 | 209 | <reference key="NSWindow"/> | ||
1008 | 202 | <object class="NSColor" key="IBUIBackgroundColor"> | 210 | <object class="NSColor" key="IBUIBackgroundColor"> |
1009 | 203 | <int key="NSColorSpace">3</int> | 211 | <int key="NSColorSpace">3</int> |
1010 | 204 | <bytes key="NSWhite">MQA</bytes> | 212 | <bytes key="NSWhite">MQA</bytes> |
1011 | @@ -255,6 +263,22 @@ | |||
1012 | 255 | <int key="connectionID">23</int> | 263 | <int key="connectionID">23</int> |
1013 | 256 | </object> | 264 | </object> |
1014 | 257 | <object class="IBConnectionRecord"> | 265 | <object class="IBConnectionRecord"> |
1015 | 266 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
1016 | 267 | <string key="label">emailLabel</string> | ||
1017 | 268 | <reference key="source" ref="372490531"/> | ||
1018 | 269 | <reference key="destination" ref="522019067"/> | ||
1019 | 270 | </object> | ||
1020 | 271 | <int key="connectionID">31</int> | ||
1021 | 272 | </object> | ||
1022 | 273 | <object class="IBConnectionRecord"> | ||
1023 | 274 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
1024 | 275 | <string key="label">passwordLabel</string> | ||
1025 | 276 | <reference key="source" ref="372490531"/> | ||
1026 | 277 | <reference key="destination" ref="1028176743"/> | ||
1027 | 278 | </object> | ||
1028 | 279 | <int key="connectionID">32</int> | ||
1029 | 280 | </object> | ||
1030 | 281 | <object class="IBConnectionRecord"> | ||
1031 | 258 | <object class="IBCocoaTouchEventConnection" key="connection"> | 282 | <object class="IBCocoaTouchEventConnection" key="connection"> |
1032 | 259 | <string key="label">logIn:</string> | 283 | <string key="label">logIn:</string> |
1033 | 260 | <reference key="source" ref="1065737352"/> | 284 | <reference key="source" ref="1065737352"/> |
1034 | @@ -349,7 +373,7 @@ | |||
1035 | 349 | <string>6.IBPluginDependency</string> | 373 | <string>6.IBPluginDependency</string> |
1036 | 350 | <string>7.IBPluginDependency</string> | 374 | <string>7.IBPluginDependency</string> |
1037 | 351 | </object> | 375 | </object> |
1039 | 352 | <object class="NSMutableArray" key="dict.values"> | 376 | <object class="NSArray" key="dict.values"> |
1040 | 353 | <bool key="EncodedWithXMLCoder">YES</bool> | 377 | <bool key="EncodedWithXMLCoder">YES</bool> |
1041 | 354 | <string>U1SSOCredentialsViewController</string> | 378 | <string>U1SSOCredentialsViewController</string> |
1042 | 355 | <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | 379 | <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
1043 | @@ -377,7 +401,7 @@ | |||
1044 | 377 | <reference key="dict.values" ref="0"/> | 401 | <reference key="dict.values" ref="0"/> |
1045 | 378 | </object> | 402 | </object> |
1046 | 379 | <nil key="sourceID"/> | 403 | <nil key="sourceID"/> |
1048 | 380 | <int key="maxID">30</int> | 404 | <int key="maxID">32</int> |
1049 | 381 | </object> | 405 | </object> |
1050 | 382 | <object class="IBClassDescriber" key="IBDocument.Classes"> | 406 | <object class="IBClassDescriber" key="IBDocument.Classes"> |
1051 | 383 | <object class="NSMutableArray" key="referencedPartialClassDescriptions"> | 407 | <object class="NSMutableArray" key="referencedPartialClassDescriptions"> |
1052 | @@ -390,16 +414,106 @@ | |||
1053 | 390 | <string key="minorKey">./Classes/U1OrangeButton.h</string> | 414 | <string key="minorKey">./Classes/U1OrangeButton.h</string> |
1054 | 391 | </object> | 415 | </object> |
1055 | 392 | </object> | 416 | </object> |
1056 | 417 | <object class="IBPartialClassDescription"> | ||
1057 | 418 | <string key="className">U1SSOCredentialsViewController</string> | ||
1058 | 419 | <string key="superclassName">UIViewController</string> | ||
1059 | 420 | <object class="NSMutableDictionary" key="actions"> | ||
1060 | 421 | <string key="NS.key.0">logIn:</string> | ||
1061 | 422 | <string key="NS.object.0">id</string> | ||
1062 | 423 | </object> | ||
1063 | 424 | <object class="NSMutableDictionary" key="actionInfosByName"> | ||
1064 | 425 | <string key="NS.key.0">logIn:</string> | ||
1065 | 426 | <object class="IBActionInfo" key="NS.object.0"> | ||
1066 | 427 | <string key="name">logIn:</string> | ||
1067 | 428 | <string key="candidateClassName">id</string> | ||
1068 | 429 | </object> | ||
1069 | 430 | </object> | ||
1070 | 431 | <object class="NSMutableDictionary" key="outlets"> | ||
1071 | 432 | <bool key="EncodedWithXMLCoder">YES</bool> | ||
1072 | 433 | <object class="NSArray" key="dict.sortedKeys"> | ||
1073 | 434 | <bool key="EncodedWithXMLCoder">YES</bool> | ||
1074 | 435 | <string>emailField</string> | ||
1075 | 436 | <string>emailLabel</string> | ||
1076 | 437 | <string>loginButton</string> | ||
1077 | 438 | <string>passwordField</string> | ||
1078 | 439 | <string>passwordLabel</string> | ||
1079 | 440 | <string>patternView</string> | ||
1080 | 441 | <string>spinner</string> | ||
1081 | 442 | </object> | ||
1082 | 443 | <object class="NSArray" key="dict.values"> | ||
1083 | 444 | <bool key="EncodedWithXMLCoder">YES</bool> | ||
1084 | 445 | <string>UITextField</string> | ||
1085 | 446 | <string>UILabel</string> | ||
1086 | 447 | <string>UIButton</string> | ||
1087 | 448 | <string>UITextField</string> | ||
1088 | 449 | <string>UILabel</string> | ||
1089 | 450 | <string>UIView</string> | ||
1090 | 451 | <string>UIActivityIndicatorView</string> | ||
1091 | 452 | </object> | ||
1092 | 453 | </object> | ||
1093 | 454 | <object class="NSMutableDictionary" key="toOneOutletInfosByName"> | ||
1094 | 455 | <bool key="EncodedWithXMLCoder">YES</bool> | ||
1095 | 456 | <object class="NSArray" key="dict.sortedKeys"> | ||
1096 | 457 | <bool key="EncodedWithXMLCoder">YES</bool> | ||
1097 | 458 | <string>emailField</string> | ||
1098 | 459 | <string>emailLabel</string> | ||
1099 | 460 | <string>loginButton</string> | ||
1100 | 461 | <string>passwordField</string> | ||
1101 | 462 | <string>passwordLabel</string> | ||
1102 | 463 | <string>patternView</string> | ||
1103 | 464 | <string>spinner</string> | ||
1104 | 465 | </object> | ||
1105 | 466 | <object class="NSArray" key="dict.values"> | ||
1106 | 467 | <bool key="EncodedWithXMLCoder">YES</bool> | ||
1107 | 468 | <object class="IBToOneOutletInfo"> | ||
1108 | 469 | <string key="name">emailField</string> | ||
1109 | 470 | <string key="candidateClassName">UITextField</string> | ||
1110 | 471 | </object> | ||
1111 | 472 | <object class="IBToOneOutletInfo"> | ||
1112 | 473 | <string key="name">emailLabel</string> | ||
1113 | 474 | <string key="candidateClassName">UILabel</string> | ||
1114 | 475 | </object> | ||
1115 | 476 | <object class="IBToOneOutletInfo"> | ||
1116 | 477 | <string key="name">loginButton</string> | ||
1117 | 478 | <string key="candidateClassName">UIButton</string> | ||
1118 | 479 | </object> | ||
1119 | 480 | <object class="IBToOneOutletInfo"> | ||
1120 | 481 | <string key="name">passwordField</string> | ||
1121 | 482 | <string key="candidateClassName">UITextField</string> | ||
1122 | 483 | </object> | ||
1123 | 484 | <object class="IBToOneOutletInfo"> | ||
1124 | 485 | <string key="name">passwordLabel</string> | ||
1125 | 486 | <string key="candidateClassName">UILabel</string> | ||
1126 | 487 | </object> | ||
1127 | 488 | <object class="IBToOneOutletInfo"> | ||
1128 | 489 | <string key="name">patternView</string> | ||
1129 | 490 | <string key="candidateClassName">UIView</string> | ||
1130 | 491 | </object> | ||
1131 | 492 | <object class="IBToOneOutletInfo"> | ||
1132 | 493 | <string key="name">spinner</string> | ||
1133 | 494 | <string key="candidateClassName">UIActivityIndicatorView</string> | ||
1134 | 495 | </object> | ||
1135 | 496 | </object> | ||
1136 | 497 | </object> | ||
1137 | 498 | <object class="IBClassDescriptionSource" key="sourceIdentifier"> | ||
1138 | 499 | <string key="majorKey">IBProjectSource</string> | ||
1139 | 500 | <string key="minorKey">./Classes/U1SSOCredentialsViewController.h</string> | ||
1140 | 501 | </object> | ||
1141 | 502 | </object> | ||
1142 | 393 | </object> | 503 | </object> |
1143 | 394 | </object> | 504 | </object> |
1144 | 395 | <int key="IBDocument.localizationMode">0</int> | 505 | <int key="IBDocument.localizationMode">0</int> |
1145 | 396 | <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> | 506 | <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> |
1146 | 507 | <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> | ||
1147 | 508 | <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string> | ||
1148 | 509 | <real value="1296" key="NS.object.0"/> | ||
1149 | 510 | </object> | ||
1150 | 397 | <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> | 511 | <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> |
1151 | 398 | <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string> | 512 | <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string> |
1152 | 399 | <integer value="3000" key="NS.object.0"/> | 513 | <integer value="3000" key="NS.object.0"/> |
1153 | 400 | </object> | 514 | </object> |
1154 | 401 | <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> | 515 | <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> |
1155 | 402 | <int key="IBDocument.defaultPropertyAccessControl">3</int> | 516 | <int key="IBDocument.defaultPropertyAccessControl">3</int> |
1157 | 403 | <string key="IBCocoaTouchPluginVersion">933</string> | 517 | <string key="IBCocoaTouchPluginVersion">1498</string> |
1158 | 404 | </data> | 518 | </data> |
1159 | 405 | </archive> | 519 | </archive> |
1160 | 406 | 520 | ||
1161 | === modified file 'Files/U1SSOEmailVerificationViewController.m' | |||
1162 | --- Files/U1SSOEmailVerificationViewController.m 2012-01-19 15:52:37 +0000 | |||
1163 | +++ Files/U1SSOEmailVerificationViewController.m 2012-08-27 11:27:21 +0000 | |||
1164 | @@ -16,6 +16,34 @@ | |||
1165 | 16 | #import "U1SSOEmailVerificationViewController.h" | 16 | #import "U1SSOEmailVerificationViewController.h" |
1166 | 17 | 17 | ||
1167 | 18 | 18 | ||
1168 | 19 | @interface U1SSOEmailVerificationViewController () | ||
1169 | 20 | |||
1170 | 21 | @property (retain, nonatomic) IBOutlet UILabel *title; | ||
1171 | 22 | @property (retain, nonatomic) IBOutlet UILabel *description; | ||
1172 | 23 | |||
1173 | 24 | @end | ||
1174 | 25 | |||
1175 | 19 | @implementation U1SSOEmailVerificationViewController | 26 | @implementation U1SSOEmailVerificationViewController |
1177 | 20 | 27 | @synthesize title; | |
1178 | 28 | @synthesize description; | ||
1179 | 29 | |||
1180 | 30 | - (void)viewDidLoad | ||
1181 | 31 | { | ||
1182 | 32 | self.title.text = NSLocalizedString(@"Congratulations", nil); | ||
1183 | 33 | self.description.text = NSLocalizedString(@"A confirmation email has been sent to the address you provided.\n\nSimply follow the link in the email to activate your Ubuntu One account.", nil); | ||
1184 | 34 | } | ||
1185 | 35 | |||
1186 | 36 | - (void)dealloc | ||
1187 | 37 | { | ||
1188 | 38 | [title release]; | ||
1189 | 39 | [description release]; | ||
1190 | 40 | [super dealloc]; | ||
1191 | 41 | } | ||
1192 | 42 | |||
1193 | 43 | - (void)viewDidUnload | ||
1194 | 44 | { | ||
1195 | 45 | [self setTitle:nil]; | ||
1196 | 46 | [self setDescription:nil]; | ||
1197 | 47 | [super viewDidUnload]; | ||
1198 | 48 | } | ||
1199 | 21 | @end | 49 | @end |
1200 | 22 | 50 | ||
1201 | === modified file 'Files/U1SSOEmailVerificationViewController.xib' | |||
1202 | --- Files/U1SSOEmailVerificationViewController.xib 2012-01-19 15:52:37 +0000 | |||
1203 | +++ Files/U1SSOEmailVerificationViewController.xib 2012-08-27 11:27:21 +0000 | |||
1204 | @@ -1,20 +1,20 @@ | |||
1205 | 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
1206 | 2 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> | 2 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> |
1207 | 3 | <data> | 3 | <data> |
1213 | 4 | <int key="IBDocument.SystemTarget">1280</int> | 4 | <int key="IBDocument.SystemTarget">1296</int> |
1214 | 5 | <string key="IBDocument.SystemVersion">10K549</string> | 5 | <string key="IBDocument.SystemVersion">12B19</string> |
1215 | 6 | <string key="IBDocument.InterfaceBuilderVersion">1938</string> | 6 | <string key="IBDocument.InterfaceBuilderVersion">2549</string> |
1216 | 7 | <string key="IBDocument.AppKitVersion">1038.36</string> | 7 | <string key="IBDocument.AppKitVersion">1187</string> |
1217 | 8 | <string key="IBDocument.HIToolboxVersion">461.00</string> | 8 | <string key="IBDocument.HIToolboxVersion">624.00</string> |
1218 | 9 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> | 9 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> |
1219 | 10 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | 10 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
1221 | 11 | <string key="NS.object.0">933</string> | 11 | <string key="NS.object.0">1498</string> |
1222 | 12 | </object> | 12 | </object> |
1223 | 13 | <array key="IBDocument.IntegratedClassDependencies"> | 13 | <array key="IBDocument.IntegratedClassDependencies"> |
1224 | 14 | <string>IBProxyObject</string> | ||
1225 | 14 | <string>IBUIImageView</string> | 15 | <string>IBUIImageView</string> |
1226 | 16 | <string>IBUILabel</string> | ||
1227 | 15 | <string>IBUIView</string> | 17 | <string>IBUIView</string> |
1228 | 16 | <string>IBUILabel</string> | ||
1229 | 17 | <string>IBProxyObject</string> | ||
1230 | 18 | </array> | 18 | </array> |
1231 | 19 | <array key="IBDocument.PluginDependencies"> | 19 | <array key="IBDocument.PluginDependencies"> |
1232 | 20 | <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | 20 | <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
1233 | @@ -41,7 +41,6 @@ | |||
1234 | 41 | <int key="NSvFlags">274</int> | 41 | <int key="NSvFlags">274</int> |
1235 | 42 | <string key="NSFrame">{{0, -44}, {320, 416}}</string> | 42 | <string key="NSFrame">{{0, -44}, {320, 416}}</string> |
1236 | 43 | <reference key="NSSuperview" ref="191373211"/> | 43 | <reference key="NSSuperview" ref="191373211"/> |
1237 | 44 | <reference key="NSWindow"/> | ||
1238 | 45 | <reference key="NSNextKeyView" ref="362114594"/> | 44 | <reference key="NSNextKeyView" ref="362114594"/> |
1239 | 46 | <bool key="IBUIUserInteractionEnabled">NO</bool> | 45 | <bool key="IBUIUserInteractionEnabled">NO</bool> |
1240 | 47 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 46 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
1241 | @@ -55,7 +54,6 @@ | |||
1242 | 55 | <int key="NSvFlags">292</int> | 54 | <int key="NSvFlags">292</int> |
1243 | 56 | <string key="NSFrame">{{35, 28}, {250, 172}}</string> | 55 | <string key="NSFrame">{{35, 28}, {250, 172}}</string> |
1244 | 57 | <reference key="NSSuperview" ref="191373211"/> | 56 | <reference key="NSSuperview" ref="191373211"/> |
1245 | 58 | <reference key="NSWindow"/> | ||
1246 | 59 | <reference key="NSNextKeyView" ref="427494806"/> | 57 | <reference key="NSNextKeyView" ref="427494806"/> |
1247 | 60 | <bool key="IBUIClipsSubviews">YES</bool> | 58 | <bool key="IBUIClipsSubviews">YES</bool> |
1248 | 61 | <int key="IBUIContentMode">5</int> | 59 | <int key="IBUIContentMode">5</int> |
1249 | @@ -71,7 +69,6 @@ | |||
1250 | 71 | <int key="NSvFlags">292</int> | 69 | <int key="NSvFlags">292</int> |
1251 | 72 | <string key="NSFrame">{{76, 216}, {169, 27}}</string> | 70 | <string key="NSFrame">{{76, 216}, {169, 27}}</string> |
1252 | 73 | <reference key="NSSuperview" ref="191373211"/> | 71 | <reference key="NSSuperview" ref="191373211"/> |
1253 | 74 | <reference key="NSWindow"/> | ||
1254 | 75 | <reference key="NSNextKeyView" ref="828632858"/> | 72 | <reference key="NSNextKeyView" ref="828632858"/> |
1255 | 76 | <bool key="IBUIOpaque">NO</bool> | 73 | <bool key="IBUIOpaque">NO</bool> |
1256 | 77 | <bool key="IBUIClipsSubviews">YES</bool> | 74 | <bool key="IBUIClipsSubviews">YES</bool> |
1257 | @@ -101,8 +98,6 @@ | |||
1258 | 101 | <int key="NSvFlags">292</int> | 98 | <int key="NSvFlags">292</int> |
1259 | 102 | <string key="NSFrame">{{35, 251}, {250, 97}}</string> | 99 | <string key="NSFrame">{{35, 251}, {250, 97}}</string> |
1260 | 103 | <reference key="NSSuperview" ref="191373211"/> | 100 | <reference key="NSSuperview" ref="191373211"/> |
1261 | 104 | <reference key="NSWindow"/> | ||
1262 | 105 | <reference key="NSNextKeyView"/> | ||
1263 | 106 | <bool key="IBUIOpaque">NO</bool> | 101 | <bool key="IBUIOpaque">NO</bool> |
1264 | 107 | <bool key="IBUIClipsSubviews">YES</bool> | 102 | <bool key="IBUIClipsSubviews">YES</bool> |
1265 | 108 | <int key="IBUIContentMode">7</int> | 103 | <int key="IBUIContentMode">7</int> |
1266 | @@ -129,7 +124,6 @@ | |||
1267 | 129 | </array> | 124 | </array> |
1268 | 130 | <string key="NSFrame">{{0, 64}, {320, 416}}</string> | 125 | <string key="NSFrame">{{0, 64}, {320, 416}}</string> |
1269 | 131 | <reference key="NSSuperview"/> | 126 | <reference key="NSSuperview"/> |
1270 | 132 | <reference key="NSWindow"/> | ||
1271 | 133 | <reference key="NSNextKeyView" ref="897675393"/> | 127 | <reference key="NSNextKeyView" ref="897675393"/> |
1272 | 134 | <object class="NSColor" key="IBUIBackgroundColor"> | 128 | <object class="NSColor" key="IBUIBackgroundColor"> |
1273 | 135 | <int key="NSColorSpace">3</int> | 129 | <int key="NSColorSpace">3</int> |
1274 | @@ -155,6 +149,22 @@ | |||
1275 | 155 | </object> | 149 | </object> |
1276 | 156 | <int key="connectionID">3</int> | 150 | <int key="connectionID">3</int> |
1277 | 157 | </object> | 151 | </object> |
1278 | 152 | <object class="IBConnectionRecord"> | ||
1279 | 153 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
1280 | 154 | <string key="label">title</string> | ||
1281 | 155 | <reference key="source" ref="372490531"/> | ||
1282 | 156 | <reference key="destination" ref="427494806"/> | ||
1283 | 157 | </object> | ||
1284 | 158 | <int key="connectionID">9</int> | ||
1285 | 159 | </object> | ||
1286 | 160 | <object class="IBConnectionRecord"> | ||
1287 | 161 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
1288 | 162 | <string key="label">description</string> | ||
1289 | 163 | <reference key="source" ref="372490531"/> | ||
1290 | 164 | <reference key="destination" ref="828632858"/> | ||
1291 | 165 | </object> | ||
1292 | 166 | <int key="connectionID">10</int> | ||
1293 | 167 | </object> | ||
1294 | 158 | </array> | 168 | </array> |
1295 | 159 | <object class="IBMutableOrderedSet" key="objectRecords"> | 169 | <object class="IBMutableOrderedSet" key="objectRecords"> |
1296 | 160 | <array key="orderedObjects"> | 170 | <array key="orderedObjects"> |
1297 | @@ -223,28 +233,21 @@ | |||
1298 | 223 | <nil key="activeLocalization"/> | 233 | <nil key="activeLocalization"/> |
1299 | 224 | <dictionary class="NSMutableDictionary" key="localizations"/> | 234 | <dictionary class="NSMutableDictionary" key="localizations"/> |
1300 | 225 | <nil key="sourceID"/> | 235 | <nil key="sourceID"/> |
1315 | 226 | <int key="maxID">8</int> | 236 | <int key="maxID">10</int> |
1316 | 227 | </object> | 237 | </object> |
1317 | 228 | <object class="IBClassDescriber" key="IBDocument.Classes"> | 238 | <object class="IBClassDescriber" key="IBDocument.Classes"/> |
1304 | 229 | <array class="NSMutableArray" key="referencedPartialClassDescriptions"> | ||
1305 | 230 | <object class="IBPartialClassDescription"> | ||
1306 | 231 | <string key="className">U1SSOEmailVerificationViewController</string> | ||
1307 | 232 | <string key="superclassName">UIViewController</string> | ||
1308 | 233 | <object class="IBClassDescriptionSource" key="sourceIdentifier"> | ||
1309 | 234 | <string key="majorKey">IBProjectSource</string> | ||
1310 | 235 | <string key="minorKey">./Classes/U1SSOEmailVerificationViewController.h</string> | ||
1311 | 236 | </object> | ||
1312 | 237 | </object> | ||
1313 | 238 | </array> | ||
1314 | 239 | </object> | ||
1318 | 240 | <int key="IBDocument.localizationMode">0</int> | 239 | <int key="IBDocument.localizationMode">0</int> |
1319 | 241 | <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> | 240 | <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> |
1320 | 241 | <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> | ||
1321 | 242 | <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string> | ||
1322 | 243 | <real value="1296" key="NS.object.0"/> | ||
1323 | 244 | </object> | ||
1324 | 242 | <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> | 245 | <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> |
1325 | 243 | <int key="IBDocument.defaultPropertyAccessControl">3</int> | 246 | <int key="IBDocument.defaultPropertyAccessControl">3</int> |
1326 | 244 | <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> | 247 | <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> |
1327 | 245 | <string key="ios_files_bg.png">{320, 460}</string> | 248 | <string key="ios_files_bg.png">{320, 460}</string> |
1328 | 246 | <string key="slide0.png">{250, 200}</string> | 249 | <string key="slide0.png">{250, 200}</string> |
1329 | 247 | </dictionary> | 250 | </dictionary> |
1331 | 248 | <string key="IBCocoaTouchPluginVersion">933</string> | 251 | <string key="IBCocoaTouchPluginVersion">1498</string> |
1332 | 249 | </data> | 252 | </data> |
1333 | 250 | </archive> | 253 | </archive> |
1334 | 251 | 254 | ||
1335 | === modified file 'Files/U1SSOLandingPageViewController.h' | |||
1336 | --- Files/U1SSOLandingPageViewController.h 2012-01-19 15:52:37 +0000 | |||
1337 | +++ Files/U1SSOLandingPageViewController.h 2012-08-27 11:27:21 +0000 | |||
1338 | @@ -27,4 +27,7 @@ | |||
1339 | 27 | - (IBAction)signIn:(id)sender; | 27 | - (IBAction)signIn:(id)sender; |
1340 | 28 | - (IBAction)signUp:(id)sender; | 28 | - (IBAction)signUp:(id)sender; |
1341 | 29 | 29 | ||
1342 | 30 | @property (retain, nonatomic) IBOutlet UIButton *signInButton; | ||
1343 | 31 | @property (retain, nonatomic) IBOutlet UIButton *signUpButton; | ||
1344 | 32 | |||
1345 | 30 | @end | 33 | @end |
1346 | 31 | 34 | ||
1347 | === modified file 'Files/U1SSOLandingPageViewController.m' | |||
1348 | --- Files/U1SSOLandingPageViewController.m 2012-01-19 15:52:37 +0000 | |||
1349 | +++ Files/U1SSOLandingPageViewController.m 2012-08-27 11:27:21 +0000 | |||
1350 | @@ -19,13 +19,16 @@ | |||
1351 | 19 | 19 | ||
1352 | 20 | 20 | ||
1353 | 21 | @implementation U1SSOLandingPageViewController | 21 | @implementation U1SSOLandingPageViewController |
1355 | 22 | 22 | @synthesize signInButton; | |
1356 | 23 | @synthesize signUpButton; | ||
1357 | 23 | @synthesize signInAction, signUpAction; | 24 | @synthesize signInAction, signUpAction; |
1358 | 24 | 25 | ||
1359 | 25 | - (void)dealloc; | 26 | - (void)dealloc; |
1360 | 26 | { | 27 | { |
1361 | 27 | [signInAction release]; | 28 | [signInAction release]; |
1362 | 28 | [signUpAction release]; | 29 | [signUpAction release]; |
1363 | 30 | [signInButton release]; | ||
1364 | 31 | [signUpButton release]; | ||
1365 | 29 | [super dealloc]; | 32 | [super dealloc]; |
1366 | 30 | } | 33 | } |
1367 | 31 | 34 | ||
1368 | @@ -41,4 +44,19 @@ | |||
1369 | 41 | signUpAction(sender); | 44 | signUpAction(sender); |
1370 | 42 | } | 45 | } |
1371 | 43 | 46 | ||
1372 | 47 | - (void)viewDidLoad | ||
1373 | 48 | { | ||
1374 | 49 | [self.signInButton setTitle:NSLocalizedString(@"Sign in", nil) forState:UIControlStateNormal]; | ||
1375 | 50 | [self.signUpButton setTitle:NSLocalizedString(@"I don't have an account", nil) forState:UIControlStateNormal]; | ||
1376 | 51 | } | ||
1377 | 52 | |||
1378 | 53 | - (void)viewDidUnload | ||
1379 | 54 | { | ||
1380 | 55 | [self setSignInButton:nil]; | ||
1381 | 56 | [self setSignUpButton:nil]; | ||
1382 | 57 | [self setSignInButton:nil]; | ||
1383 | 58 | [self setSignUpButton:nil]; | ||
1384 | 59 | [self setSignUpButton:nil]; | ||
1385 | 60 | [super viewDidUnload]; | ||
1386 | 61 | } | ||
1387 | 44 | @end | 62 | @end |
1388 | 45 | 63 | ||
1389 | === modified file 'Files/U1SSOLandingPageViewController.xib' | |||
1390 | --- Files/U1SSOLandingPageViewController.xib 2012-01-19 15:52:37 +0000 | |||
1391 | +++ Files/U1SSOLandingPageViewController.xib 2012-08-27 11:27:21 +0000 | |||
1392 | @@ -1,20 +1,20 @@ | |||
1393 | 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
1394 | 2 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> | 2 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> |
1395 | 3 | <data> | 3 | <data> |
1401 | 4 | <int key="IBDocument.SystemTarget">1280</int> | 4 | <int key="IBDocument.SystemTarget">1296</int> |
1402 | 5 | <string key="IBDocument.SystemVersion">10K549</string> | 5 | <string key="IBDocument.SystemVersion">12B19</string> |
1403 | 6 | <string key="IBDocument.InterfaceBuilderVersion">1938</string> | 6 | <string key="IBDocument.InterfaceBuilderVersion">2549</string> |
1404 | 7 | <string key="IBDocument.AppKitVersion">1038.36</string> | 7 | <string key="IBDocument.AppKitVersion">1187</string> |
1405 | 8 | <string key="IBDocument.HIToolboxVersion">461.00</string> | 8 | <string key="IBDocument.HIToolboxVersion">624.00</string> |
1406 | 9 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> | 9 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> |
1407 | 10 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | 10 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
1409 | 11 | <string key="NS.object.0">933</string> | 11 | <string key="NS.object.0">1498</string> |
1410 | 12 | </object> | 12 | </object> |
1411 | 13 | <array key="IBDocument.IntegratedClassDependencies"> | 13 | <array key="IBDocument.IntegratedClassDependencies"> |
1412 | 14 | <string>IBProxyObject</string> | ||
1413 | 14 | <string>IBUIButton</string> | 15 | <string>IBUIButton</string> |
1414 | 15 | <string>IBUIImageView</string> | 16 | <string>IBUIImageView</string> |
1415 | 16 | <string>IBUIView</string> | 17 | <string>IBUIView</string> |
1416 | 17 | <string>IBProxyObject</string> | ||
1417 | 18 | </array> | 18 | </array> |
1418 | 19 | <array key="IBDocument.PluginDependencies"> | 19 | <array key="IBDocument.PluginDependencies"> |
1419 | 20 | <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | 20 | <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
1420 | @@ -155,7 +155,7 @@ | |||
1421 | 155 | <integer value="1"/> | 155 | <integer value="1"/> |
1422 | 156 | <integer value="3"/> | 156 | <integer value="3"/> |
1423 | 157 | </array> | 157 | </array> |
1425 | 158 | <array class="NSMutableArray" key="dict.values"> | 158 | <array key="dict.values"> |
1426 | 159 | <string>{320, 480}</string> | 159 | <string>{320, 480}</string> |
1427 | 160 | <string>{480, 320}</string> | 160 | <string>{480, 320}</string> |
1428 | 161 | </array> | 161 | </array> |
1429 | @@ -177,6 +177,22 @@ | |||
1430 | 177 | <int key="connectionID">3</int> | 177 | <int key="connectionID">3</int> |
1431 | 178 | </object> | 178 | </object> |
1432 | 179 | <object class="IBConnectionRecord"> | 179 | <object class="IBConnectionRecord"> |
1433 | 180 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
1434 | 181 | <string key="label">signInButton</string> | ||
1435 | 182 | <reference key="source" ref="372490531"/> | ||
1436 | 183 | <reference key="destination" ref="167575446"/> | ||
1437 | 184 | </object> | ||
1438 | 185 | <int key="connectionID">17</int> | ||
1439 | 186 | </object> | ||
1440 | 187 | <object class="IBConnectionRecord"> | ||
1441 | 188 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
1442 | 189 | <string key="label">signUpButton</string> | ||
1443 | 190 | <reference key="source" ref="372490531"/> | ||
1444 | 191 | <reference key="destination" ref="325598511"/> | ||
1445 | 192 | </object> | ||
1446 | 193 | <int key="connectionID">19</int> | ||
1447 | 194 | </object> | ||
1448 | 195 | <object class="IBConnectionRecord"> | ||
1449 | 180 | <object class="IBCocoaTouchEventConnection" key="connection"> | 196 | <object class="IBCocoaTouchEventConnection" key="connection"> |
1450 | 181 | <string key="label">signIn:</string> | 197 | <string key="label">signIn:</string> |
1451 | 182 | <reference key="source" ref="167575446"/> | 198 | <reference key="source" ref="167575446"/> |
1452 | @@ -271,7 +287,7 @@ | |||
1453 | 271 | <nil key="activeLocalization"/> | 287 | <nil key="activeLocalization"/> |
1454 | 272 | <dictionary class="NSMutableDictionary" key="localizations"/> | 288 | <dictionary class="NSMutableDictionary" key="localizations"/> |
1455 | 273 | <nil key="sourceID"/> | 289 | <nil key="sourceID"/> |
1457 | 274 | <int key="maxID">14</int> | 290 | <int key="maxID">19</int> |
1458 | 275 | </object> | 291 | </object> |
1459 | 276 | <object class="IBClassDescriber" key="IBDocument.Classes"> | 292 | <object class="IBClassDescriber" key="IBDocument.Classes"> |
1460 | 277 | <array class="NSMutableArray" key="referencedPartialClassDescriptions"> | 293 | <array class="NSMutableArray" key="referencedPartialClassDescriptions"> |
1461 | @@ -300,6 +316,20 @@ | |||
1462 | 300 | <string key="candidateClassName">id</string> | 316 | <string key="candidateClassName">id</string> |
1463 | 301 | </object> | 317 | </object> |
1464 | 302 | </dictionary> | 318 | </dictionary> |
1465 | 319 | <dictionary class="NSMutableDictionary" key="outlets"> | ||
1466 | 320 | <string key="signInButton">UIButton</string> | ||
1467 | 321 | <string key="signUpButton">UIButton</string> | ||
1468 | 322 | </dictionary> | ||
1469 | 323 | <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName"> | ||
1470 | 324 | <object class="IBToOneOutletInfo" key="signInButton"> | ||
1471 | 325 | <string key="name">signInButton</string> | ||
1472 | 326 | <string key="candidateClassName">UIButton</string> | ||
1473 | 327 | </object> | ||
1474 | 328 | <object class="IBToOneOutletInfo" key="signUpButton"> | ||
1475 | 329 | <string key="name">signUpButton</string> | ||
1476 | 330 | <string key="candidateClassName">UIButton</string> | ||
1477 | 331 | </object> | ||
1478 | 332 | </dictionary> | ||
1479 | 303 | <object class="IBClassDescriptionSource" key="sourceIdentifier"> | 333 | <object class="IBClassDescriptionSource" key="sourceIdentifier"> |
1480 | 304 | <string key="majorKey">IBProjectSource</string> | 334 | <string key="majorKey">IBProjectSource</string> |
1481 | 305 | <string key="minorKey">./Classes/U1SSOLandingPageViewController.h</string> | 335 | <string key="minorKey">./Classes/U1SSOLandingPageViewController.h</string> |
1482 | @@ -309,6 +339,10 @@ | |||
1483 | 309 | </object> | 339 | </object> |
1484 | 310 | <int key="IBDocument.localizationMode">0</int> | 340 | <int key="IBDocument.localizationMode">0</int> |
1485 | 311 | <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> | 341 | <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> |
1486 | 342 | <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> | ||
1487 | 343 | <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string> | ||
1488 | 344 | <real value="1296" key="NS.object.0"/> | ||
1489 | 345 | </object> | ||
1490 | 312 | <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> | 346 | <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> |
1491 | 313 | <int key="IBDocument.defaultPropertyAccessControl">3</int> | 347 | <int key="IBDocument.defaultPropertyAccessControl">3</int> |
1492 | 314 | <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> | 348 | <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> |
1493 | @@ -316,6 +350,6 @@ | |||
1494 | 316 | <string key="slide0.png">{250, 200}</string> | 350 | <string key="slide0.png">{250, 200}</string> |
1495 | 317 | <string key="slide0_logo.png">{88, 36}</string> | 351 | <string key="slide0_logo.png">{88, 36}</string> |
1496 | 318 | </dictionary> | 352 | </dictionary> |
1498 | 319 | <string key="IBCocoaTouchPluginVersion">933</string> | 353 | <string key="IBCocoaTouchPluginVersion">1498</string> |
1499 | 320 | </data> | 354 | </data> |
1500 | 321 | </archive> | 355 | </archive> |
1501 | 322 | 356 | ||
1502 | === modified file 'Files/U1SSOSignUpViewController.m' | |||
1503 | --- Files/U1SSOSignUpViewController.m 2012-05-18 18:41:43 +0000 | |||
1504 | +++ Files/U1SSOSignUpViewController.m 2012-08-27 11:27:21 +0000 | |||
1505 | @@ -59,10 +59,28 @@ | |||
1506 | 59 | - (BOOL)validateFields; | 59 | - (BOOL)validateFields; |
1507 | 60 | - (void)keyboardWasShown:(NSNotification *)notification; | 60 | - (void)keyboardWasShown:(NSNotification *)notification; |
1508 | 61 | - (void) keyboardWillHide:(NSNotification *)notification; | 61 | - (void) keyboardWillHide:(NSNotification *)notification; |
1509 | 62 | |||
1510 | 63 | @property (retain, nonatomic) IBOutlet UILabel *signUpTitleLabel; | ||
1511 | 64 | @property (retain, nonatomic) IBOutlet UILabel *signUpTitleDescriptionLabel; | ||
1512 | 65 | @property (retain, nonatomic) IBOutlet UILabel *passwordDescriptionLabel; | ||
1513 | 66 | @property (retain, nonatomic) IBOutlet UILabel *captchaHelpLabel; | ||
1514 | 67 | @property (retain, nonatomic) IBOutlet UILabel *captchaInstructionsLabel; | ||
1515 | 68 | @property (retain, nonatomic) IBOutlet UILabel *termsOfserviceLabel; | ||
1516 | 69 | @property (retain, nonatomic) IBOutlet UILabel *termsOfServiceLinkLabel; | ||
1517 | 70 | @property (retain, nonatomic) IBOutlet UIButton *signInButton; | ||
1518 | 71 | |||
1519 | 62 | @end | 72 | @end |
1520 | 63 | 73 | ||
1521 | 64 | 74 | ||
1522 | 65 | @implementation U1SSOSignUpViewController | 75 | @implementation U1SSOSignUpViewController |
1523 | 76 | @synthesize signUpTitleLabel; | ||
1524 | 77 | @synthesize signUpTitleDescriptionLabel; | ||
1525 | 78 | @synthesize passwordDescriptionLabel; | ||
1526 | 79 | @synthesize captchaHelpLabel; | ||
1527 | 80 | @synthesize captchaInstructionsLabel; | ||
1528 | 81 | @synthesize termsOfserviceLabel; | ||
1529 | 82 | @synthesize termsOfServiceLinkLabel; | ||
1530 | 83 | @synthesize signInButton; | ||
1531 | 66 | 84 | ||
1532 | 67 | @synthesize ssoProvider, signUpAction; | 85 | @synthesize ssoProvider, signUpAction; |
1533 | 68 | @synthesize scrollView; | 86 | @synthesize scrollView; |
1534 | @@ -97,12 +115,28 @@ | |||
1535 | 97 | [captchaLoadingIndicator release]; | 115 | [captchaLoadingIndicator release]; |
1536 | 98 | [captchaErrorLabel release]; | 116 | [captchaErrorLabel release]; |
1537 | 99 | [captchaId release]; | 117 | [captchaId release]; |
1538 | 118 | [signUpTitleLabel release]; | ||
1539 | 119 | [signUpTitleDescriptionLabel release]; | ||
1540 | 120 | [passwordDescriptionLabel release]; | ||
1541 | 121 | [captchaHelpLabel release]; | ||
1542 | 122 | [captchaInstructionsLabel release]; | ||
1543 | 123 | [termsOfserviceLabel release]; | ||
1544 | 124 | [termsOfServiceLinkLabel release]; | ||
1545 | 125 | [signInButton release]; | ||
1546 | 100 | [super dealloc]; | 126 | [super dealloc]; |
1547 | 101 | [[NSNotificationCenter defaultCenter] removeObserver:self]; | 127 | [[NSNotificationCenter defaultCenter] removeObserver:self]; |
1548 | 102 | } | 128 | } |
1549 | 103 | 129 | ||
1550 | 104 | - (void)viewDidUnload; | 130 | - (void)viewDidUnload; |
1551 | 105 | { | 131 | { |
1552 | 132 | [self setSignInButton:nil]; | ||
1553 | 133 | [self setTermsOfServiceLinkLabel:nil]; | ||
1554 | 134 | [self setTermsOfserviceLabel:nil]; | ||
1555 | 135 | [self setCaptchaInstructionsLabel:nil]; | ||
1556 | 136 | [self setCaptchaHelpLabel:nil]; | ||
1557 | 137 | [self setPasswordDescriptionLabel:nil]; | ||
1558 | 138 | [self setSignUpTitleDescriptionLabel:nil]; | ||
1559 | 139 | [self setSignUpTitleLabel:nil]; | ||
1560 | 106 | [[NSNotificationCenter defaultCenter] removeObserver:self]; | 140 | [[NSNotificationCenter defaultCenter] removeObserver:self]; |
1561 | 107 | } | 141 | } |
1562 | 108 | 142 | ||
1563 | @@ -123,6 +157,20 @@ | |||
1564 | 123 | selector:@selector(keyboardWillHide:) | 157 | selector:@selector(keyboardWillHide:) |
1565 | 124 | name:UIKeyboardWillHideNotification | 158 | name:UIKeyboardWillHideNotification |
1566 | 125 | object:nil]; | 159 | object:nil]; |
1567 | 160 | |||
1568 | 161 | // i18n | ||
1569 | 162 | self.signUpTitleLabel.text = NSLocalizedString(@"Sign up", nil); | ||
1570 | 163 | self.signUpTitleDescriptionLabel.text = NSLocalizedString(@"Please provide a few details below to register for your Ubuntu One account", nil); | ||
1571 | 164 | self.fullNameLabel.text = NSLocalizedString(@"Full name", nil); | ||
1572 | 165 | self.emailLabel.text = NSLocalizedString(@"Email", nil); | ||
1573 | 166 | self.passwordLabel.text = NSLocalizedString(@"Password", nil); | ||
1574 | 167 | self.passwordDescriptionLabel.text = NSLocalizedString(@"Must be at least 8 characters long and must contain at least one number and one upper case letter", nil); | ||
1575 | 168 | self.captchaLabel.text = NSLocalizedString(@"Security", nil); | ||
1576 | 169 | self.captchaHelpLabel.text = NSLocalizedString(@"(Can't read? Tap the image)", nil); | ||
1577 | 170 | self.captchaInstructionsLabel.text = NSLocalizedString(@"Type the two words:", nil); | ||
1578 | 171 | self.termsOfserviceLabel.text = NSLocalizedString(@"By creating an account you agree to the Ubuntu Account", nil); | ||
1579 | 172 | self.termsOfServiceLinkLabel.text = NSLocalizedString(@"Terms of Service", nil); | ||
1580 | 173 | [self.signInButton setTitle:NSLocalizedString(@"Sign up", nil) forState:UIControlStateNormal]; | ||
1581 | 126 | } | 174 | } |
1582 | 127 | 175 | ||
1583 | 128 | - (void)keyboardWasShown:(NSNotification *)notification; | 176 | - (void)keyboardWasShown:(NSNotification *)notification; |
1584 | 129 | 177 | ||
1585 | === modified file 'Files/U1SSOSignUpViewController.xib' | |||
1586 | --- Files/U1SSOSignUpViewController.xib 2012-02-06 18:05:36 +0000 | |||
1587 | +++ Files/U1SSOSignUpViewController.xib 2012-08-27 11:27:21 +0000 | |||
1588 | @@ -1,24 +1,24 @@ | |||
1589 | 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
1590 | 2 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> | 2 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> |
1591 | 3 | <data> | 3 | <data> |
1597 | 4 | <int key="IBDocument.SystemTarget">1280</int> | 4 | <int key="IBDocument.SystemTarget">1296</int> |
1598 | 5 | <string key="IBDocument.SystemVersion">10K549</string> | 5 | <string key="IBDocument.SystemVersion">12B19</string> |
1599 | 6 | <string key="IBDocument.InterfaceBuilderVersion">1938</string> | 6 | <string key="IBDocument.InterfaceBuilderVersion">2549</string> |
1600 | 7 | <string key="IBDocument.AppKitVersion">1038.36</string> | 7 | <string key="IBDocument.AppKitVersion">1187</string> |
1601 | 8 | <string key="IBDocument.HIToolboxVersion">461.00</string> | 8 | <string key="IBDocument.HIToolboxVersion">624.00</string> |
1602 | 9 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> | 9 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> |
1603 | 10 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | 10 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
1605 | 11 | <string key="NS.object.0">933</string> | 11 | <string key="NS.object.0">1498</string> |
1606 | 12 | </object> | 12 | </object> |
1607 | 13 | <array key="IBDocument.IntegratedClassDependencies"> | 13 | <array key="IBDocument.IntegratedClassDependencies"> |
1608 | 14 | <string>IBUIView</string> | ||
1609 | 15 | <string>IBProxyObject</string> | 14 | <string>IBProxyObject</string> |
1610 | 15 | <string>IBUIActivityIndicatorView</string> | ||
1611 | 16 | <string>IBUIButton</string> | ||
1612 | 17 | <string>IBUIImageView</string> | ||
1613 | 16 | <string>IBUILabel</string> | 18 | <string>IBUILabel</string> |
1616 | 17 | <string>IBUIImageView</string> | 19 | <string>IBUIScrollView</string> |
1615 | 18 | <string>IBUIActivityIndicatorView</string> | ||
1617 | 19 | <string>IBUITextField</string> | 20 | <string>IBUITextField</string> |
1620 | 20 | <string>IBUIScrollView</string> | 21 | <string>IBUIView</string> |
1619 | 21 | <string>IBUIButton</string> | ||
1621 | 22 | </array> | 22 | </array> |
1622 | 23 | <array key="IBDocument.PluginDependencies"> | 23 | <array key="IBDocument.PluginDependencies"> |
1623 | 24 | <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | 24 | <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
1624 | @@ -46,7 +46,6 @@ | |||
1625 | 46 | <string key="NSFrameSize">{320, 460}</string> | 46 | <string key="NSFrameSize">{320, 460}</string> |
1626 | 47 | <reference key="NSSuperview" ref="191373211"/> | 47 | <reference key="NSSuperview" ref="191373211"/> |
1627 | 48 | <reference key="NSWindow"/> | 48 | <reference key="NSWindow"/> |
1628 | 49 | <reference key="NSNextKeyView"/> | ||
1629 | 50 | <bool key="IBUIClipsSubviews">YES</bool> | 49 | <bool key="IBUIClipsSubviews">YES</bool> |
1630 | 51 | <bool key="IBUIMultipleTouchEnabled">YES</bool> | 50 | <bool key="IBUIMultipleTouchEnabled">YES</bool> |
1631 | 52 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 51 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
1632 | @@ -75,8 +74,8 @@ | |||
1633 | 75 | <array class="NSMutableArray" key="NSSubviews"> | 74 | <array class="NSMutableArray" key="NSSubviews"> |
1634 | 76 | <object class="IBUILabel" id="849601266"> | 75 | <object class="IBUILabel" id="849601266"> |
1635 | 77 | <reference key="NSNextResponder" ref="629509686"/> | 76 | <reference key="NSNextResponder" ref="629509686"/> |
1638 | 78 | <int key="NSvFlags">292</int> | 77 | <int key="NSvFlags">290</int> |
1639 | 79 | <string key="NSFrame">{{10, 12}, {55, 19}}</string> | 78 | <string key="NSFrame">{{10, 12}, {300, 19}}</string> |
1640 | 80 | <reference key="NSSuperview" ref="629509686"/> | 79 | <reference key="NSSuperview" ref="629509686"/> |
1641 | 81 | <reference key="NSWindow"/> | 80 | <reference key="NSWindow"/> |
1642 | 82 | <reference key="NSNextKeyView" ref="46520390"/> | 81 | <reference key="NSNextKeyView" ref="46520390"/> |
1643 | @@ -105,8 +104,8 @@ | |||
1644 | 105 | </object> | 104 | </object> |
1645 | 106 | <object class="IBUILabel" id="46520390"> | 105 | <object class="IBUILabel" id="46520390"> |
1646 | 107 | <reference key="NSNextResponder" ref="629509686"/> | 106 | <reference key="NSNextResponder" ref="629509686"/> |
1649 | 108 | <int key="NSvFlags">292</int> | 107 | <int key="NSvFlags">290</int> |
1650 | 109 | <string key="NSFrame">{{10, 28}, {290, 40}}</string> | 108 | <string key="NSFrame">{{10, 28}, {300, 40}}</string> |
1651 | 110 | <reference key="NSSuperview" ref="629509686"/> | 109 | <reference key="NSSuperview" ref="629509686"/> |
1652 | 111 | <reference key="NSWindow"/> | 110 | <reference key="NSWindow"/> |
1653 | 112 | <reference key="NSNextKeyView" ref="720438318"/> | 111 | <reference key="NSNextKeyView" ref="720438318"/> |
1654 | @@ -193,7 +192,7 @@ | |||
1655 | 193 | </object> | 192 | </object> |
1656 | 194 | <object class="IBUILabel" id="49460719"> | 193 | <object class="IBUILabel" id="49460719"> |
1657 | 195 | <reference key="NSNextResponder" ref="629509686"/> | 194 | <reference key="NSNextResponder" ref="629509686"/> |
1659 | 196 | <int key="NSvFlags">292</int> | 195 | <int key="NSvFlags">294</int> |
1660 | 197 | <string key="NSFrame">{{10, 434}, {71, 19}}</string> | 196 | <string key="NSFrame">{{10, 434}, {71, 19}}</string> |
1661 | 198 | <reference key="NSSuperview" ref="629509686"/> | 197 | <reference key="NSSuperview" ref="629509686"/> |
1662 | 199 | <reference key="NSWindow"/> | 198 | <reference key="NSWindow"/> |
1663 | @@ -254,8 +253,8 @@ | |||
1664 | 254 | </object> | 253 | </object> |
1665 | 255 | <object class="IBUILabel" id="809258214"> | 254 | <object class="IBUILabel" id="809258214"> |
1666 | 256 | <reference key="NSNextResponder" ref="629509686"/> | 255 | <reference key="NSNextResponder" ref="629509686"/> |
1669 | 257 | <int key="NSvFlags">292</int> | 256 | <int key="NSvFlags">291</int> |
1670 | 258 | <string key="NSFrame">{{77, 434}, {213, 19}}</string> | 257 | <string key="NSFrame">{{90, 434}, {213, 19}}</string> |
1671 | 259 | <reference key="NSSuperview" ref="629509686"/> | 258 | <reference key="NSSuperview" ref="629509686"/> |
1672 | 260 | <reference key="NSWindow"/> | 259 | <reference key="NSWindow"/> |
1673 | 261 | <reference key="NSNextKeyView" ref="1022502844"/> | 260 | <reference key="NSNextKeyView" ref="1022502844"/> |
1674 | @@ -274,7 +273,7 @@ | |||
1675 | 274 | </object> | 273 | </object> |
1676 | 275 | <object class="IBUILabel" id="586059788"> | 274 | <object class="IBUILabel" id="586059788"> |
1677 | 276 | <reference key="NSNextResponder" ref="629509686"/> | 275 | <reference key="NSNextResponder" ref="629509686"/> |
1679 | 277 | <int key="NSvFlags">292</int> | 276 | <int key="NSvFlags">290</int> |
1680 | 278 | <string key="NSFrame">{{10, 636}, {290, 40}}</string> | 277 | <string key="NSFrame">{{10, 636}, {290, 40}}</string> |
1681 | 279 | <reference key="NSSuperview" ref="629509686"/> | 278 | <reference key="NSSuperview" ref="629509686"/> |
1682 | 280 | <reference key="NSWindow"/> | 279 | <reference key="NSWindow"/> |
1683 | @@ -290,13 +289,14 @@ | |||
1684 | 290 | <int key="IBUIBaselineAdjustment">1</int> | 289 | <int key="IBUIBaselineAdjustment">1</int> |
1685 | 291 | <float key="IBUIMinimumFontSize">10</float> | 290 | <float key="IBUIMinimumFontSize">10</float> |
1686 | 292 | <int key="IBUINumberOfLines">2</int> | 291 | <int key="IBUINumberOfLines">2</int> |
1687 | 292 | <int key="IBUITextAlignment">1</int> | ||
1688 | 293 | <reference key="IBUIFontDescription" ref="887972801"/> | 293 | <reference key="IBUIFontDescription" ref="887972801"/> |
1689 | 294 | <reference key="IBUIFont" ref="837930100"/> | 294 | <reference key="IBUIFont" ref="837930100"/> |
1690 | 295 | </object> | 295 | </object> |
1691 | 296 | <object class="IBUILabel" id="318468596"> | 296 | <object class="IBUILabel" id="318468596"> |
1692 | 297 | <reference key="NSNextResponder" ref="629509686"/> | 297 | <reference key="NSNextResponder" ref="629509686"/> |
1695 | 298 | <int key="NSvFlags">292</int> | 298 | <int key="NSvFlags">295</int> |
1696 | 299 | <string key="NSFrame">{{127, 656}, {114, 19}}</string> | 299 | <string key="NSFrame">{{10, 684}, {293, 19}}</string> |
1697 | 300 | <reference key="NSSuperview" ref="629509686"/> | 300 | <reference key="NSSuperview" ref="629509686"/> |
1698 | 301 | <reference key="NSWindow"/> | 301 | <reference key="NSWindow"/> |
1699 | 302 | <reference key="NSNextKeyView" ref="237826680"/> | 302 | <reference key="NSNextKeyView" ref="237826680"/> |
1700 | @@ -313,6 +313,7 @@ | |||
1701 | 313 | <nil key="IBUIHighlightedColor"/> | 313 | <nil key="IBUIHighlightedColor"/> |
1702 | 314 | <int key="IBUIBaselineAdjustment">1</int> | 314 | <int key="IBUIBaselineAdjustment">1</int> |
1703 | 315 | <float key="IBUIMinimumFontSize">10</float> | 315 | <float key="IBUIMinimumFontSize">10</float> |
1704 | 316 | <int key="IBUITextAlignment">1</int> | ||
1705 | 316 | <object class="IBUIFontDescription" key="IBUIFontDescription"> | 317 | <object class="IBUIFontDescription" key="IBUIFontDescription"> |
1706 | 317 | <string key="name">Helvetica</string> | 318 | <string key="name">Helvetica</string> |
1707 | 318 | <string key="family">Helvetica</string> | 319 | <string key="family">Helvetica</string> |
1708 | @@ -323,11 +324,10 @@ | |||
1709 | 323 | </object> | 324 | </object> |
1710 | 324 | <object class="IBUIButton" id="237826680"> | 325 | <object class="IBUIButton" id="237826680"> |
1711 | 325 | <reference key="NSNextResponder" ref="629509686"/> | 326 | <reference key="NSNextResponder" ref="629509686"/> |
1714 | 326 | <int key="NSvFlags">292</int> | 327 | <int key="NSvFlags">269</int> |
1715 | 327 | <string key="NSFrame">{{23, 687}, {275, 45}}</string> | 328 | <string key="NSFrame">{{20, 719}, {275, 45}}</string> |
1716 | 328 | <reference key="NSSuperview" ref="629509686"/> | 329 | <reference key="NSSuperview" ref="629509686"/> |
1717 | 329 | <reference key="NSWindow"/> | 330 | <reference key="NSWindow"/> |
1718 | 330 | <reference key="NSNextKeyView"/> | ||
1719 | 331 | <bool key="IBUIOpaque">NO</bool> | 331 | <bool key="IBUIOpaque">NO</bool> |
1720 | 332 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 332 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
1721 | 333 | <int key="IBUIContentHorizontalAlignment">0</int> | 333 | <int key="IBUIContentHorizontalAlignment">0</int> |
1722 | @@ -704,7 +704,7 @@ | |||
1723 | 704 | <reference key="IBUIFont" ref="837930100"/> | 704 | <reference key="IBUIFont" ref="837930100"/> |
1724 | 705 | </object> | 705 | </object> |
1725 | 706 | </array> | 706 | </array> |
1727 | 707 | <string key="NSFrameSize">{320, 762}</string> | 707 | <string key="NSFrameSize">{320, 784}</string> |
1728 | 708 | <reference key="NSSuperview"/> | 708 | <reference key="NSSuperview"/> |
1729 | 709 | <reference key="NSWindow"/> | 709 | <reference key="NSWindow"/> |
1730 | 710 | <reference key="NSNextKeyView" ref="849601266"/> | 710 | <reference key="NSNextKeyView" ref="849601266"/> |
1731 | @@ -880,6 +880,70 @@ | |||
1732 | 880 | </object> | 880 | </object> |
1733 | 881 | <object class="IBConnectionRecord"> | 881 | <object class="IBConnectionRecord"> |
1734 | 882 | <object class="IBCocoaTouchOutletConnection" key="connection"> | 882 | <object class="IBCocoaTouchOutletConnection" key="connection"> |
1735 | 883 | <string key="label">signUpTitleLabel</string> | ||
1736 | 884 | <reference key="source" ref="372490531"/> | ||
1737 | 885 | <reference key="destination" ref="849601266"/> | ||
1738 | 886 | </object> | ||
1739 | 887 | <int key="connectionID">71</int> | ||
1740 | 888 | </object> | ||
1741 | 889 | <object class="IBConnectionRecord"> | ||
1742 | 890 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
1743 | 891 | <string key="label">signUpTitleDescriptionLabel</string> | ||
1744 | 892 | <reference key="source" ref="372490531"/> | ||
1745 | 893 | <reference key="destination" ref="46520390"/> | ||
1746 | 894 | </object> | ||
1747 | 895 | <int key="connectionID">72</int> | ||
1748 | 896 | </object> | ||
1749 | 897 | <object class="IBConnectionRecord"> | ||
1750 | 898 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
1751 | 899 | <string key="label">passwordDescriptionLabel</string> | ||
1752 | 900 | <reference key="source" ref="372490531"/> | ||
1753 | 901 | <reference key="destination" ref="203826180"/> | ||
1754 | 902 | </object> | ||
1755 | 903 | <int key="connectionID">73</int> | ||
1756 | 904 | </object> | ||
1757 | 905 | <object class="IBConnectionRecord"> | ||
1758 | 906 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
1759 | 907 | <string key="label">captchaHelpLabel</string> | ||
1760 | 908 | <reference key="source" ref="372490531"/> | ||
1761 | 909 | <reference key="destination" ref="809258214"/> | ||
1762 | 910 | </object> | ||
1763 | 911 | <int key="connectionID">74</int> | ||
1764 | 912 | </object> | ||
1765 | 913 | <object class="IBConnectionRecord"> | ||
1766 | 914 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
1767 | 915 | <string key="label">captchaInstructionsLabel</string> | ||
1768 | 916 | <reference key="source" ref="372490531"/> | ||
1769 | 917 | <reference key="destination" ref="803081875"/> | ||
1770 | 918 | </object> | ||
1771 | 919 | <int key="connectionID">75</int> | ||
1772 | 920 | </object> | ||
1773 | 921 | <object class="IBConnectionRecord"> | ||
1774 | 922 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
1775 | 923 | <string key="label">termsOfserviceLabel</string> | ||
1776 | 924 | <reference key="source" ref="372490531"/> | ||
1777 | 925 | <reference key="destination" ref="586059788"/> | ||
1778 | 926 | </object> | ||
1779 | 927 | <int key="connectionID">76</int> | ||
1780 | 928 | </object> | ||
1781 | 929 | <object class="IBConnectionRecord"> | ||
1782 | 930 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
1783 | 931 | <string key="label">termsOfServiceLinkLabel</string> | ||
1784 | 932 | <reference key="source" ref="372490531"/> | ||
1785 | 933 | <reference key="destination" ref="318468596"/> | ||
1786 | 934 | </object> | ||
1787 | 935 | <int key="connectionID">77</int> | ||
1788 | 936 | </object> | ||
1789 | 937 | <object class="IBConnectionRecord"> | ||
1790 | 938 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
1791 | 939 | <string key="label">signInButton</string> | ||
1792 | 940 | <reference key="source" ref="372490531"/> | ||
1793 | 941 | <reference key="destination" ref="237826680"/> | ||
1794 | 942 | </object> | ||
1795 | 943 | <int key="connectionID">79</int> | ||
1796 | 944 | </object> | ||
1797 | 945 | <object class="IBConnectionRecord"> | ||
1798 | 946 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
1799 | 883 | <string key="label">contentView</string> | 947 | <string key="label">contentView</string> |
1800 | 884 | <reference key="source" ref="980218375"/> | 948 | <reference key="source" ref="980218375"/> |
1801 | 885 | <reference key="destination" ref="629509686"/> | 949 | <reference key="destination" ref="629509686"/> |
1802 | @@ -972,10 +1036,7 @@ | |||
1803 | 972 | <reference ref="49460719"/> | 1036 | <reference ref="49460719"/> |
1804 | 973 | <reference ref="803081875"/> | 1037 | <reference ref="803081875"/> |
1805 | 974 | <reference ref="203826180"/> | 1038 | <reference ref="203826180"/> |
1806 | 975 | <reference ref="809258214"/> | ||
1807 | 976 | <reference ref="586059788"/> | 1039 | <reference ref="586059788"/> |
1808 | 977 | <reference ref="318468596"/> | ||
1809 | 978 | <reference ref="237826680"/> | ||
1810 | 979 | <reference ref="874486633"/> | 1040 | <reference ref="874486633"/> |
1811 | 980 | <reference ref="185575436"/> | 1041 | <reference ref="185575436"/> |
1812 | 981 | <reference ref="812140112"/> | 1042 | <reference ref="812140112"/> |
1813 | @@ -995,6 +1056,9 @@ | |||
1814 | 995 | <reference ref="453675168"/> | 1056 | <reference ref="453675168"/> |
1815 | 996 | <reference ref="253305833"/> | 1057 | <reference ref="253305833"/> |
1816 | 997 | <reference ref="525956263"/> | 1058 | <reference ref="525956263"/> |
1817 | 1059 | <reference ref="809258214"/> | ||
1818 | 1060 | <reference ref="318468596"/> | ||
1819 | 1061 | <reference ref="237826680"/> | ||
1820 | 998 | </array> | 1062 | </array> |
1821 | 999 | <reference key="parent" ref="0"/> | 1063 | <reference key="parent" ref="0"/> |
1822 | 1000 | </object> | 1064 | </object> |
1823 | @@ -1210,7 +1274,7 @@ | |||
1824 | 1210 | <nil key="activeLocalization"/> | 1274 | <nil key="activeLocalization"/> |
1825 | 1211 | <dictionary class="NSMutableDictionary" key="localizations"/> | 1275 | <dictionary class="NSMutableDictionary" key="localizations"/> |
1826 | 1212 | <nil key="sourceID"/> | 1276 | <nil key="sourceID"/> |
1828 | 1213 | <int key="maxID">70</int> | 1277 | <int key="maxID">79</int> |
1829 | 1214 | </object> | 1278 | </object> |
1830 | 1215 | <object class="IBClassDescriber" key="IBDocument.Classes"> | 1279 | <object class="IBClassDescriber" key="IBDocument.Classes"> |
1831 | 1216 | <array class="NSMutableArray" key="referencedPartialClassDescriptions"> | 1280 | <array class="NSMutableArray" key="referencedPartialClassDescriptions"> |
1832 | @@ -1242,7 +1306,9 @@ | |||
1833 | 1242 | <dictionary class="NSMutableDictionary" key="outlets"> | 1306 | <dictionary class="NSMutableDictionary" key="outlets"> |
1834 | 1243 | <string key="captchaErrorIndicator">UIImageView</string> | 1307 | <string key="captchaErrorIndicator">UIImageView</string> |
1835 | 1244 | <string key="captchaErrorLabel">UILabel</string> | 1308 | <string key="captchaErrorLabel">UILabel</string> |
1836 | 1309 | <string key="captchaHelpLabel">UILabel</string> | ||
1837 | 1245 | <string key="captchaImageView">UIImageView</string> | 1310 | <string key="captchaImageView">UIImageView</string> |
1838 | 1311 | <string key="captchaInstructionsLabel">UILabel</string> | ||
1839 | 1246 | <string key="captchaLabel">UILabel</string> | 1312 | <string key="captchaLabel">UILabel</string> |
1840 | 1247 | <string key="captchaLoadingIndicator">UIActivityIndicatorView</string> | 1313 | <string key="captchaLoadingIndicator">UIActivityIndicatorView</string> |
1841 | 1248 | <string key="captchaTextField">UITextField</string> | 1314 | <string key="captchaTextField">UITextField</string> |
1842 | @@ -1254,11 +1320,17 @@ | |||
1843 | 1254 | <string key="fullNameErrorLabel">UILabel</string> | 1320 | <string key="fullNameErrorLabel">UILabel</string> |
1844 | 1255 | <string key="fullNameLabel">UILabel</string> | 1321 | <string key="fullNameLabel">UILabel</string> |
1845 | 1256 | <string key="fullNameTextField">UITextField</string> | 1322 | <string key="fullNameTextField">UITextField</string> |
1846 | 1323 | <string key="passwordDescriptionLabel">UILabel</string> | ||
1847 | 1257 | <string key="passwordErrorIndicator">UIImageView</string> | 1324 | <string key="passwordErrorIndicator">UIImageView</string> |
1848 | 1258 | <string key="passwordErrorLabel">UILabel</string> | 1325 | <string key="passwordErrorLabel">UILabel</string> |
1849 | 1259 | <string key="passwordLabel">UILabel</string> | 1326 | <string key="passwordLabel">UILabel</string> |
1850 | 1260 | <string key="passwordTextField">UITextField</string> | 1327 | <string key="passwordTextField">UITextField</string> |
1851 | 1261 | <string key="scrollView">UIScrollView</string> | 1328 | <string key="scrollView">UIScrollView</string> |
1852 | 1329 | <string key="signInButton">UIButton</string> | ||
1853 | 1330 | <string key="signUpTitleDescriptionLabel">UILabel</string> | ||
1854 | 1331 | <string key="signUpTitleLabel">UILabel</string> | ||
1855 | 1332 | <string key="termsOfServiceLinkLabel">UILabel</string> | ||
1856 | 1333 | <string key="termsOfserviceLabel">UILabel</string> | ||
1857 | 1262 | </dictionary> | 1334 | </dictionary> |
1858 | 1263 | <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName"> | 1335 | <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName"> |
1859 | 1264 | <object class="IBToOneOutletInfo" key="captchaErrorIndicator"> | 1336 | <object class="IBToOneOutletInfo" key="captchaErrorIndicator"> |
1860 | @@ -1269,10 +1341,18 @@ | |||
1861 | 1269 | <string key="name">captchaErrorLabel</string> | 1341 | <string key="name">captchaErrorLabel</string> |
1862 | 1270 | <string key="candidateClassName">UILabel</string> | 1342 | <string key="candidateClassName">UILabel</string> |
1863 | 1271 | </object> | 1343 | </object> |
1864 | 1344 | <object class="IBToOneOutletInfo" key="captchaHelpLabel"> | ||
1865 | 1345 | <string key="name">captchaHelpLabel</string> | ||
1866 | 1346 | <string key="candidateClassName">UILabel</string> | ||
1867 | 1347 | </object> | ||
1868 | 1272 | <object class="IBToOneOutletInfo" key="captchaImageView"> | 1348 | <object class="IBToOneOutletInfo" key="captchaImageView"> |
1869 | 1273 | <string key="name">captchaImageView</string> | 1349 | <string key="name">captchaImageView</string> |
1870 | 1274 | <string key="candidateClassName">UIImageView</string> | 1350 | <string key="candidateClassName">UIImageView</string> |
1871 | 1275 | </object> | 1351 | </object> |
1872 | 1352 | <object class="IBToOneOutletInfo" key="captchaInstructionsLabel"> | ||
1873 | 1353 | <string key="name">captchaInstructionsLabel</string> | ||
1874 | 1354 | <string key="candidateClassName">UILabel</string> | ||
1875 | 1355 | </object> | ||
1876 | 1276 | <object class="IBToOneOutletInfo" key="captchaLabel"> | 1356 | <object class="IBToOneOutletInfo" key="captchaLabel"> |
1877 | 1277 | <string key="name">captchaLabel</string> | 1357 | <string key="name">captchaLabel</string> |
1878 | 1278 | <string key="candidateClassName">UILabel</string> | 1358 | <string key="candidateClassName">UILabel</string> |
1879 | @@ -1317,6 +1397,10 @@ | |||
1880 | 1317 | <string key="name">fullNameTextField</string> | 1397 | <string key="name">fullNameTextField</string> |
1881 | 1318 | <string key="candidateClassName">UITextField</string> | 1398 | <string key="candidateClassName">UITextField</string> |
1882 | 1319 | </object> | 1399 | </object> |
1883 | 1400 | <object class="IBToOneOutletInfo" key="passwordDescriptionLabel"> | ||
1884 | 1401 | <string key="name">passwordDescriptionLabel</string> | ||
1885 | 1402 | <string key="candidateClassName">UILabel</string> | ||
1886 | 1403 | </object> | ||
1887 | 1320 | <object class="IBToOneOutletInfo" key="passwordErrorIndicator"> | 1404 | <object class="IBToOneOutletInfo" key="passwordErrorIndicator"> |
1888 | 1321 | <string key="name">passwordErrorIndicator</string> | 1405 | <string key="name">passwordErrorIndicator</string> |
1889 | 1322 | <string key="candidateClassName">UIImageView</string> | 1406 | <string key="candidateClassName">UIImageView</string> |
1890 | @@ -1337,6 +1421,26 @@ | |||
1891 | 1337 | <string key="name">scrollView</string> | 1421 | <string key="name">scrollView</string> |
1892 | 1338 | <string key="candidateClassName">UIScrollView</string> | 1422 | <string key="candidateClassName">UIScrollView</string> |
1893 | 1339 | </object> | 1423 | </object> |
1894 | 1424 | <object class="IBToOneOutletInfo" key="signInButton"> | ||
1895 | 1425 | <string key="name">signInButton</string> | ||
1896 | 1426 | <string key="candidateClassName">UIButton</string> | ||
1897 | 1427 | </object> | ||
1898 | 1428 | <object class="IBToOneOutletInfo" key="signUpTitleDescriptionLabel"> | ||
1899 | 1429 | <string key="name">signUpTitleDescriptionLabel</string> | ||
1900 | 1430 | <string key="candidateClassName">UILabel</string> | ||
1901 | 1431 | </object> | ||
1902 | 1432 | <object class="IBToOneOutletInfo" key="signUpTitleLabel"> | ||
1903 | 1433 | <string key="name">signUpTitleLabel</string> | ||
1904 | 1434 | <string key="candidateClassName">UILabel</string> | ||
1905 | 1435 | </object> | ||
1906 | 1436 | <object class="IBToOneOutletInfo" key="termsOfServiceLinkLabel"> | ||
1907 | 1437 | <string key="name">termsOfServiceLinkLabel</string> | ||
1908 | 1438 | <string key="candidateClassName">UILabel</string> | ||
1909 | 1439 | </object> | ||
1910 | 1440 | <object class="IBToOneOutletInfo" key="termsOfserviceLabel"> | ||
1911 | 1441 | <string key="name">termsOfserviceLabel</string> | ||
1912 | 1442 | <string key="candidateClassName">UILabel</string> | ||
1913 | 1443 | </object> | ||
1914 | 1340 | </dictionary> | 1444 | </dictionary> |
1915 | 1341 | <object class="IBClassDescriptionSource" key="sourceIdentifier"> | 1445 | <object class="IBClassDescriptionSource" key="sourceIdentifier"> |
1916 | 1342 | <string key="majorKey">IBProjectSource</string> | 1446 | <string key="majorKey">IBProjectSource</string> |
1917 | @@ -1366,12 +1470,16 @@ | |||
1918 | 1366 | </object> | 1470 | </object> |
1919 | 1367 | <int key="IBDocument.localizationMode">0</int> | 1471 | <int key="IBDocument.localizationMode">0</int> |
1920 | 1368 | <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> | 1472 | <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> |
1921 | 1473 | <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> | ||
1922 | 1474 | <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string> | ||
1923 | 1475 | <real value="1296" key="NS.object.0"/> | ||
1924 | 1476 | </object> | ||
1925 | 1369 | <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> | 1477 | <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> |
1926 | 1370 | <int key="IBDocument.defaultPropertyAccessControl">3</int> | 1478 | <int key="IBDocument.defaultPropertyAccessControl">3</int> |
1927 | 1371 | <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> | 1479 | <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> |
1928 | 1372 | <string key="NS.key.0">indicator_input_error.png</string> | 1480 | <string key="NS.key.0">indicator_input_error.png</string> |
1929 | 1373 | <string key="NS.object.0">{15, 15}</string> | 1481 | <string key="NS.object.0">{15, 15}</string> |
1930 | 1374 | </object> | 1482 | </object> |
1932 | 1375 | <string key="IBCocoaTouchPluginVersion">933</string> | 1483 | <string key="IBCocoaTouchPluginVersion">1498</string> |
1933 | 1376 | </data> | 1484 | </data> |
1934 | 1377 | </archive> | 1485 | </archive> |
1935 | 1378 | 1486 | ||
1936 | === modified file 'Files/U1SettingsViewController.h' | |||
1937 | --- Files/U1SettingsViewController.h 2011-12-13 20:15:22 +0000 | |||
1938 | +++ Files/U1SettingsViewController.h 2012-08-27 11:27:21 +0000 | |||
1939 | @@ -23,6 +23,7 @@ | |||
1940 | 23 | @property (retain) IBOutlet U1NavigationBar *navBar; | 23 | @property (retain) IBOutlet U1NavigationBar *navBar; |
1941 | 24 | @property (retain) IBOutlet UITableViewCell *autoUploadToggleCell; | 24 | @property (retain) IBOutlet UITableViewCell *autoUploadToggleCell; |
1942 | 25 | @property (retain) IBOutlet UISwitch *autoUploadToggle; | 25 | @property (retain) IBOutlet UISwitch *autoUploadToggle; |
1943 | 26 | @property (retain, nonatomic) IBOutlet UILabel *autoUploadTogleCellLabel; | ||
1944 | 26 | @property (retain) IBOutlet UITableViewCell *wifiOnlyToggleCell; | 27 | @property (retain) IBOutlet UITableViewCell *wifiOnlyToggleCell; |
1945 | 27 | @property (retain) IBOutlet UILabel *wifiOnlyToggleLabel; | 28 | @property (retain) IBOutlet UILabel *wifiOnlyToggleLabel; |
1946 | 28 | @property (retain) IBOutlet UISwitch *wifiOnlyToggle; | 29 | @property (retain) IBOutlet UISwitch *wifiOnlyToggle; |
1947 | @@ -31,9 +32,11 @@ | |||
1948 | 31 | @property (retain) IBOutlet UISwitch *includeVideoToggle; | 32 | @property (retain) IBOutlet UISwitch *includeVideoToggle; |
1949 | 32 | @property (retain) IBOutlet UITableViewCell *disableSleepToggleCell; | 33 | @property (retain) IBOutlet UITableViewCell *disableSleepToggleCell; |
1950 | 33 | @property (retain) IBOutlet UILabel *disableSleepToggleLabel; | 34 | @property (retain) IBOutlet UILabel *disableSleepToggleLabel; |
1951 | 35 | @property (retain, nonatomic) IBOutlet UILabel *disableSleepToggleDescription; | ||
1952 | 34 | @property (retain) IBOutlet UISwitch *disableSleepToggle; | 36 | @property (retain) IBOutlet UISwitch *disableSleepToggle; |
1953 | 35 | @property (retain) IBOutlet UITableView *tableView; | 37 | @property (retain) IBOutlet UITableView *tableView; |
1954 | 36 | 38 | ||
1955 | 39 | |||
1956 | 37 | - (IBAction)toggleAutoUpload:(id)sender; | 40 | - (IBAction)toggleAutoUpload:(id)sender; |
1957 | 38 | - (IBAction)toggleWifiOnly:(id)sender; | 41 | - (IBAction)toggleWifiOnly:(id)sender; |
1958 | 39 | - (IBAction)toggleIncludeVideo:(id)sender; | 42 | - (IBAction)toggleIncludeVideo:(id)sender; |
1959 | 40 | 43 | ||
1960 | === modified file 'Files/U1SettingsViewController.m' | |||
1961 | --- Files/U1SettingsViewController.m 2012-08-10 03:19:46 +0000 | |||
1962 | +++ Files/U1SettingsViewController.m 2012-08-27 11:27:21 +0000 | |||
1963 | @@ -42,7 +42,8 @@ | |||
1964 | 42 | 42 | ||
1965 | 43 | 43 | ||
1966 | 44 | @implementation U1SettingsViewController | 44 | @implementation U1SettingsViewController |
1968 | 45 | 45 | @synthesize disableSleepToggleDescription; | |
1969 | 46 | @synthesize autoUploadTogleCellLabel; | ||
1970 | 46 | @synthesize navBar, tableView; | 47 | @synthesize navBar, tableView; |
1971 | 47 | @synthesize autoUploadToggleCell, autoUploadToggle; | 48 | @synthesize autoUploadToggleCell, autoUploadToggle; |
1972 | 48 | @synthesize wifiOnlyToggleCell, wifiOnlyToggleLabel, wifiOnlyToggle; | 49 | @synthesize wifiOnlyToggleCell, wifiOnlyToggleLabel, wifiOnlyToggle; |
1973 | @@ -77,6 +78,8 @@ | |||
1974 | 77 | [disableSleepToggle release]; | 78 | [disableSleepToggle release]; |
1975 | 78 | [filesClient release]; | 79 | [filesClient release]; |
1976 | 79 | [accountInfo release]; | 80 | [accountInfo release]; |
1977 | 81 | [autoUploadTogleCellLabel release]; | ||
1978 | 82 | [disableSleepToggleDescription release]; | ||
1979 | 80 | [super dealloc]; | 83 | [super dealloc]; |
1980 | 81 | } | 84 | } |
1981 | 82 | 85 | ||
1982 | @@ -90,6 +93,15 @@ | |||
1983 | 90 | return accountLoadingCell; | 93 | return accountLoadingCell; |
1984 | 91 | } | 94 | } |
1985 | 92 | 95 | ||
1986 | 96 | - (void)viewDidLoad | ||
1987 | 97 | { | ||
1988 | 98 | self.autoUploadTogleCellLabel.text = NSLocalizedString(@"Enabled", nil); | ||
1989 | 99 | self.includeVideoToggleLabel.text = NSLocalizedString(@"Include Videos", nil); | ||
1990 | 100 | self.wifiOnlyToggleLabel.text = NSLocalizedString(@"Wifi-Only", nil); | ||
1991 | 101 | self.disableSleepToggleLabel.text = NSLocalizedString(@"Nightstand Mode", nil); | ||
1992 | 102 | self.disableSleepToggleDescription.text = NSLocalizedString(@"Disables sleep while uploading if the device is charging", nil); | ||
1993 | 103 | } | ||
1994 | 104 | |||
1995 | 93 | - (void)viewWillAppear:(BOOL)animated; | 105 | - (void)viewWillAppear:(BOOL)animated; |
1996 | 94 | { | 106 | { |
1997 | 95 | [super viewWillAppear:animated]; | 107 | [super viewWillAppear:animated]; |
1998 | @@ -103,7 +115,7 @@ | |||
1999 | 103 | - (IBAction)signOut:(id)sender; | 115 | - (IBAction)signOut:(id)sender; |
2000 | 104 | { | 116 | { |
2001 | 105 | // TODO: get actual copy for this from design team | 117 | // TODO: get actual copy for this from design team |
2003 | 106 | UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:@"Signing out on this device will not affect other devices connected to Ubuntu One." delegate:self cancelButtonTitle:@"Cancel" destructiveButtonTitle:@"Sign Out" otherButtonTitles:nil]; | 118 | UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Signing out on this device will not affect other devices connected to Ubuntu One", nil) delegate:self cancelButtonTitle:NSLocalizedString(@"Cancel", nil) destructiveButtonTitle:NSLocalizedString(@"Sign Out", nil) otherButtonTitles:nil]; |
2004 | 107 | [actionSheet showFromTabBar:self.tabBarController.tabBar]; | 119 | [actionSheet showFromTabBar:self.tabBarController.tabBar]; |
2005 | 108 | [actionSheet release]; | 120 | [actionSheet release]; |
2006 | 109 | } | 121 | } |
2007 | @@ -235,7 +247,7 @@ | |||
2008 | 235 | { | 247 | { |
2009 | 236 | case 0: | 248 | case 0: |
2010 | 237 | [cell.textLabel setText:NSLocalizedString(@"Name", nil)]; | 249 | [cell.textLabel setText:NSLocalizedString(@"Name", nil)]; |
2012 | 238 | [cell.detailTextLabel setText:@"Loading..."]; | 250 | [cell.detailTextLabel setText:NSLocalizedString(@"Loading...", nil)]; |
2013 | 239 | if (self.accountInfo) | 251 | if (self.accountInfo) |
2014 | 240 | [cell.detailTextLabel setText:[self.accountInfo objectForKey:@"visible_name"]]; | 252 | [cell.detailTextLabel setText:[self.accountInfo objectForKey:@"visible_name"]]; |
2015 | 241 | break; | 253 | break; |
2016 | @@ -246,7 +258,7 @@ | |||
2017 | 246 | NSString *storageFormat = NSLocalizedString(@"%@ of %@ used", nil); | 258 | NSString *storageFormat = NSLocalizedString(@"%@ of %@ used", nil); |
2018 | 247 | NSString *usedString = [byteSizeTransformer transformedValue:[self.accountInfo objectForKey:@"used_bytes"]]; | 259 | NSString *usedString = [byteSizeTransformer transformedValue:[self.accountInfo objectForKey:@"used_bytes"]]; |
2019 | 248 | NSString *totalString = [byteSizeTransformer transformedValue:[self.accountInfo objectForKey:@"max_bytes"]]; | 260 | NSString *totalString = [byteSizeTransformer transformedValue:[self.accountInfo objectForKey:@"max_bytes"]]; |
2021 | 249 | [cell.detailTextLabel setText:@"Loading..."]; | 261 | [cell.detailTextLabel setText:NSLocalizedString(@"Loading...", nil)]; |
2022 | 250 | if (self.accountInfo) | 262 | if (self.accountInfo) |
2023 | 251 | [cell.detailTextLabel setText:[NSString stringWithFormat:storageFormat, usedString, totalString]]; | 263 | [cell.detailTextLabel setText:[NSString stringWithFormat:storageFormat, usedString, totalString]]; |
2024 | 252 | [byteSizeTransformer release]; | 264 | [byteSizeTransformer release]; |
2025 | @@ -295,7 +307,7 @@ | |||
2026 | 295 | [footerView addSubview:signOutButton]; | 307 | [footerView addSubview:signOutButton]; |
2027 | 296 | UIImage *buttonImage = [[UIImage imageNamed:@"ios_files_buttonBG"] stretchableImageWithLeftCapWidth:0 topCapHeight:0]; | 308 | UIImage *buttonImage = [[UIImage imageNamed:@"ios_files_buttonBG"] stretchableImageWithLeftCapWidth:0 topCapHeight:0]; |
2028 | 297 | [signOutButton setBackgroundImage:buttonImage forState:UIControlStateNormal]; | 309 | [signOutButton setBackgroundImage:buttonImage forState:UIControlStateNormal]; |
2030 | 298 | [signOutButton setTitle:@"Sign Out of Ubuntu One" forState:UIControlStateNormal]; | 310 | [signOutButton setTitle:NSLocalizedString(@"Sign Out of Ubuntu One", nil) forState:UIControlStateNormal]; |
2031 | 299 | [signOutButton.titleLabel setFont:[UIFont boldSystemFontOfSize:14.f]]; | 311 | [signOutButton.titleLabel setFont:[UIFont boldSystemFontOfSize:14.f]]; |
2032 | 300 | [signOutButton.layer setCornerRadius:8.f]; | 312 | [signOutButton.layer setCornerRadius:8.f]; |
2033 | 301 | [signOutButton setClipsToBounds:YES]; | 313 | [signOutButton setClipsToBounds:YES]; |
2034 | @@ -377,4 +389,10 @@ | |||
2035 | 377 | return self.disableSleepToggleCell; | 389 | return self.disableSleepToggleCell; |
2036 | 378 | } | 390 | } |
2037 | 379 | 391 | ||
2038 | 392 | - (void)viewDidUnload { | ||
2039 | 393 | [self setAutoUploadTogleCellLabel:nil]; | ||
2040 | 394 | [self setDisableSleepToggleDescription:nil]; | ||
2041 | 395 | [super viewDidUnload]; | ||
2042 | 396 | } | ||
2043 | 397 | |||
2044 | 380 | @end | 398 | @end |
2045 | 381 | 399 | ||
2046 | === modified file 'Files/U1SettingsViewController.xib' | |||
2047 | --- Files/U1SettingsViewController.xib 2011-12-15 18:56:43 +0000 | |||
2048 | +++ Files/U1SettingsViewController.xib 2012-08-27 11:27:21 +0000 | |||
2049 | @@ -1,22 +1,22 @@ | |||
2050 | 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2051 | 2 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> | 2 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> |
2052 | 3 | <data> | 3 | <data> |
2058 | 4 | <int key="IBDocument.SystemTarget">1280</int> | 4 | <int key="IBDocument.SystemTarget">1296</int> |
2059 | 5 | <string key="IBDocument.SystemVersion">10K549</string> | 5 | <string key="IBDocument.SystemVersion">12B19</string> |
2060 | 6 | <string key="IBDocument.InterfaceBuilderVersion">1938</string> | 6 | <string key="IBDocument.InterfaceBuilderVersion">2549</string> |
2061 | 7 | <string key="IBDocument.AppKitVersion">1038.36</string> | 7 | <string key="IBDocument.AppKitVersion">1187</string> |
2062 | 8 | <string key="IBDocument.HIToolboxVersion">461.00</string> | 8 | <string key="IBDocument.HIToolboxVersion">624.00</string> |
2063 | 9 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> | 9 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> |
2064 | 10 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | 10 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
2066 | 11 | <string key="NS.object.0">933</string> | 11 | <string key="NS.object.0">1498</string> |
2067 | 12 | </object> | 12 | </object> |
2068 | 13 | <array key="IBDocument.IntegratedClassDependencies"> | 13 | <array key="IBDocument.IntegratedClassDependencies"> |
2069 | 14 | <string>IBProxyObject</string> | ||
2070 | 15 | <string>IBUILabel</string> | ||
2071 | 14 | <string>IBUISwitch</string> | 16 | <string>IBUISwitch</string> |
2072 | 15 | <string>IBUITableView</string> | 17 | <string>IBUITableView</string> |
2073 | 16 | <string>IBUITableViewCell</string> | 18 | <string>IBUITableViewCell</string> |
2074 | 17 | <string>IBUIView</string> | 19 | <string>IBUIView</string> |
2075 | 18 | <string>IBUILabel</string> | ||
2076 | 19 | <string>IBProxyObject</string> | ||
2077 | 20 | </array> | 20 | </array> |
2078 | 21 | <array key="IBDocument.PluginDependencies"> | 21 | <array key="IBDocument.PluginDependencies"> |
2079 | 22 | <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | 22 | <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
2080 | @@ -43,7 +43,7 @@ | |||
2081 | 43 | <int key="NSvFlags">274</int> | 43 | <int key="NSvFlags">274</int> |
2082 | 44 | <string key="NSFrameSize">{320, 460}</string> | 44 | <string key="NSFrameSize">{320, 460}</string> |
2083 | 45 | <reference key="NSSuperview" ref="191373211"/> | 45 | <reference key="NSSuperview" ref="191373211"/> |
2085 | 46 | <reference key="NSWindow"/> | 46 | <reference key="NSNextKeyView"/> |
2086 | 47 | <object class="NSColor" key="IBUIBackgroundColor"> | 47 | <object class="NSColor" key="IBUIBackgroundColor"> |
2087 | 48 | <int key="NSColorSpace">10</int> | 48 | <int key="NSColorSpace">10</int> |
2088 | 49 | <object class="NSImage" key="NSImage"> | 49 | <object class="NSImage" key="NSImage"> |
2089 | @@ -116,7 +116,6 @@ | |||
2090 | 116 | </array> | 116 | </array> |
2091 | 117 | <string key="NSFrame">{{0, 20}, {320, 460}}</string> | 117 | <string key="NSFrame">{{0, 20}, {320, 460}}</string> |
2092 | 118 | <reference key="NSSuperview"/> | 118 | <reference key="NSSuperview"/> |
2093 | 119 | <reference key="NSWindow"/> | ||
2094 | 120 | <reference key="NSNextKeyView" ref="703168831"/> | 119 | <reference key="NSNextKeyView" ref="703168831"/> |
2095 | 121 | <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/> | 120 | <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/> |
2096 | 122 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 121 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
2097 | @@ -134,7 +133,7 @@ | |||
2098 | 134 | <int key="NSvFlags">289</int> | 133 | <int key="NSvFlags">289</int> |
2099 | 135 | <string key="NSFrame">{{217, 8}, {94, 27}}</string> | 134 | <string key="NSFrame">{{217, 8}, {94, 27}}</string> |
2100 | 136 | <reference key="NSSuperview" ref="289125020"/> | 135 | <reference key="NSSuperview" ref="289125020"/> |
2102 | 137 | <reference key="NSWindow"/> | 136 | <reference key="NSNextKeyView"/> |
2103 | 138 | <bool key="IBUIOpaque">NO</bool> | 137 | <bool key="IBUIOpaque">NO</bool> |
2104 | 139 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 138 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
2105 | 140 | <int key="IBUIContentHorizontalAlignment">0</int> | 139 | <int key="IBUIContentHorizontalAlignment">0</int> |
2106 | @@ -142,10 +141,9 @@ | |||
2107 | 142 | </object> | 141 | </object> |
2108 | 143 | <object class="IBUILabel" id="866302443"> | 142 | <object class="IBUILabel" id="866302443"> |
2109 | 144 | <reference key="NSNextResponder" ref="289125020"/> | 143 | <reference key="NSNextResponder" ref="289125020"/> |
2111 | 145 | <int key="NSvFlags">292</int> | 144 | <int key="NSvFlags">278</int> |
2112 | 146 | <string key="NSFrame">{{10, 11}, {193, 21}}</string> | 145 | <string key="NSFrame">{{10, 11}, {193, 21}}</string> |
2113 | 147 | <reference key="NSSuperview" ref="289125020"/> | 146 | <reference key="NSSuperview" ref="289125020"/> |
2114 | 148 | <reference key="NSWindow"/> | ||
2115 | 149 | <reference key="NSNextKeyView" ref="513262918"/> | 147 | <reference key="NSNextKeyView" ref="513262918"/> |
2116 | 150 | <bool key="IBUIOpaque">NO</bool> | 148 | <bool key="IBUIOpaque">NO</bool> |
2117 | 151 | <bool key="IBUIClipsSubviews">YES</bool> | 149 | <bool key="IBUIClipsSubviews">YES</bool> |
2118 | @@ -173,7 +171,6 @@ | |||
2119 | 173 | </array> | 171 | </array> |
2120 | 174 | <string key="NSFrameSize">{320, 43}</string> | 172 | <string key="NSFrameSize">{320, 43}</string> |
2121 | 175 | <reference key="NSSuperview" ref="126074602"/> | 173 | <reference key="NSSuperview" ref="126074602"/> |
2122 | 176 | <reference key="NSWindow"/> | ||
2123 | 177 | <reference key="NSNextKeyView" ref="866302443"/> | 174 | <reference key="NSNextKeyView" ref="866302443"/> |
2124 | 178 | <reference key="IBUIBackgroundColor" ref="509795101"/> | 175 | <reference key="IBUIBackgroundColor" ref="509795101"/> |
2125 | 179 | <bool key="IBUIOpaque">NO</bool> | 176 | <bool key="IBUIOpaque">NO</bool> |
2126 | @@ -185,7 +182,6 @@ | |||
2127 | 185 | </array> | 182 | </array> |
2128 | 186 | <string key="NSFrameSize">{320, 44}</string> | 183 | <string key="NSFrameSize">{320, 44}</string> |
2129 | 187 | <reference key="NSSuperview"/> | 184 | <reference key="NSSuperview"/> |
2130 | 188 | <reference key="NSWindow"/> | ||
2131 | 189 | <reference key="NSNextKeyView" ref="289125020"/> | 185 | <reference key="NSNextKeyView" ref="289125020"/> |
2132 | 190 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 186 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
2133 | 191 | <reference key="IBUIContentView" ref="289125020"/> | 187 | <reference key="IBUIContentView" ref="289125020"/> |
2134 | @@ -200,10 +196,9 @@ | |||
2135 | 200 | <array class="NSMutableArray" key="NSSubviews"> | 196 | <array class="NSMutableArray" key="NSSubviews"> |
2136 | 201 | <object class="IBUILabel" id="160999426"> | 197 | <object class="IBUILabel" id="160999426"> |
2137 | 202 | <reference key="NSNextResponder" ref="609546111"/> | 198 | <reference key="NSNextResponder" ref="609546111"/> |
2139 | 203 | <int key="NSvFlags">292</int> | 199 | <int key="NSvFlags">278</int> |
2140 | 204 | <string key="NSFrame">{{10, 11}, {193, 21}}</string> | 200 | <string key="NSFrame">{{10, 11}, {193, 21}}</string> |
2141 | 205 | <reference key="NSSuperview" ref="609546111"/> | 201 | <reference key="NSSuperview" ref="609546111"/> |
2142 | 206 | <reference key="NSWindow"/> | ||
2143 | 207 | <reference key="NSNextKeyView" ref="520891560"/> | 202 | <reference key="NSNextKeyView" ref="520891560"/> |
2144 | 208 | <bool key="IBUIOpaque">NO</bool> | 203 | <bool key="IBUIOpaque">NO</bool> |
2145 | 209 | <bool key="IBUIClipsSubviews">YES</bool> | 204 | <bool key="IBUIClipsSubviews">YES</bool> |
2146 | @@ -220,10 +215,10 @@ | |||
2147 | 220 | </object> | 215 | </object> |
2148 | 221 | <object class="IBUISwitch" id="520891560"> | 216 | <object class="IBUISwitch" id="520891560"> |
2149 | 222 | <reference key="NSNextResponder" ref="609546111"/> | 217 | <reference key="NSNextResponder" ref="609546111"/> |
2151 | 223 | <int key="NSvFlags">289</int> | 218 | <int key="NSvFlags">297</int> |
2152 | 224 | <string key="NSFrame">{{217, 8}, {94, 27}}</string> | 219 | <string key="NSFrame">{{217, 8}, {94, 27}}</string> |
2153 | 225 | <reference key="NSSuperview" ref="609546111"/> | 220 | <reference key="NSSuperview" ref="609546111"/> |
2155 | 226 | <reference key="NSWindow"/> | 221 | <reference key="NSNextKeyView"/> |
2156 | 227 | <bool key="IBUIOpaque">NO</bool> | 222 | <bool key="IBUIOpaque">NO</bool> |
2157 | 228 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 223 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
2158 | 229 | <int key="IBUIContentHorizontalAlignment">0</int> | 224 | <int key="IBUIContentHorizontalAlignment">0</int> |
2159 | @@ -233,7 +228,6 @@ | |||
2160 | 233 | </array> | 228 | </array> |
2161 | 234 | <string key="NSFrameSize">{320, 43}</string> | 229 | <string key="NSFrameSize">{320, 43}</string> |
2162 | 235 | <reference key="NSSuperview" ref="2020695"/> | 230 | <reference key="NSSuperview" ref="2020695"/> |
2163 | 236 | <reference key="NSWindow"/> | ||
2164 | 237 | <reference key="NSNextKeyView" ref="160999426"/> | 231 | <reference key="NSNextKeyView" ref="160999426"/> |
2165 | 238 | <reference key="IBUIBackgroundColor" ref="509795101"/> | 232 | <reference key="IBUIBackgroundColor" ref="509795101"/> |
2166 | 239 | <bool key="IBUIOpaque">NO</bool> | 233 | <bool key="IBUIOpaque">NO</bool> |
2167 | @@ -245,7 +239,6 @@ | |||
2168 | 245 | </array> | 239 | </array> |
2169 | 246 | <string key="NSFrameSize">{320, 44}</string> | 240 | <string key="NSFrameSize">{320, 44}</string> |
2170 | 247 | <reference key="NSSuperview"/> | 241 | <reference key="NSSuperview"/> |
2171 | 248 | <reference key="NSWindow"/> | ||
2172 | 249 | <reference key="NSNextKeyView" ref="609546111"/> | 242 | <reference key="NSNextKeyView" ref="609546111"/> |
2173 | 250 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 243 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
2174 | 251 | <reference key="IBUIContentView" ref="609546111"/> | 244 | <reference key="IBUIContentView" ref="609546111"/> |
2175 | @@ -260,10 +253,9 @@ | |||
2176 | 260 | <array class="NSMutableArray" key="NSSubviews"> | 253 | <array class="NSMutableArray" key="NSSubviews"> |
2177 | 261 | <object class="IBUILabel" id="91193340"> | 254 | <object class="IBUILabel" id="91193340"> |
2178 | 262 | <reference key="NSNextResponder" ref="849901570"/> | 255 | <reference key="NSNextResponder" ref="849901570"/> |
2180 | 263 | <int key="NSvFlags">292</int> | 256 | <int key="NSvFlags">278</int> |
2181 | 264 | <string key="NSFrame">{{10, 11}, {193, 21}}</string> | 257 | <string key="NSFrame">{{10, 11}, {193, 21}}</string> |
2182 | 265 | <reference key="NSSuperview" ref="849901570"/> | 258 | <reference key="NSSuperview" ref="849901570"/> |
2183 | 266 | <reference key="NSWindow"/> | ||
2184 | 267 | <reference key="NSNextKeyView" ref="59829218"/> | 259 | <reference key="NSNextKeyView" ref="59829218"/> |
2185 | 268 | <bool key="IBUIOpaque">NO</bool> | 260 | <bool key="IBUIOpaque">NO</bool> |
2186 | 269 | <bool key="IBUIClipsSubviews">YES</bool> | 261 | <bool key="IBUIClipsSubviews">YES</bool> |
2187 | @@ -280,10 +272,10 @@ | |||
2188 | 280 | </object> | 272 | </object> |
2189 | 281 | <object class="IBUISwitch" id="59829218"> | 273 | <object class="IBUISwitch" id="59829218"> |
2190 | 282 | <reference key="NSNextResponder" ref="849901570"/> | 274 | <reference key="NSNextResponder" ref="849901570"/> |
2192 | 283 | <int key="NSvFlags">289</int> | 275 | <int key="NSvFlags">297</int> |
2193 | 284 | <string key="NSFrame">{{217, 8}, {94, 27}}</string> | 276 | <string key="NSFrame">{{217, 8}, {94, 27}}</string> |
2194 | 285 | <reference key="NSSuperview" ref="849901570"/> | 277 | <reference key="NSSuperview" ref="849901570"/> |
2196 | 286 | <reference key="NSWindow"/> | 278 | <reference key="NSNextKeyView"/> |
2197 | 287 | <bool key="IBUIOpaque">NO</bool> | 279 | <bool key="IBUIOpaque">NO</bool> |
2198 | 288 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 280 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
2199 | 289 | <int key="IBUIContentHorizontalAlignment">0</int> | 281 | <int key="IBUIContentHorizontalAlignment">0</int> |
2200 | @@ -293,7 +285,6 @@ | |||
2201 | 293 | </array> | 285 | </array> |
2202 | 294 | <string key="NSFrameSize">{320, 43}</string> | 286 | <string key="NSFrameSize">{320, 43}</string> |
2203 | 295 | <reference key="NSSuperview" ref="703802727"/> | 287 | <reference key="NSSuperview" ref="703802727"/> |
2204 | 296 | <reference key="NSWindow"/> | ||
2205 | 297 | <reference key="NSNextKeyView" ref="91193340"/> | 288 | <reference key="NSNextKeyView" ref="91193340"/> |
2206 | 298 | <reference key="IBUIBackgroundColor" ref="509795101"/> | 289 | <reference key="IBUIBackgroundColor" ref="509795101"/> |
2207 | 299 | <bool key="IBUIOpaque">NO</bool> | 290 | <bool key="IBUIOpaque">NO</bool> |
2208 | @@ -305,7 +296,6 @@ | |||
2209 | 305 | </array> | 296 | </array> |
2210 | 306 | <string key="NSFrameSize">{320, 44}</string> | 297 | <string key="NSFrameSize">{320, 44}</string> |
2211 | 307 | <reference key="NSSuperview"/> | 298 | <reference key="NSSuperview"/> |
2212 | 308 | <reference key="NSWindow"/> | ||
2213 | 309 | <reference key="NSNextKeyView" ref="849901570"/> | 299 | <reference key="NSNextKeyView" ref="849901570"/> |
2214 | 310 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 300 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
2215 | 311 | <reference key="IBUIContentView" ref="849901570"/> | 301 | <reference key="IBUIContentView" ref="849901570"/> |
2216 | @@ -320,10 +310,9 @@ | |||
2217 | 320 | <array class="NSMutableArray" key="NSSubviews"> | 310 | <array class="NSMutableArray" key="NSSubviews"> |
2218 | 321 | <object class="IBUILabel" id="1025321652"> | 311 | <object class="IBUILabel" id="1025321652"> |
2219 | 322 | <reference key="NSNextResponder" ref="61456725"/> | 312 | <reference key="NSNextResponder" ref="61456725"/> |
2221 | 323 | <int key="NSvFlags">292</int> | 313 | <int key="NSvFlags">294</int> |
2222 | 324 | <string key="NSFrame">{{10, 12}, {193, 20}}</string> | 314 | <string key="NSFrame">{{10, 12}, {193, 20}}</string> |
2223 | 325 | <reference key="NSSuperview" ref="61456725"/> | 315 | <reference key="NSSuperview" ref="61456725"/> |
2224 | 326 | <reference key="NSWindow"/> | ||
2225 | 327 | <reference key="NSNextKeyView" ref="764022094"/> | 316 | <reference key="NSNextKeyView" ref="764022094"/> |
2226 | 328 | <bool key="IBUIOpaque">NO</bool> | 317 | <bool key="IBUIOpaque">NO</bool> |
2227 | 329 | <bool key="IBUIClipsSubviews">YES</bool> | 318 | <bool key="IBUIClipsSubviews">YES</bool> |
2228 | @@ -343,7 +332,6 @@ | |||
2229 | 343 | <int key="NSvFlags">289</int> | 332 | <int key="NSvFlags">289</int> |
2230 | 344 | <string key="NSFrame">{{217, 8}, {94, 27}}</string> | 333 | <string key="NSFrame">{{217, 8}, {94, 27}}</string> |
2231 | 345 | <reference key="NSSuperview" ref="61456725"/> | 334 | <reference key="NSSuperview" ref="61456725"/> |
2232 | 346 | <reference key="NSWindow"/> | ||
2233 | 347 | <reference key="NSNextKeyView" ref="792393428"/> | 335 | <reference key="NSNextKeyView" ref="792393428"/> |
2234 | 348 | <bool key="IBUIOpaque">NO</bool> | 336 | <bool key="IBUIOpaque">NO</bool> |
2235 | 349 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 337 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
2236 | @@ -352,10 +340,10 @@ | |||
2237 | 352 | </object> | 340 | </object> |
2238 | 353 | <object class="IBUILabel" id="792393428"> | 341 | <object class="IBUILabel" id="792393428"> |
2239 | 354 | <reference key="NSNextResponder" ref="61456725"/> | 342 | <reference key="NSNextResponder" ref="61456725"/> |
2241 | 355 | <int key="NSvFlags">292</int> | 343 | <int key="NSvFlags">302</int> |
2242 | 356 | <string key="NSFrame">{{10, 40}, {280, 21}}</string> | 344 | <string key="NSFrame">{{10, 40}, {280, 21}}</string> |
2243 | 357 | <reference key="NSSuperview" ref="61456725"/> | 345 | <reference key="NSSuperview" ref="61456725"/> |
2245 | 358 | <reference key="NSWindow"/> | 346 | <reference key="NSNextKeyView"/> |
2246 | 359 | <bool key="IBUIOpaque">NO</bool> | 347 | <bool key="IBUIOpaque">NO</bool> |
2247 | 360 | <bool key="IBUIClipsSubviews">YES</bool> | 348 | <bool key="IBUIClipsSubviews">YES</bool> |
2248 | 361 | <int key="IBUIContentMode">7</int> | 349 | <int key="IBUIContentMode">7</int> |
2249 | @@ -382,7 +370,6 @@ | |||
2250 | 382 | </array> | 370 | </array> |
2251 | 383 | <string key="NSFrameSize">{320, 69}</string> | 371 | <string key="NSFrameSize">{320, 69}</string> |
2252 | 384 | <reference key="NSSuperview" ref="328240698"/> | 372 | <reference key="NSSuperview" ref="328240698"/> |
2253 | 385 | <reference key="NSWindow"/> | ||
2254 | 386 | <reference key="NSNextKeyView" ref="1025321652"/> | 373 | <reference key="NSNextKeyView" ref="1025321652"/> |
2255 | 387 | <reference key="IBUIBackgroundColor" ref="509795101"/> | 374 | <reference key="IBUIBackgroundColor" ref="509795101"/> |
2256 | 388 | <bool key="IBUIOpaque">NO</bool> | 375 | <bool key="IBUIOpaque">NO</bool> |
2257 | @@ -394,7 +381,6 @@ | |||
2258 | 394 | </array> | 381 | </array> |
2259 | 395 | <string key="NSFrameSize">{320, 70}</string> | 382 | <string key="NSFrameSize">{320, 70}</string> |
2260 | 396 | <reference key="NSSuperview"/> | 383 | <reference key="NSSuperview"/> |
2261 | 397 | <reference key="NSWindow"/> | ||
2262 | 398 | <reference key="NSNextKeyView" ref="61456725"/> | 384 | <reference key="NSNextKeyView" ref="61456725"/> |
2263 | 399 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 385 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
2264 | 400 | <reference key="IBUIContentView" ref="61456725"/> | 386 | <reference key="IBUIContentView" ref="61456725"/> |
2265 | @@ -509,6 +495,22 @@ | |||
2266 | 509 | </object> | 495 | </object> |
2267 | 510 | <object class="IBConnectionRecord"> | 496 | <object class="IBConnectionRecord"> |
2268 | 511 | <object class="IBCocoaTouchOutletConnection" key="connection"> | 497 | <object class="IBCocoaTouchOutletConnection" key="connection"> |
2269 | 498 | <string key="label">autoUploadTogleCellLabel</string> | ||
2270 | 499 | <reference key="source" ref="372490531"/> | ||
2271 | 500 | <reference key="destination" ref="91193340"/> | ||
2272 | 501 | </object> | ||
2273 | 502 | <int key="connectionID">62</int> | ||
2274 | 503 | </object> | ||
2275 | 504 | <object class="IBConnectionRecord"> | ||
2276 | 505 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
2277 | 506 | <string key="label">disableSleepToggleDescription</string> | ||
2278 | 507 | <reference key="source" ref="372490531"/> | ||
2279 | 508 | <reference key="destination" ref="792393428"/> | ||
2280 | 509 | </object> | ||
2281 | 510 | <int key="connectionID">64</int> | ||
2282 | 511 | </object> | ||
2283 | 512 | <object class="IBConnectionRecord"> | ||
2284 | 513 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
2285 | 512 | <string key="label">dataSource</string> | 514 | <string key="label">dataSource</string> |
2286 | 513 | <reference key="source" ref="703168831"/> | 515 | <reference key="source" ref="703168831"/> |
2287 | 514 | <reference key="destination" ref="372490531"/> | 516 | <reference key="destination" ref="372490531"/> |
2288 | @@ -701,125 +703,17 @@ | |||
2289 | 701 | <nil key="activeLocalization"/> | 703 | <nil key="activeLocalization"/> |
2290 | 702 | <dictionary class="NSMutableDictionary" key="localizations"/> | 704 | <dictionary class="NSMutableDictionary" key="localizations"/> |
2291 | 703 | <nil key="sourceID"/> | 705 | <nil key="sourceID"/> |
2407 | 704 | <int key="maxID">61</int> | 706 | <int key="maxID">64</int> |
2408 | 705 | </object> | 707 | </object> |
2409 | 706 | <object class="IBClassDescriber" key="IBDocument.Classes"> | 708 | <object class="IBClassDescriber" key="IBDocument.Classes"/> |
2295 | 707 | <array class="NSMutableArray" key="referencedPartialClassDescriptions"> | ||
2296 | 708 | <object class="IBPartialClassDescription"> | ||
2297 | 709 | <string key="className">U1NavigationBar</string> | ||
2298 | 710 | <string key="superclassName">UINavigationBar</string> | ||
2299 | 711 | <object class="IBClassDescriptionSource" key="sourceIdentifier"> | ||
2300 | 712 | <string key="majorKey">IBProjectSource</string> | ||
2301 | 713 | <string key="minorKey">./Classes/U1NavigationBar.h</string> | ||
2302 | 714 | </object> | ||
2303 | 715 | </object> | ||
2304 | 716 | <object class="IBPartialClassDescription"> | ||
2305 | 717 | <string key="className">U1SettingsViewController</string> | ||
2306 | 718 | <string key="superclassName">UIViewController</string> | ||
2307 | 719 | <dictionary class="NSMutableDictionary" key="actions"> | ||
2308 | 720 | <string key="toggleAutoUpload:">id</string> | ||
2309 | 721 | <string key="toggleDisableSleep:">id</string> | ||
2310 | 722 | <string key="toggleIncludeVideo:">id</string> | ||
2311 | 723 | <string key="toggleWifiOnly:">id</string> | ||
2312 | 724 | </dictionary> | ||
2313 | 725 | <dictionary class="NSMutableDictionary" key="actionInfosByName"> | ||
2314 | 726 | <object class="IBActionInfo" key="toggleAutoUpload:"> | ||
2315 | 727 | <string key="name">toggleAutoUpload:</string> | ||
2316 | 728 | <string key="candidateClassName">id</string> | ||
2317 | 729 | </object> | ||
2318 | 730 | <object class="IBActionInfo" key="toggleDisableSleep:"> | ||
2319 | 731 | <string key="name">toggleDisableSleep:</string> | ||
2320 | 732 | <string key="candidateClassName">id</string> | ||
2321 | 733 | </object> | ||
2322 | 734 | <object class="IBActionInfo" key="toggleIncludeVideo:"> | ||
2323 | 735 | <string key="name">toggleIncludeVideo:</string> | ||
2324 | 736 | <string key="candidateClassName">id</string> | ||
2325 | 737 | </object> | ||
2326 | 738 | <object class="IBActionInfo" key="toggleWifiOnly:"> | ||
2327 | 739 | <string key="name">toggleWifiOnly:</string> | ||
2328 | 740 | <string key="candidateClassName">id</string> | ||
2329 | 741 | </object> | ||
2330 | 742 | </dictionary> | ||
2331 | 743 | <dictionary class="NSMutableDictionary" key="outlets"> | ||
2332 | 744 | <string key="autoUploadToggle">UISwitch</string> | ||
2333 | 745 | <string key="autoUploadToggleCell">UITableViewCell</string> | ||
2334 | 746 | <string key="disableSleepToggle">UISwitch</string> | ||
2335 | 747 | <string key="disableSleepToggleCell">UITableViewCell</string> | ||
2336 | 748 | <string key="disableSleepToggleLabel">UILabel</string> | ||
2337 | 749 | <string key="includeVideoToggle">UISwitch</string> | ||
2338 | 750 | <string key="includeVideoToggleCell">UITableViewCell</string> | ||
2339 | 751 | <string key="includeVideoToggleLabel">UILabel</string> | ||
2340 | 752 | <string key="navBar">U1NavigationBar</string> | ||
2341 | 753 | <string key="tableView">UITableView</string> | ||
2342 | 754 | <string key="wifiOnlyToggle">UISwitch</string> | ||
2343 | 755 | <string key="wifiOnlyToggleCell">UITableViewCell</string> | ||
2344 | 756 | <string key="wifiOnlyToggleLabel">UILabel</string> | ||
2345 | 757 | </dictionary> | ||
2346 | 758 | <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName"> | ||
2347 | 759 | <object class="IBToOneOutletInfo" key="autoUploadToggle"> | ||
2348 | 760 | <string key="name">autoUploadToggle</string> | ||
2349 | 761 | <string key="candidateClassName">UISwitch</string> | ||
2350 | 762 | </object> | ||
2351 | 763 | <object class="IBToOneOutletInfo" key="autoUploadToggleCell"> | ||
2352 | 764 | <string key="name">autoUploadToggleCell</string> | ||
2353 | 765 | <string key="candidateClassName">UITableViewCell</string> | ||
2354 | 766 | </object> | ||
2355 | 767 | <object class="IBToOneOutletInfo" key="disableSleepToggle"> | ||
2356 | 768 | <string key="name">disableSleepToggle</string> | ||
2357 | 769 | <string key="candidateClassName">UISwitch</string> | ||
2358 | 770 | </object> | ||
2359 | 771 | <object class="IBToOneOutletInfo" key="disableSleepToggleCell"> | ||
2360 | 772 | <string key="name">disableSleepToggleCell</string> | ||
2361 | 773 | <string key="candidateClassName">UITableViewCell</string> | ||
2362 | 774 | </object> | ||
2363 | 775 | <object class="IBToOneOutletInfo" key="disableSleepToggleLabel"> | ||
2364 | 776 | <string key="name">disableSleepToggleLabel</string> | ||
2365 | 777 | <string key="candidateClassName">UILabel</string> | ||
2366 | 778 | </object> | ||
2367 | 779 | <object class="IBToOneOutletInfo" key="includeVideoToggle"> | ||
2368 | 780 | <string key="name">includeVideoToggle</string> | ||
2369 | 781 | <string key="candidateClassName">UISwitch</string> | ||
2370 | 782 | </object> | ||
2371 | 783 | <object class="IBToOneOutletInfo" key="includeVideoToggleCell"> | ||
2372 | 784 | <string key="name">includeVideoToggleCell</string> | ||
2373 | 785 | <string key="candidateClassName">UITableViewCell</string> | ||
2374 | 786 | </object> | ||
2375 | 787 | <object class="IBToOneOutletInfo" key="includeVideoToggleLabel"> | ||
2376 | 788 | <string key="name">includeVideoToggleLabel</string> | ||
2377 | 789 | <string key="candidateClassName">UILabel</string> | ||
2378 | 790 | </object> | ||
2379 | 791 | <object class="IBToOneOutletInfo" key="navBar"> | ||
2380 | 792 | <string key="name">navBar</string> | ||
2381 | 793 | <string key="candidateClassName">U1NavigationBar</string> | ||
2382 | 794 | </object> | ||
2383 | 795 | <object class="IBToOneOutletInfo" key="tableView"> | ||
2384 | 796 | <string key="name">tableView</string> | ||
2385 | 797 | <string key="candidateClassName">UITableView</string> | ||
2386 | 798 | </object> | ||
2387 | 799 | <object class="IBToOneOutletInfo" key="wifiOnlyToggle"> | ||
2388 | 800 | <string key="name">wifiOnlyToggle</string> | ||
2389 | 801 | <string key="candidateClassName">UISwitch</string> | ||
2390 | 802 | </object> | ||
2391 | 803 | <object class="IBToOneOutletInfo" key="wifiOnlyToggleCell"> | ||
2392 | 804 | <string key="name">wifiOnlyToggleCell</string> | ||
2393 | 805 | <string key="candidateClassName">UITableViewCell</string> | ||
2394 | 806 | </object> | ||
2395 | 807 | <object class="IBToOneOutletInfo" key="wifiOnlyToggleLabel"> | ||
2396 | 808 | <string key="name">wifiOnlyToggleLabel</string> | ||
2397 | 809 | <string key="candidateClassName">UILabel</string> | ||
2398 | 810 | </object> | ||
2399 | 811 | </dictionary> | ||
2400 | 812 | <object class="IBClassDescriptionSource" key="sourceIdentifier"> | ||
2401 | 813 | <string key="majorKey">IBProjectSource</string> | ||
2402 | 814 | <string key="minorKey">./Classes/U1SettingsViewController.h</string> | ||
2403 | 815 | </object> | ||
2404 | 816 | </object> | ||
2405 | 817 | </array> | ||
2406 | 818 | </object> | ||
2410 | 819 | <int key="IBDocument.localizationMode">0</int> | 709 | <int key="IBDocument.localizationMode">0</int> |
2411 | 820 | <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> | 710 | <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> |
2412 | 711 | <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> | ||
2413 | 712 | <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string> | ||
2414 | 713 | <real value="1296" key="NS.object.0"/> | ||
2415 | 714 | </object> | ||
2416 | 821 | <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> | 715 | <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> |
2417 | 822 | <int key="IBDocument.defaultPropertyAccessControl">3</int> | 716 | <int key="IBDocument.defaultPropertyAccessControl">3</int> |
2419 | 823 | <string key="IBCocoaTouchPluginVersion">933</string> | 717 | <string key="IBCocoaTouchPluginVersion">1498</string> |
2420 | 824 | </data> | 718 | </data> |
2421 | 825 | </archive> | 719 | </archive> |
2422 | 826 | 720 | ||
2423 | === modified file 'Files/U1UploadsPoolViewController.h' | |||
2424 | --- Files/U1UploadsPoolViewController.h 2011-12-06 03:49:37 +0000 | |||
2425 | +++ Files/U1UploadsPoolViewController.h 2012-08-27 11:27:21 +0000 | |||
2426 | @@ -23,6 +23,8 @@ | |||
2427 | 23 | @property (nonatomic, retain) IBOutlet UIView *autoUploadToggleView; | 23 | @property (nonatomic, retain) IBOutlet UIView *autoUploadToggleView; |
2428 | 24 | @property (nonatomic, retain) IBOutlet UISwitch *autoUploadToggle; | 24 | @property (nonatomic, retain) IBOutlet UISwitch *autoUploadToggle; |
2429 | 25 | @property (retain) U1FilesClient *filesClient; | 25 | @property (retain) U1FilesClient *filesClient; |
2430 | 26 | @property (retain, nonatomic) IBOutlet UILabel *loadingCellLabel; | ||
2431 | 27 | @property (retain, nonatomic) IBOutlet UILabel *autoUploadCellLabel; | ||
2432 | 26 | 28 | ||
2433 | 27 | - (IBAction)enableAutoUpload:(id)sender; | 29 | - (IBAction)enableAutoUpload:(id)sender; |
2434 | 28 | 30 | ||
2435 | 29 | 31 | ||
2436 | === modified file 'Files/U1UploadsPoolViewController.m' | |||
2437 | --- Files/U1UploadsPoolViewController.m 2011-12-14 19:43:35 +0000 | |||
2438 | +++ Files/U1UploadsPoolViewController.m 2012-08-27 11:27:21 +0000 | |||
2439 | @@ -43,6 +43,8 @@ | |||
2440 | 43 | @synthesize loadingCell; | 43 | @synthesize loadingCell; |
2441 | 44 | @synthesize autoUploadToggleView, autoUploadToggle; | 44 | @synthesize autoUploadToggleView, autoUploadToggle; |
2442 | 45 | @synthesize filesClient; | 45 | @synthesize filesClient; |
2443 | 46 | @synthesize loadingCellLabel; | ||
2444 | 47 | @synthesize autoUploadCellLabel; | ||
2445 | 46 | @synthesize resultsController; | 48 | @synthesize resultsController; |
2446 | 47 | 49 | ||
2447 | 48 | - (id)init; | 50 | - (id)init; |
2448 | @@ -69,6 +71,8 @@ | |||
2449 | 69 | [resultsController release]; | 71 | [resultsController release]; |
2450 | 70 | [autoUploadToggleView release]; | 72 | [autoUploadToggleView release]; |
2451 | 71 | [autoUploadToggle release]; | 73 | [autoUploadToggle release]; |
2452 | 74 | [loadingCellLabel release]; | ||
2453 | 75 | [autoUploadCellLabel release]; | ||
2454 | 72 | [super dealloc]; | 76 | [super dealloc]; |
2455 | 73 | } | 77 | } |
2456 | 74 | 78 | ||
2457 | @@ -77,12 +81,17 @@ | |||
2458 | 77 | [super viewDidLoad]; | 81 | [super viewDidLoad]; |
2459 | 78 | [self updateFeedback:nil]; | 82 | [self updateFeedback:nil]; |
2460 | 79 | [self loadCurrentUploads]; | 83 | [self loadCurrentUploads]; |
2461 | 84 | |||
2462 | 85 | self.loadingCellLabel.text = NSLocalizedString(@"Loading...", nil); | ||
2463 | 86 | self.autoUploadCellLabel.text = NSLocalizedString(@"Auto-Upload Camera Roll", nil); | ||
2464 | 80 | } | 87 | } |
2465 | 81 | 88 | ||
2466 | 82 | - (void)viewDidUnload; | 89 | - (void)viewDidUnload; |
2467 | 83 | { | 90 | { |
2468 | 84 | [loadingCell release], loadingCell = nil; | 91 | [loadingCell release], loadingCell = nil; |
2469 | 85 | [[NSNotificationCenter defaultCenter] removeObserver:self]; | 92 | [[NSNotificationCenter defaultCenter] removeObserver:self]; |
2470 | 93 | [self setLoadingCellLabel:nil]; | ||
2471 | 94 | [self setAutoUploadCellLabel:nil]; | ||
2472 | 86 | [super viewDidUnload]; | 95 | [super viewDidUnload]; |
2473 | 87 | } | 96 | } |
2474 | 88 | 97 | ||
2475 | 89 | 98 | ||
2476 | === modified file 'Files/U1UploadsPoolViewController.xib' | |||
2477 | --- Files/U1UploadsPoolViewController.xib 2011-11-08 19:57:59 +0000 | |||
2478 | +++ Files/U1UploadsPoolViewController.xib 2012-08-27 11:27:21 +0000 | |||
2479 | @@ -1,21 +1,21 @@ | |||
2480 | 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2481 | 2 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> | 2 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> |
2482 | 3 | <data> | 3 | <data> |
2488 | 4 | <int key="IBDocument.SystemTarget">1280</int> | 4 | <int key="IBDocument.SystemTarget">1296</int> |
2489 | 5 | <string key="IBDocument.SystemVersion">10K549</string> | 5 | <string key="IBDocument.SystemVersion">12B19</string> |
2490 | 6 | <string key="IBDocument.InterfaceBuilderVersion">1938</string> | 6 | <string key="IBDocument.InterfaceBuilderVersion">2549</string> |
2491 | 7 | <string key="IBDocument.AppKitVersion">1038.36</string> | 7 | <string key="IBDocument.AppKitVersion">1187</string> |
2492 | 8 | <string key="IBDocument.HIToolboxVersion">461.00</string> | 8 | <string key="IBDocument.HIToolboxVersion">624.00</string> |
2493 | 9 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> | 9 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> |
2494 | 10 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | 10 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
2496 | 11 | <string key="NS.object.0">933</string> | 11 | <string key="NS.object.0">1498</string> |
2497 | 12 | </object> | 12 | </object> |
2498 | 13 | <array key="IBDocument.IntegratedClassDependencies"> | 13 | <array key="IBDocument.IntegratedClassDependencies"> |
2499 | 14 | <string>IBProxyObject</string> | 14 | <string>IBProxyObject</string> |
2500 | 15 | <string>IBUIActivityIndicatorView</string> | ||
2501 | 15 | <string>IBUIImageView</string> | 16 | <string>IBUIImageView</string> |
2502 | 16 | <string>IBUILabel</string> | 17 | <string>IBUILabel</string> |
2503 | 17 | <string>IBUISwitch</string> | 18 | <string>IBUISwitch</string> |
2504 | 18 | <string>IBUIActivityIndicatorView</string> | ||
2505 | 19 | <string>IBUITableView</string> | 19 | <string>IBUITableView</string> |
2506 | 20 | <string>IBUITableViewCell</string> | 20 | <string>IBUITableViewCell</string> |
2507 | 21 | <string>IBUIView</string> | 21 | <string>IBUIView</string> |
2508 | @@ -66,8 +66,8 @@ | |||
2509 | 66 | <array class="NSMutableArray" key="NSSubviews"> | 66 | <array class="NSMutableArray" key="NSSubviews"> |
2510 | 67 | <object class="IBUILabel" id="131881887"> | 67 | <object class="IBUILabel" id="131881887"> |
2511 | 68 | <reference key="NSNextResponder" ref="783165177"/> | 68 | <reference key="NSNextResponder" ref="783165177"/> |
2514 | 69 | <int key="NSvFlags">292</int> | 69 | <int key="NSvFlags">274</int> |
2515 | 70 | <string key="NSFrame">{{136, 17}, {75, 21}}</string> | 70 | <string key="NSFrame">{{20, 17}, {280, 21}}</string> |
2516 | 71 | <reference key="NSSuperview" ref="783165177"/> | 71 | <reference key="NSSuperview" ref="783165177"/> |
2517 | 72 | <reference key="NSNextKeyView"/> | 72 | <reference key="NSNextKeyView"/> |
2518 | 73 | <bool key="IBUIOpaque">NO</bool> | 73 | <bool key="IBUIOpaque">NO</bool> |
2519 | @@ -83,6 +83,7 @@ | |||
2520 | 83 | <nil key="IBUIHighlightedColor"/> | 83 | <nil key="IBUIHighlightedColor"/> |
2521 | 84 | <int key="IBUIBaselineAdjustment">1</int> | 84 | <int key="IBUIBaselineAdjustment">1</int> |
2522 | 85 | <float key="IBUIMinimumFontSize">10</float> | 85 | <float key="IBUIMinimumFontSize">10</float> |
2523 | 86 | <int key="IBUITextAlignment">1</int> | ||
2524 | 86 | <object class="IBUIFontDescription" key="IBUIFontDescription"> | 87 | <object class="IBUIFontDescription" key="IBUIFontDescription"> |
2525 | 87 | <string key="name">Helvetica</string> | 88 | <string key="name">Helvetica</string> |
2526 | 88 | <string key="family">Helvetica</string> | 89 | <string key="family">Helvetica</string> |
2527 | @@ -151,7 +152,7 @@ | |||
2528 | 151 | </object> | 152 | </object> |
2529 | 152 | <object class="IBUISwitch" id="830315920"> | 153 | <object class="IBUISwitch" id="830315920"> |
2530 | 153 | <reference key="NSNextResponder" ref="534137793"/> | 154 | <reference key="NSNextResponder" ref="534137793"/> |
2532 | 154 | <int key="NSvFlags">292</int> | 155 | <int key="NSvFlags">297</int> |
2533 | 155 | <string key="NSFrame">{{209, 13}, {94, 27}}</string> | 156 | <string key="NSFrame">{{209, 13}, {94, 27}}</string> |
2534 | 156 | <reference key="NSSuperview" ref="534137793"/> | 157 | <reference key="NSSuperview" ref="534137793"/> |
2535 | 157 | <reference key="NSNextKeyView"/> | 158 | <reference key="NSNextKeyView"/> |
2536 | @@ -162,7 +163,7 @@ | |||
2537 | 162 | </object> | 163 | </object> |
2538 | 163 | <object class="IBUILabel" id="592945301"> | 164 | <object class="IBUILabel" id="592945301"> |
2539 | 164 | <reference key="NSNextResponder" ref="534137793"/> | 165 | <reference key="NSNextResponder" ref="534137793"/> |
2541 | 165 | <int key="NSvFlags">292</int> | 166 | <int key="NSvFlags">278</int> |
2542 | 166 | <string key="NSFrame">{{20, 16}, {196, 21}}</string> | 167 | <string key="NSFrame">{{20, 16}, {196, 21}}</string> |
2543 | 167 | <reference key="NSSuperview" ref="534137793"/> | 168 | <reference key="NSSuperview" ref="534137793"/> |
2544 | 168 | <reference key="NSNextKeyView" ref="830315920"/> | 169 | <reference key="NSNextKeyView" ref="830315920"/> |
2545 | @@ -231,6 +232,22 @@ | |||
2546 | 231 | <int key="connectionID">24</int> | 232 | <int key="connectionID">24</int> |
2547 | 232 | </object> | 233 | </object> |
2548 | 233 | <object class="IBConnectionRecord"> | 234 | <object class="IBConnectionRecord"> |
2549 | 235 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
2550 | 236 | <string key="label">loadingCellLabel</string> | ||
2551 | 237 | <reference key="source" ref="372490531"/> | ||
2552 | 238 | <reference key="destination" ref="131881887"/> | ||
2553 | 239 | </object> | ||
2554 | 240 | <int key="connectionID">28</int> | ||
2555 | 241 | </object> | ||
2556 | 242 | <object class="IBConnectionRecord"> | ||
2557 | 243 | <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
2558 | 244 | <string key="label">autoUploadCellLabel</string> | ||
2559 | 245 | <reference key="source" ref="372490531"/> | ||
2560 | 246 | <reference key="destination" ref="592945301"/> | ||
2561 | 247 | </object> | ||
2562 | 248 | <int key="connectionID">29</int> | ||
2563 | 249 | </object> | ||
2564 | 250 | <object class="IBConnectionRecord"> | ||
2565 | 234 | <object class="IBCocoaTouchEventConnection" key="connection"> | 251 | <object class="IBCocoaTouchEventConnection" key="connection"> |
2566 | 235 | <string key="label">enableAutoUpload:</string> | 252 | <string key="label">enableAutoUpload:</string> |
2567 | 236 | <reference key="source" ref="830315920"/> | 253 | <reference key="source" ref="830315920"/> |
2568 | @@ -329,17 +346,21 @@ | |||
2569 | 329 | <nil key="activeLocalization"/> | 346 | <nil key="activeLocalization"/> |
2570 | 330 | <dictionary class="NSMutableDictionary" key="localizations"/> | 347 | <dictionary class="NSMutableDictionary" key="localizations"/> |
2571 | 331 | <nil key="sourceID"/> | 348 | <nil key="sourceID"/> |
2573 | 332 | <int key="maxID">27</int> | 349 | <int key="maxID">29</int> |
2574 | 333 | </object> | 350 | </object> |
2575 | 334 | <object class="IBClassDescriber" key="IBDocument.Classes"/> | 351 | <object class="IBClassDescriber" key="IBDocument.Classes"/> |
2576 | 335 | <int key="IBDocument.localizationMode">0</int> | 352 | <int key="IBDocument.localizationMode">0</int> |
2577 | 336 | <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> | 353 | <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> |
2578 | 354 | <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> | ||
2579 | 355 | <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string> | ||
2580 | 356 | <real value="1296" key="NS.object.0"/> | ||
2581 | 357 | </object> | ||
2582 | 337 | <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> | 358 | <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> |
2583 | 338 | <int key="IBDocument.defaultPropertyAccessControl">3</int> | 359 | <int key="IBDocument.defaultPropertyAccessControl">3</int> |
2584 | 339 | <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> | 360 | <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> |
2585 | 340 | <string key="NS.key.0">progress_view_background.png</string> | 361 | <string key="NS.key.0">progress_view_background.png</string> |
2586 | 341 | <string key="NS.object.0">{320, 66}</string> | 362 | <string key="NS.object.0">{320, 66}</string> |
2587 | 342 | </object> | 363 | </object> |
2589 | 343 | <string key="IBCocoaTouchPluginVersion">933</string> | 364 | <string key="IBCocoaTouchPluginVersion">1498</string> |
2590 | 344 | </data> | 365 | </data> |
2591 | 345 | </archive> | 366 | </archive> |
2592 | 346 | 367 | ||
2593 | === added file 'Files/en.lproj/Localizable.strings' | |||
2594 | --- Files/en.lproj/Localizable.strings 1970-01-01 00:00:00 +0000 | |||
2595 | +++ Files/en.lproj/Localizable.strings 2012-08-27 11:27:21 +0000 | |||
2596 | @@ -0,0 +1,14 @@ | |||
2597 | 1 | // | ||
2598 | 2 | // Copyright 2011 Canonical Ltd. | ||
2599 | 3 | // | ||
2600 | 4 | // This program is free software: you can redistribute it and/or modify it | ||
2601 | 5 | // under the terms of the GNU Affero General Public License version 3, | ||
2602 | 6 | // as published by the Free Software Foundation. | ||
2603 | 7 | // | ||
2604 | 8 | // This program is distributed in the hope that it will be useful, but | ||
2605 | 9 | // WITHOUT ANY WARRANTY; without even the implied warranties of | ||
2606 | 10 | // MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
2607 | 11 | // PURPOSE. See the GNU Affero General Public License for more details. | ||
2608 | 12 | // | ||
2609 | 13 | // You should have received a copy of the GNU Affero General Public License | ||
2610 | 14 | // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
2611 | 0 | 15 | ||
2612 | === added directory 'Files/es.lproj' | |||
2613 | === added file 'Files/es.lproj/Localizable.strings' | |||
2614 | 1 | Binary files Files/es.lproj/Localizable.strings 1970-01-01 00:00:00 +0000 and Files/es.lproj/Localizable.strings 2012-08-27 11:27:21 +0000 differ | 16 | Binary files Files/es.lproj/Localizable.strings 1970-01-01 00:00:00 +0000 and Files/es.lproj/Localizable.strings 2012-08-27 11:27:21 +0000 differ |
2615 | === modified file 'Files/iPhone/en.lproj/MainWindow_iPhone.xib' | |||
2616 | --- Files/iPhone/en.lproj/MainWindow_iPhone.xib 2012-06-29 17:51:54 +0000 | |||
2617 | +++ Files/iPhone/en.lproj/MainWindow_iPhone.xib 2012-08-27 11:27:21 +0000 | |||
2618 | @@ -2,26 +2,26 @@ | |||
2619 | 2 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10"> | 2 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10"> |
2620 | 3 | <data> | 3 | <data> |
2621 | 4 | <int key="IBDocument.SystemTarget">1024</int> | 4 | <int key="IBDocument.SystemTarget">1024</int> |
2626 | 5 | <string key="IBDocument.SystemVersion">11E2620</string> | 5 | <string key="IBDocument.SystemVersion">12B19</string> |
2627 | 6 | <string key="IBDocument.InterfaceBuilderVersion">2182</string> | 6 | <string key="IBDocument.InterfaceBuilderVersion">2549</string> |
2628 | 7 | <string key="IBDocument.AppKitVersion">1138.47</string> | 7 | <string key="IBDocument.AppKitVersion">1187</string> |
2629 | 8 | <string key="IBDocument.HIToolboxVersion">569.00</string> | 8 | <string key="IBDocument.HIToolboxVersion">624.00</string> |
2630 | 9 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> | 9 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> |
2631 | 10 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | 10 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
2633 | 11 | <string key="NS.object.0">1181</string> | 11 | <string key="NS.object.0">1498</string> |
2634 | 12 | </object> | 12 | </object> |
2635 | 13 | <object class="NSArray" key="IBDocument.IntegratedClassDependencies"> | 13 | <object class="NSArray" key="IBDocument.IntegratedClassDependencies"> |
2636 | 14 | <bool key="EncodedWithXMLCoder">YES</bool> | 14 | <bool key="EncodedWithXMLCoder">YES</bool> |
2637 | 15 | <string>IBProxyObject</string> | 15 | <string>IBProxyObject</string> |
2638 | 16 | <string>IBUINavigationController</string> | ||
2639 | 17 | <string>IBUIViewController</string> | ||
2640 | 18 | <string>IBUICustomObject</string> | 16 | <string>IBUICustomObject</string> |
2641 | 19 | <string>IBUITabBarController</string> | ||
2642 | 20 | <string>IBUIWindow</string> | ||
2643 | 21 | <string>IBUITabBar</string> | ||
2644 | 22 | <string>IBUINavigationBar</string> | 17 | <string>IBUINavigationBar</string> |
2645 | 18 | <string>IBUINavigationController</string> | ||
2646 | 23 | <string>IBUINavigationItem</string> | 19 | <string>IBUINavigationItem</string> |
2647 | 20 | <string>IBUITabBar</string> | ||
2648 | 21 | <string>IBUITabBarController</string> | ||
2649 | 24 | <string>IBUITabBarItem</string> | 22 | <string>IBUITabBarItem</string> |
2650 | 23 | <string>IBUIViewController</string> | ||
2651 | 24 | <string>IBUIWindow</string> | ||
2652 | 25 | </object> | 25 | </object> |
2653 | 26 | <object class="NSArray" key="IBDocument.PluginDependencies"> | 26 | <object class="NSArray" key="IBDocument.PluginDependencies"> |
2654 | 27 | <bool key="EncodedWithXMLCoder">YES</bool> | 27 | <bool key="EncodedWithXMLCoder">YES</bool> |
2655 | @@ -562,6 +562,6 @@ | |||
2656 | 562 | <string>{30, 30}</string> | 562 | <string>{30, 30}</string> |
2657 | 563 | </object> | 563 | </object> |
2658 | 564 | </object> | 564 | </object> |
2660 | 565 | <string key="IBCocoaTouchPluginVersion">1181</string> | 565 | <string key="IBCocoaTouchPluginVersion">1498</string> |
2661 | 566 | </data> | 566 | </data> |
2662 | 567 | </archive> | 567 | </archive> |
Looks good! Thanks for contributing!