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