diff options
32 files changed, 136 insertions, 140 deletions
diff --git a/platform/ios/Classes/MuAnnotSelectView.h b/platform/ios/Classes/MuAnnotSelectView.h index cd429df1..5a3e6741 100644 --- a/platform/ios/Classes/MuAnnotSelectView.h +++ b/platform/ios/Classes/MuAnnotSelectView.h @@ -2,10 +2,5 @@ #import "MuAnnotation.h" @interface MuAnnotSelectView : UIView -{ - MuAnnotation *annot; - CGSize pageSize; - UIColor *color; -} - (id) initWithAnnot:(MuAnnotation *)_annot pageSize:(CGSize)_pageSize; @end diff --git a/platform/ios/Classes/MuAnnotSelectView.m b/platform/ios/Classes/MuAnnotSelectView.m index d2d2f33b..cb156272 100644 --- a/platform/ios/Classes/MuAnnotSelectView.m +++ b/platform/ios/Classes/MuAnnotSelectView.m @@ -1,6 +1,11 @@ #import "MuAnnotSelectView.h" @implementation MuAnnotSelectView +{ + MuAnnotation *annot; + CGSize pageSize; + UIColor *color; +} - (id)initWithAnnot:(MuAnnotation *)_annot pageSize:(CGSize)_pageSize { diff --git a/platform/ios/Classes/MuAnnotation.h b/platform/ios/Classes/MuAnnotation.h index 76eb7baf..d706e371 100644 --- a/platform/ios/Classes/MuAnnotation.h +++ b/platform/ios/Classes/MuAnnotation.h @@ -3,10 +3,6 @@ #import <Foundation/Foundation.h> @interface MuAnnotation : NSObject -{ - int type; - CGRect rect; -} -(id) initFromAnnot:(fz_annot *)annot forDoc:(fz_document *)doc; @property(readonly) int type; @property(readonly) CGRect rect; diff --git a/platform/ios/Classes/MuAnnotation.m b/platform/ios/Classes/MuAnnotation.m index f063938f..e049bc83 100644 --- a/platform/ios/Classes/MuAnnotation.m +++ b/platform/ios/Classes/MuAnnotation.m @@ -1,6 +1,10 @@ #import "MuAnnotation.h" @implementation MuAnnotation +{ + int type; + CGRect rect; +} @synthesize type, rect; diff --git a/platform/ios/Classes/MuAppDelegate.h b/platform/ios/Classes/MuAppDelegate.h index 34074c87..ab0c2a0a 100644 --- a/platform/ios/Classes/MuAppDelegate.h +++ b/platform/ios/Classes/MuAppDelegate.h @@ -9,9 +9,4 @@ enum }; @interface MuAppDelegate : NSObject <UIApplicationDelegate, UINavigationControllerDelegate> -{ - UIWindow *window; - UINavigationController *navigator; - MuLibraryController *library; -} @end diff --git a/platform/ios/Classes/MuAppDelegate.m b/platform/ios/Classes/MuAppDelegate.m index 2c7c1d7b..6f7857bc 100644 --- a/platform/ios/Classes/MuAppDelegate.m +++ b/platform/ios/Classes/MuAppDelegate.m @@ -9,6 +9,9 @@ @implementation MuAppDelegate { + UIWindow *window; + UINavigationController *navigator; + MuLibraryController *library; BOOL _isInBackground; } diff --git a/platform/ios/Classes/MuChoiceFieldController.h b/platform/ios/Classes/MuChoiceFieldController.h index 5eda2a26..d1bd1c02 100644 --- a/platform/ios/Classes/MuChoiceFieldController.h +++ b/platform/ios/Classes/MuChoiceFieldController.h @@ -1,10 +1,5 @@ #import <UIKit/UIKit.h> @interface MuChoiceFieldController : UIViewController<UIPickerViewDataSource, UIPickerViewDelegate> -{ - void (^okayBlock)(NSArray *); - NSArray *choices; - int selected; -} - (id)initWithChoices:(NSArray *)choices okayAction:(void (^)(NSArray *))block; @end diff --git a/platform/ios/Classes/MuChoiceFieldController.m b/platform/ios/Classes/MuChoiceFieldController.m index 7f707b3d..a7587836 100644 --- a/platform/ios/Classes/MuChoiceFieldController.m +++ b/platform/ios/Classes/MuChoiceFieldController.m @@ -7,6 +7,11 @@ @end @implementation MuChoiceFieldController +{ + void (^okayBlock)(NSArray *); + NSArray *choices; + int selected; +} - (id)initWithChoices:(NSArray *)_choices okayAction:(void (^)(NSArray *))block { diff --git a/platform/ios/Classes/MuDocumentController.h b/platform/ios/Classes/MuDocumentController.h index 094c247d..8a905536 100644 --- a/platform/ios/Classes/MuDocumentController.h +++ b/platform/ios/Classes/MuDocumentController.h @@ -25,37 +25,6 @@ enum }; @interface MuDocumentController : UIViewController <UIScrollViewDelegate, UIGestureRecognizerDelegate, UISearchBarDelegate, MuDialogCreator, MuUpdater> -{ - fz_document *doc; - MuDocRef *docRef; - NSString *key; - char *filePath; - BOOL reflowMode; - MuOutlineController *outline; - UIScrollView *canvas; - UILabel *indicator; - UISlider *slider; - UISearchBar *searchBar; - UIBarButtonItem *nextButton, *prevButton, *cancelButton, *searchButton, *outlineButton, *linkButton; - UIBarButtonItem *moreButton; - UIBarButtonItem *shareButton, *printButton, *annotButton; - UIBarButtonItem *highlightButton, *underlineButton, *strikeoutButton; - UIBarButtonItem *inkButton; - UIBarButtonItem *tickButton; - UIBarButtonItem *deleteButton; - UIBarButtonItem *reflowButton; - UIBarButtonItem *backButton; - UIBarButtonItem *sliderWrapper; - int barmode; - int searchPage; - int cancelSearch; - int showLinks; - int width; // current screen size - int height; - int current; // currently visible page - int scroll_animating; // stop view updates during scrolling animations - float scale; // scale applied to views (only used in reflow mode) -} - (id) initWithFilename: (NSString*)nsfilename path:(char *)cstr document:(MuDocRef *)aDoc; - (void) createPageView: (int)number; - (void) gotoPage: (int)number animated: (BOOL)animated; diff --git a/platform/ios/Classes/MuDocumentController.m b/platform/ios/Classes/MuDocumentController.m index 752eaff0..43b64be8 100644 --- a/platform/ios/Classes/MuDocumentController.m +++ b/platform/ios/Classes/MuDocumentController.m @@ -124,6 +124,35 @@ static void saveDoc(char *current_path, fz_document *doc) @implementation MuDocumentController { + fz_document *doc; + MuDocRef *docRef; + NSString *key; + char *filePath; + BOOL reflowMode; + MuOutlineController *outline; + UIScrollView *canvas; + UILabel *indicator; + UISlider *slider; + UISearchBar *searchBar; + UIBarButtonItem *nextButton, *prevButton, *cancelButton, *searchButton, *outlineButton, *linkButton; + UIBarButtonItem *moreButton; + UIBarButtonItem *shareButton, *printButton, *annotButton; + UIBarButtonItem *highlightButton, *underlineButton, *strikeoutButton; + UIBarButtonItem *inkButton; + UIBarButtonItem *tickButton; + UIBarButtonItem *deleteButton; + UIBarButtonItem *reflowButton; + UIBarButtonItem *backButton; + UIBarButtonItem *sliderWrapper; + int barmode; + int searchPage; + int cancelSearch; + int showLinks; + int width; // current screen size + int height; + int current; // currently visible page + int scroll_animating; // stop view updates during scrolling animations + float scale; // scale applied to views (only used in reflow mode) BOOL _isRotating; } diff --git a/platform/ios/Classes/MuHitView.h b/platform/ios/Classes/MuHitView.h index b29caa61..d0823c8b 100644 --- a/platform/ios/Classes/MuHitView.h +++ b/platform/ios/Classes/MuHitView.h @@ -8,14 +8,6 @@ #include "mupdf/fitz.h" @interface MuHitView : UIView -{ - CGSize pageSize; - int hitCount; - CGRect hitRects[500]; - int linkPage[500]; - char *linkUrl[500]; - UIColor *color; -} - (id) initWithSearchResults: (int)n forDocument: (fz_document *)doc; - (id) initWithLinks: (fz_link*)links forDocument: (fz_document *)doc; - (void) setPageSize: (CGSize)s; diff --git a/platform/ios/Classes/MuHitView.m b/platform/ios/Classes/MuHitView.m index 9d71eb16..f3827570 100644 --- a/platform/ios/Classes/MuHitView.m +++ b/platform/ios/Classes/MuHitView.m @@ -2,6 +2,14 @@ #import "MuHitView.h" @implementation MuHitView +{ + CGSize pageSize; + int hitCount; + CGRect hitRects[500]; + int linkPage[500]; + char *linkUrl[500]; + UIColor *color; +} - (id) initWithSearchResults: (int)n forDocument: (fz_document *)doc { diff --git a/platform/ios/Classes/MuInkView.h b/platform/ios/Classes/MuInkView.h index cf376b34..a4d7aa90 100644 --- a/platform/ios/Classes/MuInkView.h +++ b/platform/ios/Classes/MuInkView.h @@ -1,11 +1,6 @@ #import <UIKit/UIKit.h> @interface MuInkView : UIView -{ - CGSize pageSize; - NSMutableArray *curves; - UIColor *color; -} @property(readonly) NSArray *curves; diff --git a/platform/ios/Classes/MuInkView.m b/platform/ios/Classes/MuInkView.m index 6bf88eac..709489dd 100644 --- a/platform/ios/Classes/MuInkView.m +++ b/platform/ios/Classes/MuInkView.m @@ -2,6 +2,11 @@ #import "MuInkView.h" @implementation MuInkView +{ + CGSize pageSize; + NSMutableArray *curves; + UIColor *color; +} - (id) initWithPageSize:(CGSize)_pageSize { diff --git a/platform/ios/Classes/MuLibraryController.h b/platform/ios/Classes/MuLibraryController.h index d57fc8d8..d2176bba 100644 --- a/platform/ios/Classes/MuLibraryController.h +++ b/platform/ios/Classes/MuLibraryController.h @@ -9,13 +9,6 @@ #import "MuDocRef.h" @interface MuLibraryController : UITableViewController <UIActionSheetDelegate> -{ - NSArray *files; - NSTimer *timer; - MuDocRef *doc; - NSString *_filename; - char *_filePath; -} - (void) openDocument: (NSString*)filename; - (void) askForPassword: (NSString*)prompt; - (void) onPasswordOkay; diff --git a/platform/ios/Classes/MuLibraryController.m b/platform/ios/Classes/MuLibraryController.m index 15bf9f4c..33907a63 100644 --- a/platform/ios/Classes/MuLibraryController.m +++ b/platform/ios/Classes/MuLibraryController.m @@ -15,6 +15,13 @@ static void showAlert(NSString *msg, NSString *filename) } @implementation MuLibraryController +{ + NSArray *files; + NSTimer *timer; + MuDocRef *doc; + NSString *_filename; + char *_filePath; +} - (void) viewWillAppear: (BOOL)animated { diff --git a/platform/ios/Classes/MuOutlineController.h b/platform/ios/Classes/MuOutlineController.h index 23159fba..63661bfc 100644 --- a/platform/ios/Classes/MuOutlineController.h +++ b/platform/ios/Classes/MuOutlineController.h @@ -3,10 +3,5 @@ @class MuDocumentController; @interface MuOutlineController : UITableViewController -{ - MuDocumentController *target; - NSMutableArray *titles; - NSMutableArray *pages; -} - (id) initWithTarget: (id)aTarget titles: (NSMutableArray*)aTitles pages: (NSMutableArray*)aPages; @end diff --git a/platform/ios/Classes/MuOutlineController.m b/platform/ios/Classes/MuOutlineController.m index d1ffe3be..91db5dd8 100644 --- a/platform/ios/Classes/MuOutlineController.m +++ b/platform/ios/Classes/MuOutlineController.m @@ -2,6 +2,11 @@ #import "MuOutlineController.h" @implementation MuOutlineController +{ + MuDocumentController *target; + NSMutableArray *titles; + NSMutableArray *pages; +} - (id) initWithTarget: (id)aTarget titles: (NSMutableArray*)aTitles pages: (NSMutableArray*)aPages { diff --git a/platform/ios/Classes/MuPageViewNormal.h b/platform/ios/Classes/MuPageViewNormal.h index ce42991a..bf9d3865 100644 --- a/platform/ios/Classes/MuPageViewNormal.h +++ b/platform/ios/Classes/MuPageViewNormal.h @@ -16,35 +16,6 @@ #import "MuUpdater.h" @interface MuPageViewNormal : UIScrollView <UIScrollViewDelegate,MuPageView> -{ - MuDocRef *docRef; - fz_document *doc; - fz_page *page; - fz_display_list *page_list; - fz_display_list *annot_list; - int number; - UIActivityIndicatorView *loadingView; - fz_pixmap *image_pix; - CGDataProviderRef imageData; - UIImageView *imageView; - fz_pixmap *tile_pix; - CGDataProviderRef tileData; - UIImageView *tileView; - MuHitView *hitView; - MuHitView *linkView; - MuTextSelectView *textSelectView; - MuInkView *inkView; - MuAnnotSelectView *annotSelectView; - NSArray *widgetRects; - NSArray *annotations; - int selectedAnnotationIndex; - CGSize pageSize; - CGRect tileFrame; - float tileScale; - BOOL cancel; - id<MuDialogCreator> dialogCreator; - id<MuUpdater> updater; -} - (id) initWithFrame: (CGRect)frame dialogCreator:(id<MuDialogCreator>)dia updater:(id<MuUpdater>)upd document: (MuDocRef *)aDoc page: (int)aNumber; - (void) displayImage: (UIImage*)image; - (void) resizeImage; diff --git a/platform/ios/Classes/MuPageViewNormal.m b/platform/ios/Classes/MuPageViewNormal.m index eacd611b..26809c8c 100644 --- a/platform/ios/Classes/MuPageViewNormal.m +++ b/platform/ios/Classes/MuPageViewNormal.m @@ -580,6 +580,35 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa @implementation MuPageViewNormal +{ + MuDocRef *docRef; + fz_document *doc; + fz_page *page; + fz_display_list *page_list; + fz_display_list *annot_list; + int number; + UIActivityIndicatorView *loadingView; + fz_pixmap *image_pix; + CGDataProviderRef imageData; + UIImageView *imageView; + fz_pixmap *tile_pix; + CGDataProviderRef tileData; + UIImageView *tileView; + MuHitView *hitView; + MuHitView *linkView; + MuTextSelectView *textSelectView; + MuInkView *inkView; + MuAnnotSelectView *annotSelectView; + NSArray *widgetRects; + NSArray *annotations; + int selectedAnnotationIndex; + CGSize pageSize; + CGRect tileFrame; + float tileScale; + BOOL cancel; + id<MuDialogCreator> dialogCreator; + id<MuUpdater> updater; +} - (void) ensurePageLoaded { diff --git a/platform/ios/Classes/MuPageViewReflow.h b/platform/ios/Classes/MuPageViewReflow.h index 2fa62ba3..da9d556a 100644 --- a/platform/ios/Classes/MuPageViewReflow.h +++ b/platform/ios/Classes/MuPageViewReflow.h @@ -3,10 +3,6 @@ #import "MuPageView.h" @interface MuPageViewReflow : UIWebView <UIWebViewDelegate,MuPageView> -{ - int number; - float scale; -} -(id) initWithFrame:(CGRect)frame document:(MuDocRef *)aDoc page:(int)aNumber; diff --git a/platform/ios/Classes/MuPageViewReflow.m b/platform/ios/Classes/MuPageViewReflow.m index 4a60df00..8c003160 100644 --- a/platform/ios/Classes/MuPageViewReflow.m +++ b/platform/ios/Classes/MuPageViewReflow.m @@ -75,6 +75,10 @@ NSString *textAsHtml(fz_document *doc, int pageNum) } @implementation MuPageViewReflow +{ + int number; + float scale; +} - (id)initWithFrame:(CGRect)frame document:(MuDocRef *)aDoc page:(int)aNumber { diff --git a/platform/ios/Classes/MuPrintPageRenderer.h b/platform/ios/Classes/MuPrintPageRenderer.h index 8f7ac31b..f043e0b1 100644 --- a/platform/ios/Classes/MuPrintPageRenderer.h +++ b/platform/ios/Classes/MuPrintPageRenderer.h @@ -2,9 +2,6 @@ #import <MuDocRef.h> @interface MuPrintPageRenderer : UIPrintPageRenderer -{ - MuDocRef *docRef; -} -(id) initWithDocRef:(MuDocRef *) docRef; diff --git a/platform/ios/Classes/MuPrintPageRenderer.m b/platform/ios/Classes/MuPrintPageRenderer.m index 9a396df7..fc4adba8 100644 --- a/platform/ios/Classes/MuPrintPageRenderer.m +++ b/platform/ios/Classes/MuPrintPageRenderer.m @@ -4,6 +4,9 @@ const int MaxStripPixels = 1024*1024; @implementation MuPrintPageRenderer +{ + MuDocRef *docRef; +} -(id) initWithDocRef:(MuDocRef *)aDocRef { diff --git a/platform/ios/Classes/MuTapResult.h b/platform/ios/Classes/MuTapResult.h index 483bc051..4ea77f81 100644 --- a/platform/ios/Classes/MuTapResult.h +++ b/platform/ios/Classes/MuTapResult.h @@ -16,27 +16,16 @@ @end @interface MuTapResultInternalLink : MuTapResult -{ - int pageNumber; -} @property(readonly) int pageNumber; -(id)initWithPageNumber:(int)aNumber; @end @interface MuTapResultExternalLink : MuTapResult -{ - NSString *url; -} @property(readonly) NSString *url; -(id)initWithUrl:(NSString *)aString; @end @interface MuTapResultRemoteLink : MuTapResult -{ - NSString *fileSpec; - int pageNumber; - BOOL newWindow; -} @property(readonly) NSString *fileSpec; @property(readonly) int pageNumber; @property(readonly) BOOL newWindow; @@ -47,9 +36,6 @@ @end @interface MuTapResultAnnotation : MuTapResult -{ - MuAnnotation *annot; -} @property(readonly) MuAnnotation *annot; -(id)initWithAnnotation:(MuAnnotation *)aAnnot; @end diff --git a/platform/ios/Classes/MuTapResult.m b/platform/ios/Classes/MuTapResult.m index 6ec7d088..565332f9 100644 --- a/platform/ios/Classes/MuTapResult.m +++ b/platform/ios/Classes/MuTapResult.m @@ -6,6 +6,9 @@ @implementation MuTapResultInternalLink +{ + int pageNumber; +} @synthesize pageNumber; @@ -28,6 +31,9 @@ @implementation MuTapResultExternalLink +{ + NSString *url; +} @synthesize url; @@ -56,6 +62,11 @@ @implementation MuTapResultRemoteLink +{ + NSString *fileSpec; + int pageNumber; + BOOL newWindow; +} @synthesize fileSpec, pageNumber, newWindow; @@ -96,6 +107,9 @@ @implementation MuTapResultAnnotation +{ + MuAnnotation *annot; +} @synthesize annot; diff --git a/platform/ios/Classes/MuTextFieldController.h b/platform/ios/Classes/MuTextFieldController.h index d15c18cf..943af83a 100644 --- a/platform/ios/Classes/MuTextFieldController.h +++ b/platform/ios/Classes/MuTextFieldController.h @@ -1,9 +1,5 @@ #import <UIKit/UIKit.h> @interface MuTextFieldController : UIViewController -{ - void (^okayBlock)(NSString *); - NSString *initialText; -} - (id)initWithText:(NSString *)text okayAction:(void (^)(NSString *))block; @end diff --git a/platform/ios/Classes/MuTextFieldController.m b/platform/ios/Classes/MuTextFieldController.m index bc6da40f..9c7c301c 100644 --- a/platform/ios/Classes/MuTextFieldController.m +++ b/platform/ios/Classes/MuTextFieldController.m @@ -9,6 +9,10 @@ @end @implementation MuTextFieldController +{ + void (^okayBlock)(NSString *); + NSString *initialText; +} -(id)initWithText:(NSString *)text okayAction:(void (^)(NSString *))block { diff --git a/platform/ios/Classes/MuTextSelectView.h b/platform/ios/Classes/MuTextSelectView.h index 433fc6d6..0f886174 100644 --- a/platform/ios/Classes/MuTextSelectView.h +++ b/platform/ios/Classes/MuTextSelectView.h @@ -1,13 +1,6 @@ #include "common.h" @interface MuTextSelectView : UIView -{ - NSArray *words; - CGSize pageSize; - UIColor *color; - CGPoint start; - CGPoint end; -} - (id) initWithWords:(NSArray *)_words pageSize:(CGSize)_pageSize; - (NSArray *) selectionRects; - (NSString *) selectedText; diff --git a/platform/ios/Classes/MuTextSelectView.m b/platform/ios/Classes/MuTextSelectView.m index eac3132a..02a196bb 100644 --- a/platform/ios/Classes/MuTextSelectView.m +++ b/platform/ios/Classes/MuTextSelectView.m @@ -3,6 +3,13 @@ #import "MuWord.h" @implementation MuTextSelectView +{ + NSArray *words; + CGSize pageSize; + UIColor *color; + CGPoint start; + CGPoint end; +} - (id) initWithWords:(NSArray *)_words pageSize:(CGSize)_pageSize { diff --git a/platform/ios/Classes/MuWord.h b/platform/ios/Classes/MuWord.h index 17166f0c..9f880375 100644 --- a/platform/ios/Classes/MuWord.h +++ b/platform/ios/Classes/MuWord.h @@ -2,10 +2,6 @@ #import <UIKit/UIKit.h> @interface MuWord : NSObject -{ - NSMutableString *string; - CGRect rect; -} @property(retain) NSString *string; @property(assign) CGRect rect; + (MuWord *) word; diff --git a/platform/ios/Classes/MuWord.m b/platform/ios/Classes/MuWord.m index f5f7c667..64fb561d 100644 --- a/platform/ios/Classes/MuWord.m +++ b/platform/ios/Classes/MuWord.m @@ -1,6 +1,10 @@ #import "MuWord.h" @implementation MuWord +{ + NSMutableString *string; + CGRect rect; +} @synthesize string, rect; |