Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

SMFCenteredMenuController fixes + more

  • Loading branch information...
commit d14eb8fc9eea90c0272939232d2300de1357f236 1 parent 83e7df7
tomcool420 authored
2  SMFBaseAsset.h
@@ -14,7 +14,7 @@
14 14 NSMutableDictionary *_meta;
15 15 BRImage *_image;
16 16 }
17   -
  17 ++(SMFBaseAsset *)asset;
18 18 -(void)setObject:(id)arg1 forKey:(id)arg2;
19 19 -(void)setTitle:(NSString *)title;
20 20 -(void)setSummary:(NSString *)summary;
4 SMFBaseAsset.m
@@ -11,6 +11,10 @@
11 11
12 12
13 13 @implementation SMFBaseAsset
  14 ++(SMFBaseAsset *)asset
  15 +{
  16 + return [[[SMFBaseAsset alloc ]init] autorelease];
  17 +}
14 18 -(id)init
15 19 {
16 20 self=[super init];
2  SMFCenteredMenuController.m
@@ -16,7 +16,7 @@ - (id)itemForRow:(long)row { return [_items objectAtIndex:row];}
16 16 - (long)rowForTitle:(id)title { return (long)[_items indexOfObject:title];}
17 17 - (id)titleForRow:(long)row
18 18 {
19   - return [[_items objectAtIndex:row] text];
  19 + return [[self itemForRow:row] text];
20 20 }
21 21 - (long)defaultIndex { return 0;}
22 22 //- (id)previewControlForItem:(long)row
1  SMFCommonTools.m
@@ -113,7 +113,6 @@ -(int)syscallSeatbeltEnabled
113 113
114 114 -(int)disableSeatbelt
115 115 {
116   - NSLog(@"disable in framework");
117 116 return system("SMFHelper security.mac.vnode_enforce 0");
118 117 }
119 118 -(int)enableSeatbelt
2  SMFHelper/Makefile
@@ -13,4 +13,4 @@ include $(FW_MAKEDIR)/tool.mk
13 13 after-SMFHelper-stage::
14 14 $(FAKEROOT) chmod 4755 $(FW_STAGING_DIR)/usr/bin/SMFHelper
15 15 # $(FAKEROOT) chmod u+s $(FW_STAGING_DIR)/usr/bin/SMFHelper
16   - $(FAKEROOT) chown root:staff $(FW_STAGING_DIR)/usr/bin/SMFHelper
  16 + $(FAKEROOT) chown root:wheel $(FW_STAGING_DIR)/usr/bin/SMFHelper
BIN  SMFHelper/obj/SMFHelper
Binary file not shown
BIN  SMFHelper/obj/smfHelper.m.o
Binary file not shown
19 SMFHelper/smfHelper.m
@@ -9,21 +9,14 @@
9 9 #include <unistd.h>
10 10 #import <Foundation/Foundation.h>
11 11 #import <Backrow/Backrow.h>
12   -#import "../SynthesizeSingleton.h"
13   -@interface SMFHelperClass : NSObject
14   -//-(SMFHelperClass *)sharedInstance;
15   --(int)setSysValue:(NSString *)val forKey:(NSString *)key;
16   -@end
17 12
18   -@implementation SMFHelperClass
19   -//SYNTHESIZE_SINGLETON_FOR_CLASS(SMFHelperClass,sharedInstance)
20   --(int)setSysValue:(NSString *)val forKey:(NSString *)key
  13 +
  14 +static int setSysValue(NSString * val, NSString *k)
21 15 {
22   - return system([[NSString stringWithFormat:@"sysctl -w %@=%@",key,val,nil] UTF8String]);
  16 + NSLog(@"settingValue: %@ to key %@",val,k);
  17 + return system([[NSString stringWithFormat:@"sysctl -w %@=%@",k,val,nil] UTF8String]);
23 18 }
24 19
25   -@end
26   -
27 20
28 21 int main (int argc, const char * argv[]) {
29 22 NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
@@ -40,9 +33,7 @@ int main (int argc, const char * argv[]) {
40 33 NSString *option = [NSString stringWithUTF8String:argv[1]]; //argument 1
41 34 NSString *value = [NSString stringWithUTF8String:argv[2]]; //argument 2
42 35 int rvalue=0;
43   - SMFHelperClass *c = [[SMFHelperClass alloc] init];
44   - rvalue=[c setSysValue:value forKey:option];
45   - [c release];
  36 + rvalue = setSysValue(value,option);
46 37 [pool release];
47 38 return rvalue;
48 39 }
9 SMFMediaMenuController.m
@@ -8,7 +8,7 @@
8 8
9 9 #import "SMFMediaMenuController.h"
10 10 #import "SMFPopup.h"
11   -
  11 +#import "SMFMediaPreview.h"
12 12 @implementation SMFMediaMenuController
13 13 - (float)heightForRow:(long)row { return 0.0f;}
14 14 - (BOOL)rowSelectable:(long)row { return YES;}
@@ -24,10 +24,9 @@ - (id)titleForRow:(long)row
24 24 - (long)defaultIndex { return 0;}
25 25 - (id)previewControlForItem:(long)row
26 26 {
27   - BRImage * image = [[BRThemeInfo sharedTheme] appleTVIcon];
28   - BRImageAndSyncingPreviewController *preview = [[BRImageAndSyncingPreviewController alloc] init];
29   - [preview setImage:image];
30   - return [preview autorelease];
  27 + return [SMFMediaPreview simplePreviewWithTitle:[self titleForRow:row]
  28 + withSummary:nil
  29 + withImage:[[BRThemeInfo sharedTheme] appleTVIcon]];
31 30 }
32 31 - (id)init
33 32 {
17 SMFMediaPreview.h
@@ -11,28 +11,17 @@
11 11 #define METADATA_SUMMARY @"Summary"
12 12 #define METADATA_CUSTOM_KEYS @"KeysArray"
13 13 #define METADATA_CUSTOM_OBJECTS @"ObjectsArray"
14   -typedef enum {
15   - kMetaTypePlugin=0,
16   - kMetaTypeCustom=1,
17   - kMetaTypeSimple=2,
18   - kMetaTypeAsset=3,
19   -} SMMetaType;
20   -
  14 +@class SMFBaseAsset;
21 15 @interface SMFMediaPreview : BRMetadataPreviewControl{
22   - NSMutableDictionary *meta;
23   - SMMetaType MetaDataType;
24 16 BRImage *image;
25   - id *_assetCustom;
26 17 }
27 18 +(SMFMediaPreview *)simplePreviewWithTitle:(NSString *)title withSummary:(NSString *)summary withImage:(BRImage *)img;
  19 ++(SMFMediaPreview *)mediaPreviewWithAsset:(SMFBaseAsset *)a;
28 20 +(SMFMediaPreview *)mediaPreview;
29 21
30 22 - (id)coverArtForPath;
31   -//- (void)setUtilityData:(NSMutableDictionary *)newMeta;
32   -//- (void)setCustomMetaData:(NSMutableDictionary *)customMeta;
33 23 - (void)setImage:(BRImage *)currentImage;
34 24 - (void)setImagePath:(NSString *)path;
35   -//- (void)setSimpleMetaDataWithTitle:(NSString *)title andSummary:(NSString *)summary;
36   -//- (void)setAssetMeta:(id)asset;
  25 +
37 26
38 27 @end
155 SMFMediaPreview.mm
@@ -32,25 +32,21 @@ -(id)texture;
32 32 //@end
33 33
34 34
35   -@interface BRMetadataPreviewControl (compat)
36   -- (void)_populateMetadata;
37   -- (void)_updateMetadataLayer;
38   -- (id) _loadCoverArt;
39   -@end
40 35
41   -@interface BRMetadataPreviewControl (protectedAccess)
42   -- (BRMetadataControl *)gimmieMetadataLayer;
43   -@end
44 36
45   -@implementation BRMetadataPreviewControl (protectedAccess)
46   -- (BRMetadataControl *)gimmieMetadataLayer
47   -{
48   -// Class myClass = [self class];
49   -// Ivar ret = class_getInstanceVariable(myClass,"_metadataLayer");
50   -//
51   - return MSHookIvar<BRMetadataControl *>(self, "_metadataLayer");
52   -}
53   -@end
  37 +//@interface BRMetadataPreviewControl (protectedAccess)
  38 +//- (BRMetadataControl *)gimmieMetadataLayer;
  39 +//@end
  40 +
  41 +//@implementation BRMetadataPreviewControl (protectedAccess)
  42 +//- (BRMetadataControl *)gimmieMetadataLayer
  43 +//{
  44 +//// Class myClass = [self class];
  45 +//// Ivar ret = class_getInstanceVariable(myClass,"_metadataLayer");
  46 +////
  47 +// return MSHookIvar<BRMetadataControl *>(self, "_metadataLayer");
  48 +//}
  49 +//@end
54 50
55 51 @interface SMFMediaPreview (Custom)
56 52 - (void)doPopulation;
@@ -59,34 +55,29 @@ - (NSString *)coverArtForPath;
59 55
60 56 @implementation SMFMediaPreview
61 57
62   -static NSSet *coverArtExtentions = nil;
63 58
64 59 +(SMFMediaPreview *)simplePreviewWithTitle:(NSString *)title withSummary:(NSString *)summary withImage:(BRImage *)img
65 60 {
66   - SMFBaseAsset *a = [[SMFBaseAsset alloc] init];
67   - [a setTitle:title];
68   - [a setSummary:summary];
69   - [a setCoverArt:img];
  61 + SMFBaseAsset *a = [SMFBaseAsset asset];
  62 + if (title)
  63 + [a setTitle:title];
  64 + if(summary)
  65 + [a setSummary:summary];
  66 + if(img)
  67 + [a setCoverArt:img];
70 68 SMFMediaPreview *p = [[SMFMediaPreview alloc] init];
71 69 [p setAsset:a];
72   - [a release];
73 70 return [p autorelease];
74 71 }
75 72 +(SMFMediaPreview *)mediaPreview
76 73 {
77 74 return [[[SMFMediaPreview alloc] init] autorelease];
78 75 }
79   -+ (void)initialize
  76 ++(SMFMediaPreview *)mediaPreviewWithAsset:(SMFBaseAsset *)a
80 77 {
81   - /*Initialize the set of cover art extensions*/
82   - coverArtExtentions = [[NSSet alloc] initWithObjects:
83   - @"jpg",
84   - @"jpeg",
85   - @"tif",
86   - @"tiff",
87   - @"png",
88   - @"gif",
89   - nil];
  78 + SMFMediaPreview *p = [[SMFMediaPreview alloc] init];
  79 + [p setAsset:a];
  80 + return [p autorelease];
90 81 }
91 82 -(BRCoverArtImageLayer *)coverArtLayer
92 83 {
@@ -95,9 +86,7 @@ -(BRCoverArtImageLayer *)coverArtLayer
95 86 - (id)init
96 87 {
97 88 self=[super init];
98   - meta=[[NSMutableDictionary alloc] init];
99 89
100   - [meta setObject:@"No Title" forKey:METADATA_TITLE];
101 90 image=[[BRThemeInfo sharedTheme] appleTVIcon];
102 91 [image retain];
103 92 return self;
@@ -105,22 +94,10 @@ - (id)init
105 94
106 95 - (void)dealloc
107 96 {
108   - [meta release];
109 97 [image release];
110   - //[coverArtExtentions release];
111   - //[dirMeta release];
112 98 [super dealloc];
113 99 }
114 100
115   -//- (void)setUtilityData:(NSMutableDictionary *)newMeta
116   -//{
117   -// [meta release];
118   -// meta=[newMeta retain];
119   -// SMFMedia *asset =[SMFMedia alloc];
120   -// [asset setDefaultImage];
121   -// [self setAsset:asset];
122   -//
123   -//}
124 101
125 102 - (void)setImage:(BRImage *)currentImage
126 103 {
@@ -131,28 +108,14 @@ - (void)setImage:(BRImage *)currentImage
131 108 }
132 109 - (void)setImagePath:(NSString *)path
133 110 {
134   - if([[NSFileManager defaultManager] fileExistsAtPath:path] && [coverArtExtentions containsObject:[path pathExtension]])
  111 + if([[NSFileManager defaultManager] fileExistsAtPath:path])
135 112 {
136 113 [self setImage:[BRImage imageWithPath:path]];
137 114 }
138 115
139 116 }
140 117
141   -- (void)setAsset:(id)a
142   -{
143   - MetaDataType=kMetaTypeAsset;
144   - [super setAsset:a];
145   -// BRReflectionControl *c = MSHookIvar<BRReflectionControl *>(self, "_reflectionLayer");
146   -// [c setImage:[a coverArt]];
147   -// [c setReflectionAmount:0.337531];
148   -//
149   -// [[self coverArtLayer] setImage:[a coverArt]];
150   -//
151   - //[_coverArtLayer setImage:[asset coverArt]];
152   - //NSLog(@"_asset: %@",_asset);
153   -
154   - //[self _updateMetadataLayer];
155   -}
  118 +
156 119 -(void)setAssetMeta:(id)a
157 120 {
158 121 [self setAsset:a];
@@ -171,31 +134,6 @@ - (id)coverArtForPath
171 134 return [[BRThemeInfo sharedTheme] appleTVIcon];
172 135 }
173 136
174   -
175   -- (id)_loadCoverArt
176   -{
177   - //NSLog(@"loading cover art");
178   - [super _loadCoverArt];
179   - if([[self coverArtLayer] texture] != nil)
180   - return nil;
181   - id localImage = [self coverArtForPath];
182   -
183   - BRReflectionControl *c = MSHookIvar<BRReflectionControl *>(self, "_reflectionLayer");
184   - [c setImage:localImage];
185   - [c setReflectionAmount:0.337531];
186   -
187   - [[self coverArtLayer] setImage:localImage];
188   -
189   - return nil;
190   -}
191   -
192   -- (void)_populateMetadata
193   -{
194   - [super _populateMetadata];
195   - [self doPopulation];
196   -}
197   -
198   -
199 137 - (void)_updateMetadataLayer
200 138 {
201 139 [super _updateMetadataLayer];
@@ -204,35 +142,20 @@ - (void)_updateMetadataLayer
204 142
205 143 - (void)doPopulation
206 144 {
207   - BRMetadataControl *metaLayer = [self gimmieMetadataLayer];
208   - switch (MetaDataType) {
209   - case kMetaTypeAsset:
210   - {
211   - id a = [self asset];
212   - if ([a respondsToSelector:@selector(orderedDictionary)]) {
213   - NSDictionary *assetDict=[a orderedDictionary];
214   - if([[assetDict allKeys] containsObject:METADATA_TITLE])
215   - [metaLayer setTitle:[assetDict objectForKey:METADATA_TITLE]];
216   - if([[assetDict allKeys] containsObject:METADATA_SUMMARY])
217   - [metaLayer setSummary:[assetDict objectForKey:METADATA_SUMMARY]];
218   - if([[assetDict allKeys] containsObject:METADATA_CUSTOM_KEYS])
219   - {
220   - //NSLog(@"%@",[assetDict objectForKey:METADATA_CUSTOM_OBJECTS]);
221   - //NSLog(@"%@",[assetDict objectForKey:METADATA_CUSTOM_KEYS]);
222   - [metaLayer setMetadata:[assetDict objectForKey:METADATA_CUSTOM_OBJECTS] withLabels:[assetDict objectForKey:METADATA_CUSTOM_KEYS]];
223   - }
224   - }
225   - break;
226   - }
227   - default:
  145 + //BRMetadataControl *metaLayer = [self gimmieMetadataLayer];
  146 + BRMetadataControl *metaLayer = [self metadataControl];
  147 + id a = [self asset];
  148 + if ([a respondsToSelector:@selector(orderedDictionary)]) {
  149 + NSDictionary *assetDict=[a orderedDictionary];
  150 + if([[assetDict allKeys] containsObject:METADATA_TITLE])
  151 + [metaLayer setTitle:[assetDict objectForKey:METADATA_TITLE]];
  152 + if([[assetDict allKeys] containsObject:METADATA_SUMMARY])
  153 + [metaLayer setSummary:[assetDict objectForKey:METADATA_SUMMARY]];
  154 + if([[assetDict allKeys] containsObject:METADATA_CUSTOM_KEYS])
228 155 {
229   - [metaLayer setTitle:[meta objectForKey:METADATA_TITLE]];
230   - [metaLayer setSummary:[meta objectForKey:METADATA_SUMMARY]];
231   - break;
  156 + [metaLayer setMetadata:[assetDict objectForKey:METADATA_CUSTOM_OBJECTS] withLabels:[assetDict objectForKey:METADATA_CUSTOM_KEYS]];
232 157 }
233   -
234 158 }
235   - //`NSLog(@"donePopulating");
236 159
237 160
238 161
@@ -241,6 +164,10 @@ - (void)doPopulation
241 164
242 165 - (BOOL)_assetHasMetadata
243 166 {
  167 + if ([[self asset] respondsToSelector:@selector(orderedDictionary)]) {
  168 + return YES;
  169 + }
  170 + NSLog(@"asset has not meta??");
244 171 return YES;
245 172 }
246 173
12 SMFPasscodeController.m
@@ -56,12 +56,12 @@ - (id)initWithTitle:(NSString *)t withDescription:(NSString *)desc withBoxes:(in
56 56 }
57 57 - (void) dealloc
58 58 {
59   -// self.title=nil;
60   -// self.delegate=nil;
61   -// self.description=nil;
62   -// self.key=nil;
63   -// self.domain=nil;
64   -// self.icon=nil;
  59 + self.title=nil;
  60 + self.delegate=nil;
  61 + self.description=nil;
  62 + self.key=nil;
  63 + self.domain=nil;
  64 + self.icon=nil;
65 65 [super dealloc];
66 66 }
67 67 -(void)controlWasActivated
3  SMFProgressBarMenuItem.h
@@ -6,9 +6,10 @@
6 6 // Copyright 2010 Thomas Cool. All rights reserved.
7 7 //
8 8 #import <Backrow/Backrow.h>
  9 +#import "SMFMenuItem.h"
9 10
10 11 @class SMFProgressBarControl;
11   -@interface SMFProgressBarMenuItem : BRMenuItem {
  12 +@interface SMFProgressBarMenuItem : SMFMenuItem {
12 13 SMFProgressBarControl * _progressBar;
13 14 BOOL showBar;
14 15 float _leftBarIndent; //number from 0 -> 1
1  SMFramework.h
@@ -36,5 +36,6 @@
36 36 #import "SMFQueryMenu.h"
37 37 #import "SMFThemeInfo.h"
38 38 #import "SMFMenuItem.h"
  39 +#import "SMFProgressBarMenuItem.h"
39 40 #import "SMFPreferences.h"
40 41 #import "SMFImageAsset.h"
80 SMFramework.xcodeproj/tomcool.pbxuser
@@ -326,7 +326,7 @@
326 326 };
327 327 DD0F80B8127CF99A00277D06 /* SMFThemeInfo.h */ = {
328 328 uiCtxt = {
329   - sepNavIntBoundsRect = "{{0, 0}, {1034, 635}}";
  329 + sepNavIntBoundsRect = "{{0, 0}, {1038, 389}}";
330 330 sepNavSelRange = "{164, 0}";
331 331 sepNavVisRange = "{0, 500}";
332 332 };
@@ -334,15 +334,15 @@
334 334 DD0F80B9127CF99A00277D06 /* SMFThemeInfo.m */ = {
335 335 uiCtxt = {
336 336 sepNavIntBoundsRect = "{{0, 0}, {1038, 1105}}";
337   - sepNavSelRange = "{1059, 0}";
338   - sepNavVisRange = "{818, 1289}";
  337 + sepNavSelRange = "{2411, 28}";
  338 + sepNavVisRange = "{0, 675}";
339 339 };
340 340 };
341 341 DD0F80C5127CF9F400277D06 /* SynthesizeSingleton.h */ = {
342 342 uiCtxt = {
343 343 sepNavIntBoundsRect = "{{0, 0}, {1038, 897}}";
344 344 sepNavSelRange = "{565, 642}";
345   - sepNavVisRange = "{565, 465}";
  345 + sepNavVisRange = "{565, 438}";
346 346 };
347 347 };
348 348 DD145C7812B4693000FA8984 /* PBXTextBookmark */ = {
@@ -1207,16 +1207,16 @@
1207 1207 };
1208 1208 DD2C4CE412ADC78C00A83159 /* SMFPreferences.h */ = {
1209 1209 uiCtxt = {
1210   - sepNavIntBoundsRect = "{{0, 0}, {1034, 635}}";
  1210 + sepNavIntBoundsRect = "{{0, 0}, {1038, 389}}";
1211 1211 sepNavSelRange = "{167, 0}";
1212 1212 sepNavVisRange = "{0, 382}";
1213 1213 };
1214 1214 };
1215 1215 DD2C4CE512ADC78C00A83159 /* SMFPreferences.m */ = {
1216 1216 uiCtxt = {
1217   - sepNavIntBoundsRect = "{{0, 0}, {1034, 1339}}";
  1217 + sepNavIntBoundsRect = "{{0, 0}, {1038, 1339}}";
1218 1218 sepNavSelRange = "{200, 233}";
1219   - sepNavVisRange = "{0, 641}";
  1219 + sepNavVisRange = "{0, 623}";
1220 1220 sepNavWindowFrame = "{{15, 4}, {1225, 874}}";
1221 1221 };
1222 1222 };
@@ -1350,7 +1350,7 @@
1350 1350 fRef = DDDC80FE1273909900192ADD /* SMFMediaPreview.h */;
1351 1351 name = "SMFMediaPreview.h: 28";
1352 1352 rLen = 0;
1353   - rLoc = 890;
  1353 + rLoc = 728;
1354 1354 rType = 0;
1355 1355 vrLen = 1094;
1356 1356 vrLoc = 149;
@@ -1360,7 +1360,7 @@
1360 1360 fRef = DDDC80FF1273909900192ADD /* SMFMediaPreview.mm */;
1361 1361 name = "SMFMediaPreview.mm: 119";
1362 1362 rLen = 0;
1363   - rLoc = 2849;
  1363 + rLoc = 2359;
1364 1364 rType = 0;
1365 1365 vrLen = 604;
1366 1366 vrLoc = 5417;
@@ -2220,14 +2220,14 @@
2220 2220 };
2221 2221 DD96C3401298B8EA002C5144 /* SMFPopup.xm */ = {
2222 2222 uiCtxt = {
2223   - sepNavIntBoundsRect = "{{0, 0}, {1034, 754}}";
  2223 + sepNavIntBoundsRect = "{{0, 0}, {1038, 741}}";
2224 2224 sepNavSelRange = "{282, 0}";
2225   - sepNavVisRange = "{0, 740}";
  2225 + sepNavVisRange = "{0, 690}";
2226 2226 };
2227 2227 };
2228 2228 DD96C3411298B9A0002C5144 /* SMFPopup.h */ = {
2229 2229 uiCtxt = {
2230   - sepNavIntBoundsRect = "{{0, 0}, {1034, 412}}";
  2230 + sepNavIntBoundsRect = "{{0, 0}, {1038, 389}}";
2231 2231 sepNavSelRange = "{161, 0}";
2232 2232 sepNavVisRange = "{0, 215}";
2233 2233 };
@@ -2286,16 +2286,16 @@
2286 2286 };
2287 2287 DD96C83A129B5C99002C5144 /* SMFColorSelectionMenu.h */ = {
2288 2288 uiCtxt = {
2289   - sepNavIntBoundsRect = "{{0, 0}, {1212, 440}}";
  2289 + sepNavIntBoundsRect = "{{0, 0}, {1038, 389}}";
2290 2290 sepNavSelRange = "{173, 0}";
2291 2291 sepNavVisRange = "{0, 709}";
2292 2292 };
2293 2293 };
2294 2294 DD96C83B129B5C99002C5144 /* SMFColorSelectionMenu.m */ = {
2295 2295 uiCtxt = {
2296   - sepNavIntBoundsRect = "{{0, 0}, {1034, 1287}}";
  2296 + sepNavIntBoundsRect = "{{0, 0}, {1038, 1248}}";
2297 2297 sepNavSelRange = "{1769, 186}";
2298   - sepNavVisRange = "{1075, 1948}";
  2298 + sepNavVisRange = "{1203, 1461}";
2299 2299 sepNavWindowFrame = "{{15, 4}, {788, 874}}";
2300 2300 };
2301 2301 };
@@ -2434,9 +2434,9 @@
2434 2434 };
2435 2435 DDA302A61274EF8900B0AE9C /* SMFDefines.h */ = {
2436 2436 uiCtxt = {
2437   - sepNavIntBoundsRect = "{{0, 0}, {1092, 749}}";
  2437 + sepNavIntBoundsRect = "{{0, 0}, {1038, 455}}";
2438 2438 sepNavSelRange = "{428, 0}";
2439   - sepNavVisRange = "{0, 902}";
  2439 + sepNavVisRange = "{0, 787}";
2440 2440 };
2441 2441 };
2442 2442 DDA302A71274EFD000B0AE9C /* BRMenuItem_SMF.h */ = {
@@ -2469,16 +2469,16 @@
2469 2469 };
2470 2470 DDABC41A127877B3001F026B /* SMFScreenCapture.h */ = {
2471 2471 uiCtxt = {
2472   - sepNavIntBoundsRect = "{{0, 0}, {1034, 635}}";
  2472 + sepNavIntBoundsRect = "{{0, 0}, {1038, 389}}";
2473 2473 sepNavSelRange = "{200, 0}";
2474 2474 sepNavVisRange = "{0, 473}";
2475 2475 };
2476 2476 };
2477 2477 DDABC41B127877B3001F026B /* SMFScreenCapture.m */ = {
2478 2478 uiCtxt = {
2479   - sepNavIntBoundsRect = "{{0, 0}, {1587, 1755}}";
  2479 + sepNavIntBoundsRect = "{{0, 0}, {1587, 1768}}";
2480 2480 sepNavSelRange = "{1532, 0}";
2481   - sepNavVisRange = "{682, 2244}";
  2481 + sepNavVisRange = "{682, 2167}";
2482 2482 };
2483 2483 };
2484 2484 DDABC52D1278EEF2001F026B /* PBXTextBookmark */ = {
@@ -2595,16 +2595,16 @@
2595 2595 };
2596 2596 DDAE5C03127E328C0038574E /* SMFPhotoMethods.h */ = {
2597 2597 uiCtxt = {
2598   - sepNavIntBoundsRect = "{{0, 0}, {1038, 780}}";
  2598 + sepNavIntBoundsRect = "{{0, 0}, {1038, 754}}";
2599 2599 sepNavSelRange = "{920, 0}";
2600   - sepNavVisRange = "{535, 855}";
  2600 + sepNavVisRange = "{0, 737}";
2601 2601 };
2602 2602 };
2603 2603 DDAE5C04127E328C0038574E /* SMFPhotoMethods.mm */ = {
2604 2604 uiCtxt = {
2605 2605 sepNavIntBoundsRect = "{{0, 0}, {1038, 3991}}";
2606 2606 sepNavSelRange = "{1539, 0}";
2607   - sepNavVisRange = "{1124, 878}";
  2607 + sepNavVisRange = "{1124, 873}";
2608 2608 sepNavWindowFrame = "{{15, 4}, {788, 874}}";
2609 2609 };
2610 2610 };
@@ -2799,16 +2799,16 @@
2799 2799 };
2800 2800 DDAE5E0A12838A980038574E /* SMFCommonTools.h */ = {
2801 2801 uiCtxt = {
2802   - sepNavIntBoundsRect = "{{0, 0}, {1038, 1105}}";
  2802 + sepNavIntBoundsRect = "{{0, 0}, {1038, 1144}}";
2803 2803 sepNavSelRange = "{1637, 0}";
2804   - sepNavVisRange = "{856, 1253}";
  2804 + sepNavVisRange = "{0, 713}";
2805 2805 };
2806 2806 };
2807 2807 DDAE5E0B12838A980038574E /* SMFCommonTools.m */ = {
2808 2808 uiCtxt = {
2809   - sepNavIntBoundsRect = "{{0, 0}, {1090, 1638}}";
2810   - sepNavSelRange = "{715, 0}";
2811   - sepNavVisRange = "{1313, 1304}";
  2809 + sepNavIntBoundsRect = "{{0, 0}, {1090, 1651}}";
  2810 + sepNavSelRange = "{3686, 0}";
  2811 + sepNavVisRange = "{2997, 836}";
2812 2812 sepNavWindowFrame = "{{15, 4}, {1225, 874}}";
2813 2813 };
2814 2814 };
@@ -3336,16 +3336,16 @@
3336 3336 };
3337 3337 DDDC80F91273784800192ADD /* SMFFolderBrowser.h */ = {
3338 3338 uiCtxt = {
3339   - sepNavIntBoundsRect = "{{0, 0}, {1038, 702}}";
  3339 + sepNavIntBoundsRect = "{{0, 0}, {1038, 715}}";
3340 3340 sepNavSelRange = "{171, 0}";
3341   - sepNavVisRange = "{88, 1100}";
  3341 + sepNavVisRange = "{88, 1096}";
3342 3342 };
3343 3343 };
3344 3344 DDDC80FA1273784800192ADD /* SMFFolderBrowser.m */ = {
3345 3345 uiCtxt = {
3346   - sepNavIntBoundsRect = "{{0, 0}, {1038, 4706}}";
  3346 + sepNavIntBoundsRect = "{{0, 0}, {1038, 4511}}";
3347 3347 sepNavSelRange = "{7876, 0}";
3348   - sepNavVisRange = "{6968, 1081}";
  3348 + sepNavVisRange = "{25, 869}";
3349 3349 };
3350 3350 };
3351 3351 DDDC80FB1273902A00192ADD /* SMFBaseAsset.h */ = {
@@ -3365,17 +3365,17 @@
3365 3365 };
3366 3366 DDDC80FE1273909900192ADD /* SMFMediaPreview.h */ = {
3367 3367 uiCtxt = {
3368   - sepNavIntBoundsRect = "{{0, 0}, {1038, 507}}";
3369   - sepNavSelRange = "{890, 0}";
3370   - sepNavVisRange = "{149, 1089}";
  3368 + sepNavIntBoundsRect = "{{0, 0}, {1038, 389}}";
  3369 + sepNavSelRange = "{417, 0}";
  3370 + sepNavVisRange = "{0, 841}";
3371 3371 sepNavWindowFrame = "{{15, 4}, {1037, 874}}";
3372 3372 };
3373 3373 };
3374 3374 DDDC80FF1273909900192ADD /* SMFMediaPreview.mm */ = {
3375 3375 uiCtxt = {
3376   - sepNavIntBoundsRect = "{{0, 0}, {1062, 3263}}";
3377   - sepNavSelRange = "{2849, 0}";
3378   - sepNavVisRange = "{1737, 637}";
  3376 + sepNavIntBoundsRect = "{{0, 0}, {1038, 2288}}";
  3377 + sepNavSelRange = "{2965, 0}";
  3378 + sepNavVisRange = "{1794, 608}";
3379 3379 sepNavWindowFrame = "{{15, 4}, {1037, 874}}";
3380 3380 };
3381 3381 };
@@ -3417,9 +3417,9 @@
3417 3417 };
3418 3418 DDDC818F1273B8C000192ADD /* SMFramework.h */ = {
3419 3419 uiCtxt = {
3420   - sepNavIntBoundsRect = "{{0, 0}, {1038, 520}}";
  3420 + sepNavIntBoundsRect = "{{0, 0}, {1038, 546}}";
3421 3421 sepNavSelRange = "{267, 0}";
3422   - sepNavVisRange = "{0, 614}";
  3422 + sepNavVisRange = "{0, 586}";
3423 3423 };
3424 3424 };
3425 3425 DDDC81991273B9B800192ADD /* Install */ = {
2  _/DEBIAN/control
... ... @@ -1,6 +1,6 @@
1 1 Package: org.tomcool.smframework
2 2 Name: SMFramework
3   -Version: 0.5.7-41
  3 +Version: 0.5.8-14
4 4 Architecture: iphoneos-arm
5 5 Description: Framework for most packages written by me
6 6 Maintainer: Thomas Cool <thomas.cool@me.com>
2  _/Library/Frameworks/SMFramework.framework/Headers/SMFBaseAsset.h
@@ -14,7 +14,7 @@
14 14 NSMutableDictionary *_meta;
15 15 BRImage *_image;
16 16 }
17   -
  17 ++(SMFBaseAsset *)asset;
18 18 -(void)setObject:(id)arg1 forKey:(id)arg2;
19 19 -(void)setTitle:(NSString *)title;
20 20 -(void)setSummary:(NSString *)summary;
17 _/Library/Frameworks/SMFramework.framework/Headers/SMFMediaPreview.h
@@ -11,28 +11,17 @@
11 11 #define METADATA_SUMMARY @"Summary"
12 12 #define METADATA_CUSTOM_KEYS @"KeysArray"
13 13 #define METADATA_CUSTOM_OBJECTS @"ObjectsArray"
14   -typedef enum {
15   - kMetaTypePlugin=0,
16   - kMetaTypeCustom=1,
17   - kMetaTypeSimple=2,
18   - kMetaTypeAsset=3,
19   -} SMMetaType;
20   -
  14 +@class SMFBaseAsset;
21 15 @interface SMFMediaPreview : BRMetadataPreviewControl{
22   - NSMutableDictionary *meta;
23   - SMMetaType MetaDataType;
24 16 BRImage *image;
25   - id *_assetCustom;
26 17 }
27 18 +(SMFMediaPreview *)simplePreviewWithTitle:(NSString *)title withSummary:(NSString *)summary withImage:(BRImage *)img;
  19 ++(SMFMediaPreview *)mediaPreviewWithAsset:(SMFBaseAsset *)a;
28 20 +(SMFMediaPreview *)mediaPreview;
29 21
30 22 - (id)coverArtForPath;
31   -//- (void)setUtilityData:(NSMutableDictionary *)newMeta;
32   -//- (void)setCustomMetaData:(NSMutableDictionary *)customMeta;
33 23 - (void)setImage:(BRImage *)currentImage;
34 24 - (void)setImagePath:(NSString *)path;
35   -//- (void)setSimpleMetaDataWithTitle:(NSString *)title andSummary:(NSString *)summary;
36   -//- (void)setAssetMeta:(id)asset;
  25 +
37 26
38 27 @end
1  _/Library/Frameworks/SMFramework.framework/Headers/SMFramework.h
@@ -36,5 +36,6 @@
36 36 #import "SMFQueryMenu.h"
37 37 #import "SMFThemeInfo.h"
38 38 #import "SMFMenuItem.h"
  39 +#import "SMFProgressBarMenuItem.h"
39 40 #import "SMFPreferences.h"
40 41 #import "SMFImageAsset.h"
BIN  _/Library/Frameworks/SMFramework.framework/SMFramework
Binary file not shown
BIN  obj/SMFBaseAsset.m.o
Binary file not shown
BIN  obj/SMFCenteredMenuController.m.o
Binary file not shown
BIN  obj/SMFMediaMenuController.m.o
Binary file not shown
BIN  obj/SMFMediaPreview.mm.o
Binary file not shown
BIN  obj/SMFPasscodeController.m.o
Binary file not shown
BIN  obj/SMFramework
Binary file not shown

0 comments on commit d14eb8f

Please sign in to comment.
Something went wrong with that request. Please try again.