Permalink
Browse files

27112012

- Added an xmlURL property to the Kiosk MenuViewController
- Security framework added in xcconfig
  • Loading branch information...
1 parent 4a2d2a1 commit feb4b797c5fc6a4e86e893070ab337a83d028efa @s1g53gv s1g53gv committed Nov 27, 2012
Showing with 16 additions and 11 deletions.
  1. BIN Bundle/FPKKioskBundle.bundle/Kiosk_ipad.nib
  2. BIN Bundle/FPKKioskBundle.bundle/Kiosk_phone.nib
  3. BIN Bundle/FPKKioskBundle.bundle/Kiosk_phone5.nib
  4. BIN Bundle/FPKReaderBundle.bundle/AudioViewController.nib
  5. BIN Bundle/FPKReaderBundle.bundle/BookmarkView.nib
  6. BIN Bundle/FPKReaderBundle.bundle/Info.plist
  7. BIN Bundle/FPKReaderBundle.bundle/OutlineView.nib
  8. BIN Bundle/FPKReaderBundle.bundle/SearchView2_pad.nib
  9. BIN Bundle/FPKReaderBundle.bundle/SearchView2_phone.nib
  10. BIN Bundle/FPKReaderBundle.bundle/TextDisplayView.nib
  11. BIN Bundle/FPKReaderBundle.bundle/WebBrowser.nib
  12. BIN Bundle/FPKReaderBundle.bundle/X.png
  13. BIN Bundle/FPKReaderBundle.bundle/X@2x.png
  14. BIN Bundle/FPKReaderBundle.bundle/blackslider.png
  15. BIN Bundle/FPKReaderBundle.bundle/bookmark_add.png
  16. BIN Bundle/FPKReaderBundle.bundle/bookmark_add@2x.png
  17. BIN Bundle/FPKReaderBundle.bundle/changeModeDouble.png
  18. BIN Bundle/FPKReaderBundle.bundle/changeModeDouble@2x.png
  19. BIN Bundle/FPKReaderBundle.bundle/changeModeOverflow.png
  20. BIN Bundle/FPKReaderBundle.bundle/changeModeOverflow@2x.png
  21. BIN Bundle/FPKReaderBundle.bundle/changeModeSingle.png
  22. BIN Bundle/FPKReaderBundle.bundle/changeModeSingle@2x.png
  23. BIN Bundle/FPKReaderBundle.bundle/close.png
  24. BIN Bundle/FPKReaderBundle.bundle/close_player.png
  25. BIN Bundle/FPKReaderBundle.bundle/direction_l2r.png
  26. BIN Bundle/FPKReaderBundle.bundle/direction_l2r@2x.png
  27. BIN Bundle/FPKReaderBundle.bundle/direction_r2l.png
  28. BIN Bundle/FPKReaderBundle.bundle/direction_r2l@2x.png
  29. BIN Bundle/FPKReaderBundle.bundle/img_outline_triangledown.png
  30. BIN Bundle/FPKReaderBundle.bundle/img_outline_triangleright.png
  31. BIN Bundle/FPKReaderBundle.bundle/indice.png
  32. BIN Bundle/FPKReaderBundle.bundle/indice@2x.png
  33. BIN Bundle/FPKReaderBundle.bundle/next.png
  34. BIN Bundle/FPKReaderBundle.bundle/pagelead.png
  35. BIN Bundle/FPKReaderBundle.bundle/pagelead@2x.png
  36. BIN Bundle/FPKReaderBundle.bundle/pause_player.png
  37. BIN Bundle/FPKReaderBundle.bundle/play_player.png
  38. BIN Bundle/FPKReaderBundle.bundle/prew.png
  39. BIN Bundle/FPKReaderBundle.bundle/reload.png
  40. BIN Bundle/FPKReaderBundle.bundle/search.png
  41. BIN Bundle/FPKReaderBundle.bundle/search@2x.png
  42. BIN Bundle/FPKReaderBundle.bundle/stop.png
  43. BIN Bundle/FPKReaderBundle.bundle/text.png
  44. BIN Bundle/FPKReaderBundle.bundle/text@2x.png
  45. BIN Bundle/FPKReaderBundle.bundle/zoomLock.png
  46. BIN Bundle/FPKReaderBundle.bundle/zoomLock@2x.png
  47. BIN Bundle/FPKReaderBundle.bundle/zoomUnlock.png
  48. BIN Bundle/FPKReaderBundle.bundle/zoomUnlock@2x.png
  49. +1 −1 Classes/KioskApp/Controllers/MenuViewController_Kiosk.h
  50. +7 −7 Classes/KioskApp/Controllers/MenuViewController_Kiosk.m
  51. BIN FastPdfKit.embeddedframework/FastPdfKit.framework/Versions/A/FastPdfKit
  52. BIN ...ramework/FastPdfKit.framework/Versions/A/Resources/FPKReaderBundle.bundle/AudioViewController.nib
  53. BIN ...beddedframework/FastPdfKit.framework/Versions/A/Resources/FPKReaderBundle.bundle/BookmarkView.nib
  54. BIN ...mbeddedframework/FastPdfKit.framework/Versions/A/Resources/FPKReaderBundle.bundle/OutlineView.nib
  55. BIN ...dedframework/FastPdfKit.framework/Versions/A/Resources/FPKReaderBundle.bundle/SearchView2_pad.nib
  56. BIN ...dframework/FastPdfKit.framework/Versions/A/Resources/FPKReaderBundle.bundle/SearchView2_phone.nib
  57. BIN ...dedframework/FastPdfKit.framework/Versions/A/Resources/FPKReaderBundle.bundle/TextDisplayView.nib
  58. BIN ...embeddedframework/FastPdfKit.framework/Versions/A/Resources/FPKReaderBundle.bundle/WebBrowser.nib
  59. +1 −1 FastPdfKit.embeddedframework/FastPdfKit.framework/Versions/A/Resources/FastPdfKitFramework.xcconfig
  60. +1 −1 OtherSources/FastPdfKit.xcconfig
  61. +1 −1 OtherSources/FastPdfKitFramework.xcconfig
  62. +5 −0 README.md
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
@@ -39,7 +39,7 @@
@property (nonatomic, retain) NSMutableArray *documentsList;
@property (nonatomic, retain) UIScrollView *scrollView;
-
+@property (nonatomic, strong) NSURL * xmlURL;
@property (nonatomic,retain ) NSDictionary *buttonRemoveDict;
@property (nonatomic,retain ) NSDictionary *openButtons;
@property (nonatomic,retain ) NSDictionary *progressViewDict;
@@ -26,7 +26,7 @@ @implementation MenuViewController_Kiosk
@synthesize graphicsMode;
@synthesize scrollView;
@synthesize interfaceLoaded;
-
+@synthesize xmlURL;
-(IBAction)actionOpenPlainDocument:(NSString *)documentName {
@@ -88,7 +88,8 @@ -(id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
bookItemViews = [[NSMutableArray alloc]init];
xmlDirty = YES;
-
+
+ self.xmlURL = [NSURL URLWithString:FPK_KIOSK_XML_URL];
}
return self;
@@ -107,14 +108,14 @@ - (void)viewDidLoad {
xmlDirty = NO;
parser = [[XMLParser alloc] init];
- xmlUrl = [NSURL URLWithString:FPK_KIOSK_XML_URL];
- [parser parseXMLFileAtURL:xmlUrl];
+
+ [parser parseXMLFileAtURL:self.xmlURL];
if([parser isDone]) {
self.documentsList = [parser parsedItems];
- } else {
+ } else { // Embedded xml as backup.
xmlUrl = [MF_BUNDLED_BUNDLE(@"FPKKioskBundle") URLForResource:FPK_KIOSK_XML_NAME withExtension:@"xml"];
@@ -128,7 +129,6 @@ - (void)viewDidLoad {
[parser release];
}
- //[self performSelector:@selector(buildInterface) withObject:nil afterDelay:0.5];
[self buildInterface];
}
@@ -310,7 +310,7 @@ - (void)dealloc {
[downloadProgressView release];
[scrollView release];
-
+ [xmlURL release];
[bookItemViews release];
[super dealloc];
@@ -1 +1 @@
-OTHER_LDFLAGS = $(inherited) -framework AudioToolbox -framework MediaPlayer -framework MobileCoreServices -framework CFNetwork -framework CoreText -framework UIKit -framework CoreGraphics -framework Foundation -framework QuartzCore -framework AVFoundation -framework CoreFoundation -framework SystemConfiguration -lz -ObjC
+OTHER_LDFLAGS = $(inherited) -framework AudioToolbox -framework MediaPlayer -framework MobileCoreServices -framework CFNetwork -framework CoreText -framework UIKit -framework CoreGraphics -framework Foundation -framework QuartzCore -framework AVFoundation -framework CoreFoundation -framework SystemConfiguration -framework Security -lz -ObjC
@@ -1,3 +1,3 @@
USER_HEADER_SEARCH_PATHS = $(inherited) $(FASTPDFKIT_DIR)/** $(FASTPDFKIT_DIR)/FPKCore $(FASTPDFKIT_DIR)/Classes/**
LIBRARY_SEARCH_PATHS = $(inherited) $(FASTPDFKIT_DIR)/**
-OTHER_LDFLAGS = $(inherited) -framework AudioToolbox -framework MediaPlayer -framework MobileCoreServices -framework CFNetwork -framework CoreText -framework UIKit -framework CoreGraphics -framework Foundation -framework QuartzCore -framework AVFoundation -framework CoreFoundation -framework SystemConfiguration -lz -lFPKReaderLib
+OTHER_LDFLAGS = $(inherited) -framework AudioToolbox -framework MediaPlayer -framework MobileCoreServices -framework CFNetwork -framework CoreText -framework UIKit -framework CoreGraphics -framework Foundation -framework QuartzCore -framework AVFoundation -framework CoreFoundation -framework SystemConfiguration -framework Security -lz -lFPKReaderLib
@@ -1 +1 @@
-OTHER_LDFLAGS = $(inherited) -framework AudioToolbox -framework MediaPlayer -framework MobileCoreServices -framework CFNetwork -framework CoreText -framework UIKit -framework CoreGraphics -framework Foundation -framework QuartzCore -framework AVFoundation -framework CoreFoundation -framework SystemConfiguration -lz -ObjC
+OTHER_LDFLAGS = $(inherited) -framework AudioToolbox -framework MediaPlayer -framework MobileCoreServices -framework CFNetwork -framework CoreText -framework UIKit -framework CoreGraphics -framework Foundation -framework QuartzCore -framework AVFoundation -framework CoreFoundation -framework SystemConfiguration -framework Security -lz -ObjC
View
@@ -300,6 +300,11 @@ This guide is also available as [screencast number 4](http://fastpdfkit.com/tuto
## Changelog
+# Update Novembre 27, 2012
+* Added an xmlURL property to the Kiosk MenuViewController to customize the list
+without subclassing.
+* Security framework added in xcconfig.
+
# Update November 26, 2012
* Improved handling of space glyph in the text
* Bunch of small tweaks and fixes

0 comments on commit feb4b79

Please sign in to comment.