Merge lp:~threeve/ubuntuone-ios-music/the-great-renaming into lp:ubuntuone-ios-music
- the-great-renaming
- Merge into trunk
Proposed by
Jason Foreman
Status: | Merged |
---|---|
Approved by: | Zachery Bir |
Approved revision: | 204 |
Merged at revision: | 203 |
Proposed branch: | lp:~threeve/ubuntuone-ios-music/the-great-renaming |
Merge into: | lp:ubuntuone-ios-music |
Diff against target: |
390 lines (+53/-63) 5 files modified
.bzrignore (+5/-7) Other Sources/U1MusicAppDelegate.h (+1/-1) Other Sources/U1MusicAppDelegate.m (+3/-3) U1Music.xcodeproj/project.pbxproj (+21/-21) xibs/MainWindow.xib (+23/-31) |
To merge this branch: | bzr merge lp:~threeve/ubuntuone-ios-music/the-great-renaming |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zachery Bir | Approve | ||
Review via email: mp+69156@code.launchpad.net |
Commit message
Description of the change
Renaming the project and a couple of key classes from 'iSub' to 'U1Music'.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file '.bzrignore' |
2 | --- .bzrignore 2011-07-19 18:56:05 +0000 |
3 | +++ .bzrignore 2011-07-25 19:46:02 +0000 |
4 | @@ -1,9 +1,7 @@ |
5 | -musicstreaming/build |
6 | -musicstreaming/iSub.xcodeproj/*.pbxuser |
7 | -musicstreaming/iSub.xcodeproj/*.mode1v3 |
8 | -contacts/iPhoneApp/build |
9 | .DS_STORE |
10 | -contacts/funambol-sdk/build/mac/build |
11 | .DS_Store |
12 | -musicstreaming/iSub.xcodeproj/xcuserdata |
13 | -musicstreaming/iSub.xcodeproj/project.xcworkspace/ |
14 | +build |
15 | +U1Music.xcodeproj/*.pbxuser |
16 | +U1Music.xcodeproj/*.mode1v3 |
17 | +U1Music.xcodeproj/xcuserdata |
18 | +U1Music.xcodeproj/project.xcworkspace/ |
19 | |
20 | === renamed file 'Other Sources/iSubAppDelegate.h' => 'Other Sources/U1MusicAppDelegate.h' |
21 | --- Other Sources/iSubAppDelegate.h 2011-05-27 18:25:16 +0000 |
22 | +++ Other Sources/U1MusicAppDelegate.h 2011-07-25 19:46:02 +0000 |
23 | @@ -30,7 +30,7 @@ |
24 | |
25 | @class Reachability; |
26 | |
27 | -@interface iSubAppDelegate : NSObject <UIApplicationDelegate> { |
28 | +@interface U1MusicAppDelegate : NSObject <UIApplicationDelegate> { |
29 | |
30 | UIWindow *window; |
31 | UITabBarController *tabBarController; |
32 | |
33 | === renamed file 'Other Sources/iSubAppDelegate.m' => 'Other Sources/U1MusicAppDelegate.m' |
34 | --- Other Sources/iSubAppDelegate.m 2011-07-12 21:35:15 +0000 |
35 | +++ Other Sources/U1MusicAppDelegate.m 2011-07-25 19:46:02 +0000 |
36 | @@ -28,7 +28,7 @@ |
37 | // ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH |
38 | // DAMAGE. |
39 | |
40 | -#import "iSubAppDelegate.h" |
41 | +#import "U1MusicAppDelegate.h" |
42 | #import "ArtistListViewController.h" |
43 | #import "AlbumListViewController.h" |
44 | #import "PlaylistListViewController.h" |
45 | @@ -39,7 +39,7 @@ |
46 | #import "UOMusicLoginController.h" |
47 | #import "URLQueryStringParser.h" |
48 | |
49 | -@interface iSubAppDelegate () <UOMusicLoginControllerDelegate> |
50 | +@interface U1MusicAppDelegate () <UOMusicLoginControllerDelegate> |
51 | @property (retain) UOMusicLoginController *loginController; |
52 | - (void)recoverState; |
53 | - (void)parseQueryCredentials:(NSURL*)anURL; |
54 | @@ -48,7 +48,7 @@ |
55 | @end |
56 | |
57 | |
58 | -@implementation iSubAppDelegate |
59 | +@implementation U1MusicAppDelegate |
60 | |
61 | @synthesize window; |
62 | @synthesize tabBarController; |
63 | |
64 | === renamed file 'iSub-Info.plist' => 'U1Music-Info.plist' |
65 | === renamed directory 'iSub.xcodeproj' => 'U1Music.xcodeproj' |
66 | === modified file 'U1Music.xcodeproj/project.pbxproj' |
67 | --- iSub.xcodeproj/project.pbxproj 2011-07-18 14:05:09 +0000 |
68 | +++ U1Music.xcodeproj/project.pbxproj 2011-07-25 19:46:02 +0000 |
69 | @@ -116,7 +116,7 @@ |
70 | 93F334681247FB02006C6707 /* SongViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93F334641247FB02006C6707 /* SongViewController.xib */; }; |
71 | 93F334691247FB02006C6707 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93F334651247FB02006C6707 /* MainWindow.xib */; }; |
72 | 93F3346A1247FB02006C6707 /* SearchableTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93F334661247FB02006C6707 /* SearchableTableViewController.xib */; }; |
73 | - 93F334711247FB78006C6707 /* iSubAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3346F1247FB78006C6707 /* iSubAppDelegate.m */; }; |
74 | + 93F334711247FB78006C6707 /* U1MusicAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3346F1247FB78006C6707 /* U1MusicAppDelegate.m */; }; |
75 | 93F334721247FB78006C6707 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334701247FB78006C6707 /* main.m */; }; |
76 | 93F334751247FB9F006C6707 /* AudioStreamer.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334741247FB9F006C6707 /* AudioStreamer.m */; }; |
77 | 93F3349F1247FCDC006C6707 /* ArtistViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3348E1247FCDC006C6707 /* ArtistViewController.m */; }; |
78 | @@ -183,7 +183,7 @@ |
79 | 53F675DB113B093900822059 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; |
80 | 53F675E1113B095900822059 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; |
81 | 53F675E7113B096400822059 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; |
82 | - 8D1107310486CEB800E47090 /* iSub-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "iSub-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; }; |
83 | + 8D1107310486CEB800E47090 /* U1Music-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "U1Music-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; }; |
84 | 91018B0913573BBB0051EFDC /* UIImage+Resize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+Resize.h"; sourceTree = "<group>"; }; |
85 | 91018B0A13573BBB0051EFDC /* UIImage+Resize.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+Resize.m"; sourceTree = "<group>"; }; |
86 | 91018B0C13573D150051EFDC /* UIImage+Alpha.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+Alpha.h"; sourceTree = "<group>"; }; |
87 | @@ -341,12 +341,12 @@ |
88 | 93F334641247FB02006C6707 /* SongViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SongViewController.xib; sourceTree = "<group>"; }; |
89 | 93F334651247FB02006C6707 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = "<group>"; }; |
90 | 93F334661247FB02006C6707 /* SearchableTableViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SearchableTableViewController.xib; sourceTree = "<group>"; }; |
91 | - 93F3346E1247FB78006C6707 /* iSubAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iSubAppDelegate.h; sourceTree = "<group>"; }; |
92 | - 93F3346F1247FB78006C6707 /* iSubAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iSubAppDelegate.m; sourceTree = "<group>"; }; |
93 | + 93F3346E1247FB78006C6707 /* U1MusicAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1MusicAppDelegate.h; sourceTree = "<group>"; }; |
94 | + 93F3346F1247FB78006C6707 /* U1MusicAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1MusicAppDelegate.m; sourceTree = "<group>"; }; |
95 | 93F334701247FB78006C6707 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; |
96 | 93F334731247FB9F006C6707 /* AudioStreamer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioStreamer.h; sourceTree = "<group>"; }; |
97 | 93F334741247FB9F006C6707 /* AudioStreamer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioStreamer.m; sourceTree = "<group>"; }; |
98 | - 93F334841247FC15006C6707 /* iSub_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iSub_Prefix.pch; sourceTree = SOURCE_ROOT; }; |
99 | + 93F334841247FC15006C6707 /* U1Music_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = U1Music_Prefix.pch; path = ../U1Music_Prefix.pch; sourceTree = "<group>"; }; |
100 | 93F3348D1247FCDC006C6707 /* ArtistViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ArtistViewController.h; path = view_controllers/ArtistViewController.h; sourceTree = "<group>"; }; |
101 | 93F3348E1247FCDC006C6707 /* ArtistViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = ArtistViewController.m; path = view_controllers/ArtistViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; |
102 | 93F3348F1247FCDC006C6707 /* SongViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = SongViewController.h; path = view_controllers/SongViewController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; |
103 | @@ -520,7 +520,7 @@ |
104 | 93D6B50A1252CA71007880B0 /* music_29.png */, |
105 | 93D6B50D1252CA71007880B0 /* music_512.png */, |
106 | 53F0CD8111589F0A00A665CD /* progress-label-background.png */, |
107 | - 8D1107310486CEB800E47090 /* iSub-Info.plist */, |
108 | + 8D1107310486CEB800E47090 /* U1Music-Info.plist */, |
109 | 935FCC42123766E600B5DF9B /* Entitlements.plist */, |
110 | 93DFFE4C135D71760061F29F /* music.xcdatamodeld */, |
111 | ); |
112 | @@ -770,9 +770,9 @@ |
113 | isa = PBXGroup; |
114 | children = ( |
115 | 93BC520A124C187700B7587C /* SynthesizeSingleton.h */, |
116 | - 93F334841247FC15006C6707 /* iSub_Prefix.pch */, |
117 | - 93F3346E1247FB78006C6707 /* iSubAppDelegate.h */, |
118 | - 93F3346F1247FB78006C6707 /* iSubAppDelegate.m */, |
119 | + 93F334841247FC15006C6707 /* U1Music_Prefix.pch */, |
120 | + 93F3346E1247FB78006C6707 /* U1MusicAppDelegate.h */, |
121 | + 93F3346F1247FB78006C6707 /* U1MusicAppDelegate.m */, |
122 | 93F334701247FB78006C6707 /* main.m */, |
123 | ); |
124 | name = Main; |
125 | @@ -929,9 +929,9 @@ |
126 | /* End PBXGroup section */ |
127 | |
128 | /* Begin PBXNativeTarget section */ |
129 | - 1D6058900D05DD3D006BFB54 /* iSub */ = { |
130 | + 1D6058900D05DD3D006BFB54 /* U1Music */ = { |
131 | isa = PBXNativeTarget; |
132 | - buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "iSub" */; |
133 | + buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "U1Music" */; |
134 | buildPhases = ( |
135 | 1D60588D0D05DD3D006BFB54 /* Resources */, |
136 | 1D60588E0D05DD3D006BFB54 /* Sources */, |
137 | @@ -941,7 +941,7 @@ |
138 | ); |
139 | dependencies = ( |
140 | ); |
141 | - name = iSub; |
142 | + name = U1Music; |
143 | productName = iSubTESTING; |
144 | productReference = 1D6058910D05DD3D006BFB54 /* U1 Music.app */; |
145 | productType = "com.apple.product-type.application"; |
146 | @@ -954,7 +954,7 @@ |
147 | attributes = { |
148 | ORGANIZATIONNAME = Canonical; |
149 | }; |
150 | - buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "iSub" */; |
151 | + buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "U1Music" */; |
152 | compatibilityVersion = "Xcode 3.1"; |
153 | developmentRegion = English; |
154 | hasScannedForEncodings = 1; |
155 | @@ -969,7 +969,7 @@ |
156 | projectDirPath = ""; |
157 | projectRoot = ""; |
158 | targets = ( |
159 | - 1D6058900D05DD3D006BFB54 /* iSub */, |
160 | + 1D6058900D05DD3D006BFB54 /* U1Music */, |
161 | ); |
162 | }; |
163 | /* End PBXProject section */ |
164 | @@ -1074,7 +1074,7 @@ |
165 | 93F334531247FA2C006C6707 /* Artist.m in Sources */, |
166 | 93F3345C1247FA85006C6707 /* AlbumUITableViewCell.m in Sources */, |
167 | 93F3345F1247FA97006C6707 /* SongUITableViewCell.m in Sources */, |
168 | - 93F334711247FB78006C6707 /* iSubAppDelegate.m in Sources */, |
169 | + 93F334711247FB78006C6707 /* U1MusicAppDelegate.m in Sources */, |
170 | 93F334721247FB78006C6707 /* main.m in Sources */, |
171 | 93F334751247FB9F006C6707 /* AudioStreamer.m in Sources */, |
172 | 93F3349F1247FCDC006C6707 /* ArtistViewController.m in Sources */, |
173 | @@ -1158,9 +1158,9 @@ |
174 | GCC_DYNAMIC_NO_PIC = NO; |
175 | GCC_OPTIMIZATION_LEVEL = 0; |
176 | GCC_PRECOMPILE_PREFIX_HEADER = YES; |
177 | - GCC_PREFIX_HEADER = iSub_Prefix.pch; |
178 | + GCC_PREFIX_HEADER = U1Music_Prefix.pch; |
179 | GCC_VERSION = ""; |
180 | - INFOPLIST_FILE = "iSub-Info.plist"; |
181 | + INFOPLIST_FILE = "U1Music-Info.plist"; |
182 | PRODUCT_NAME = "U1 Music"; |
183 | PROVISIONING_PROFILE = ""; |
184 | "PROVISIONING_PROFILE[sdk=*]" = ""; |
185 | @@ -1180,9 +1180,9 @@ |
186 | COPY_PHASE_STRIP = NO; |
187 | CURRENT_PROJECT_VERSION = 6; |
188 | GCC_PRECOMPILE_PREFIX_HEADER = YES; |
189 | - GCC_PREFIX_HEADER = iSub_Prefix.pch; |
190 | + GCC_PREFIX_HEADER = U1Music_Prefix.pch; |
191 | GCC_VERSION = ""; |
192 | - INFOPLIST_FILE = "iSub-Info.plist"; |
193 | + INFOPLIST_FILE = "U1Music-Info.plist"; |
194 | IPHONEOS_DEPLOYMENT_TARGET = 4.0; |
195 | PRODUCT_NAME = "U1 Music"; |
196 | PROVISIONING_PROFILE = ""; |
197 | @@ -1234,7 +1234,7 @@ |
198 | /* End XCBuildConfiguration section */ |
199 | |
200 | /* Begin XCConfigurationList section */ |
201 | - 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "iSub" */ = { |
202 | + 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "U1Music" */ = { |
203 | isa = XCConfigurationList; |
204 | buildConfigurations = ( |
205 | 1D6058940D05DD3E006BFB54 /* Debug */, |
206 | @@ -1243,7 +1243,7 @@ |
207 | defaultConfigurationIsVisible = 0; |
208 | defaultConfigurationName = Release; |
209 | }; |
210 | - C01FCF4E08A954540054247B /* Build configuration list for PBXProject "iSub" */ = { |
211 | + C01FCF4E08A954540054247B /* Build configuration list for PBXProject "U1Music" */ = { |
212 | isa = XCConfigurationList; |
213 | buildConfigurations = ( |
214 | C01FCF4F08A954540054247B /* Debug */, |
215 | |
216 | === renamed file 'iSub_Prefix.pch' => 'U1Music_Prefix.pch' |
217 | === modified file 'xibs/MainWindow.xib' |
218 | --- xibs/MainWindow.xib 2011-05-18 14:26:11 +0000 |
219 | +++ xibs/MainWindow.xib 2011-07-25 19:46:02 +0000 |
220 | @@ -2,23 +2,16 @@ |
221 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10"> |
222 | <data> |
223 | <int key="IBDocument.SystemTarget">1056</int> |
224 | - <string key="IBDocument.SystemVersion">10J869</string> |
225 | - <string key="IBDocument.InterfaceBuilderVersion">1306</string> |
226 | - <string key="IBDocument.AppKitVersion">1038.35</string> |
227 | - <string key="IBDocument.HIToolboxVersion">461.00</string> |
228 | + <string key="IBDocument.SystemVersion">11A511</string> |
229 | + <string key="IBDocument.InterfaceBuilderVersion">907</string> |
230 | + <string key="IBDocument.AppKitVersion">1138</string> |
231 | + <string key="IBDocument.HIToolboxVersion">566.00</string> |
232 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> |
233 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
234 | - <string key="NS.object.0">301</string> |
235 | + <string key="NS.object.0">141</string> |
236 | </object> |
237 | - <object class="NSArray" key="IBDocument.IntegratedClassDependencies"> |
238 | + <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> |
239 | <bool key="EncodedWithXMLCoder">YES</bool> |
240 | - <string>IBProxyObject</string> |
241 | - <string>IBUITabBarItem</string> |
242 | - <string>IBUIViewController</string> |
243 | - <string>IBUICustomObject</string> |
244 | - <string>IBUITabBarController</string> |
245 | - <string>IBUIWindow</string> |
246 | - <string>IBUITabBar</string> |
247 | </object> |
248 | <object class="NSArray" key="IBDocument.PluginDependencies"> |
249 | <bool key="EncodedWithXMLCoder">YES</bool> |
250 | @@ -29,7 +22,9 @@ |
251 | <object class="NSArray" key="dict.sortedKeys" id="0"> |
252 | <bool key="EncodedWithXMLCoder">YES</bool> |
253 | </object> |
254 | - <reference key="dict.values" ref="0"/> |
255 | + <object class="NSMutableArray" key="dict.values"> |
256 | + <bool key="EncodedWithXMLCoder">YES</bool> |
257 | + </object> |
258 | </object> |
259 | <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> |
260 | <bool key="EncodedWithXMLCoder">YES</bool> |
261 | @@ -45,12 +40,10 @@ |
262 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
263 | </object> |
264 | <object class="IBUIWindow" id="380026005"> |
265 | - <reference key="NSNextResponder"/> |
266 | + <nil key="NSNextResponder"/> |
267 | <int key="NSvFlags">1316</int> |
268 | <object class="NSPSMatrix" key="NSFrameMatrix"/> |
269 | <string key="NSFrameSize">{320, 480}</string> |
270 | - <reference key="NSSuperview"/> |
271 | - <reference key="NSNextKeyView"/> |
272 | <object class="NSColor" key="IBUIBackgroundColor"> |
273 | <int key="NSColorSpace">1</int> |
274 | <bytes key="NSRGB">MSAxIDEAA</bytes> |
275 | @@ -68,7 +61,6 @@ |
276 | <int key="IBUIStatusBarStyle">2</int> |
277 | </object> |
278 | <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics"> |
279 | - <int key="IBUIInterfaceOrientation">1</int> |
280 | <int key="interfaceOrientation">1</int> |
281 | </object> |
282 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
283 | @@ -85,7 +77,6 @@ |
284 | <reference key="IBUIParentViewController" ref="348272196"/> |
285 | <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/> |
286 | <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics"> |
287 | - <int key="IBUIInterfaceOrientation">1</int> |
288 | <int key="interfaceOrientation">1</int> |
289 | </object> |
290 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
291 | @@ -106,7 +97,6 @@ |
292 | <reference key="IBUIParentViewController" ref="348272196"/> |
293 | <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/> |
294 | <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics"> |
295 | - <int key="IBUIInterfaceOrientation">1</int> |
296 | <int key="interfaceOrientation">1</int> |
297 | </object> |
298 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
299 | @@ -124,7 +114,6 @@ |
300 | <reference key="IBUIParentViewController" ref="348272196"/> |
301 | <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/> |
302 | <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics"> |
303 | - <int key="IBUIInterfaceOrientation">1</int> |
304 | <int key="interfaceOrientation">1</int> |
305 | </object> |
306 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
307 | @@ -142,7 +131,6 @@ |
308 | <reference key="IBUIParentViewController" ref="348272196"/> |
309 | <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/> |
310 | <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics"> |
311 | - <int key="IBUIInterfaceOrientation">1</int> |
312 | <int key="interfaceOrientation">1</int> |
313 | </object> |
314 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
315 | @@ -160,7 +148,6 @@ |
316 | <reference key="IBUIParentViewController" ref="348272196"/> |
317 | <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/> |
318 | <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics"> |
319 | - <int key="IBUIInterfaceOrientation">1</int> |
320 | <int key="interfaceOrientation">1</int> |
321 | </object> |
322 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
323 | @@ -168,11 +155,9 @@ |
324 | </object> |
325 | </object> |
326 | <object class="IBUITabBar" key="IBUITabBar" id="252579872"> |
327 | - <reference key="NSNextResponder"/> |
328 | + <nil key="NSNextResponder"/> |
329 | <int key="NSvFlags">266</int> |
330 | <string key="NSFrame">{{0, 431}, {320, 49}}</string> |
331 | - <reference key="NSSuperview"/> |
332 | - <reference key="NSNextKeyView"/> |
333 | <object class="NSColor" key="IBUIBackgroundColor"> |
334 | <int key="NSColorSpace">3</int> |
335 | <bytes key="NSWhite">MCAwAA</bytes> |
336 | @@ -373,14 +358,16 @@ |
337 | <object class="NSMutableDictionary"> |
338 | <bool key="EncodedWithXMLCoder">YES</bool> |
339 | <reference key="dict.sortedKeys" ref="0"/> |
340 | - <reference key="dict.values" ref="0"/> |
341 | + <object class="NSMutableArray" key="dict.values"> |
342 | + <bool key="EncodedWithXMLCoder">YES</bool> |
343 | + </object> |
344 | </object> |
345 | <string>{{11, 1059}, {320, 480}}</string> |
346 | <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
347 | <string>{{112, 1008}, {320, 480}}</string> |
348 | <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
349 | <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
350 | - <string>iSubAppDelegate</string> |
351 | + <string>U1MusicAppDelegate</string> |
352 | <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
353 | <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
354 | <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
355 | @@ -397,13 +384,17 @@ |
356 | <object class="NSMutableDictionary" key="unlocalizedProperties"> |
357 | <bool key="EncodedWithXMLCoder">YES</bool> |
358 | <reference key="dict.sortedKeys" ref="0"/> |
359 | - <reference key="dict.values" ref="0"/> |
360 | + <object class="NSMutableArray" key="dict.values"> |
361 | + <bool key="EncodedWithXMLCoder">YES</bool> |
362 | + </object> |
363 | </object> |
364 | <nil key="activeLocalization"/> |
365 | <object class="NSMutableDictionary" key="localizations"> |
366 | <bool key="EncodedWithXMLCoder">YES</bool> |
367 | <reference key="dict.sortedKeys" ref="0"/> |
368 | - <reference key="dict.values" ref="0"/> |
369 | + <object class="NSMutableArray" key="dict.values"> |
370 | + <bool key="EncodedWithXMLCoder">YES</bool> |
371 | + </object> |
372 | </object> |
373 | <nil key="sourceID"/> |
374 | <int key="maxID">67</int> |
375 | @@ -420,6 +411,7 @@ |
376 | <integer value="3100" key="NS.object.0"/> |
377 | </object> |
378 | <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> |
379 | + <nil key="IBDocument.LastKnownRelativeProjectPath"/> |
380 | <int key="IBDocument.defaultPropertyAccessControl">3</int> |
381 | <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> |
382 | <bool key="EncodedWithXMLCoder">YES</bool> |
383 | @@ -440,6 +432,6 @@ |
384 | <string>{30, 30}</string> |
385 | </object> |
386 | </object> |
387 | - <string key="IBCocoaTouchPluginVersion">301</string> |
388 | + <string key="IBCocoaTouchPluginVersion">141</string> |
389 | </data> |
390 | </archive> |
Approved, with the following diff:
=== modified file 'view_controlle rs/SettingsView Controller. m' s/SettingsViewC ontroller. m 2011-07-11 19:36:38 +0000 s/SettingsViewC ontroller. m 2011-07-27 16:33:38 +0000
--- view_controller
+++ view_controller
@@ -29,7 +29,6 @@
// DAMAGE.
#import "SettingsViewCo ntroller. h" oller.h"
-#import "iSubAppDelegate.h"
#import "AboutViewContr
#import "Subsonic.h"
#import "Downloader.h"
=== modified file 'view_controlle rs/SongViewCont roller. m' s/SongViewContr oller.m 2011-06-23 13:54:49 +0000 s/SongViewContr oller.m 2011-07-27 16:33:30 +0000
--- view_controller
+++ view_controller
@@ -29,7 +29,6 @@
// DAMAGE.
#import "SongViewContro ller.h"
-#import "iSubAppDelegate.h"
#import "StreamingPlayer.h"
#import "AudioStreamer.h"
#import "Album.h"