Compare commits

...

4 Commits

5 changed files with 158 additions and 12 deletions

View File

@ -2,10 +2,69 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>LSSupportsOpeningDocumentsInPlace</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleDisplayName</key>
<string>ActiveGS</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
<key>CFBundleTypeIconFiles</key>
<array/>
<key>CFBundleTypeName</key>
<string>Apple // 2MG Image</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>LSHandlerRank</key>
<string>Owner</string>
<key>LSItemContentTypes</key>
<array>
<string>com.apple.disk-image-2mg</string>
</array>
</dict>
<dict>
<key>CFBundleTypeIconFiles</key>
<array/>
<key>CFBundleTypeName</key>
<string>Apple // DSK Image</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>LSHandlerRank</key>
<string>Owner</string>
<key>LSItemContentTypes</key>
<array>
<string>com.apple.disk-image-dsk</string>
</array>
</dict>
<dict>
<key>CFBundleTypeIconFiles</key>
<array/>
<key>CFBundleTypeName</key>
<string>Apple // ZIP Disk Image</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>LSHandlerRank</key>
<string>Owner</string>
<key>LSItemContentTypes</key>
<array>
<string>com.apple.disk-image-zip</string>
</array>
</dict>
<dict>
<key>CFBundleTypeIconFiles</key>
<array/>
<key>CFBundleTypeName</key>
<string>Unknown File</string>
<key>LSHandlerRank</key>
<string>Alternate</string>
<key>LSItemContentTypes</key>
<array>
<string>public.item</string>
</array>
</dict>
</array>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
@ -50,5 +109,71 @@
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>UTExportedTypeDeclarations</key>
<array>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.archive</string>
<string>public-data</string>
<string>public.disk-image</string>
</array>
<key>UTTypeDescription</key>
<string>Apple // Disk Image - 2MG</string>
<key>UTTypeIconFiles</key>
<array/>
<key>UTTypeIdentifier</key>
<string>com.apple.disk-image-2mg</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>Item 0</key>
<string>2MG</string>
<key>public.filename-extension</key>
<array/>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.archive</string>
<string>public-data</string>
<string>public.disk-image</string>
</array>
<key>UTTypeDescription</key>
<string>Apple // Disk Image - DSK</string>
<key>UTTypeIconFiles</key>
<array/>
<key>UTTypeIdentifier</key>
<string>com.apple.disk-image-dsk</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<array>
<string>DSK</string>
</array>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.archive</string>
<string>public-data</string>
<string>public.disk-image</string>
</array>
<key>UTTypeDescription</key>
<string>Apple // Disk Image -ZIP</string>
<key>UTTypeIconFiles</key>
<array/>
<key>UTTypeIdentifier</key>
<string>com.apple.disk-image-zip</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<array>
<string>ZIP</string>
</array>
</dict>
</dict>
</array>
</dict>
</plist>

View File

@ -428,7 +428,7 @@ int x_lock_zoom = 0;
[self.zv setUserInteractionEnabled:TRUE];
self.kbdc = [KBDController alloc];
self.kbdc = [[KBDController alloc] init];
[self.contentView addSubview:self.kbdc.view];
self.view = self.contentView;

View File

@ -376,7 +376,7 @@ static UIImage* defaultImageII = nil;
for(int i=0;i<list.elements.size();i++)
{
ActiveGSElement* el = &list.elements.at(i);
itemClass* ic = [itemClass alloc];
itemClass* ic = [[itemClass alloc] init];
// itemClass* ic = [itemClass alloc];
ic->element = el;
@ -572,7 +572,27 @@ static NSInteger compareImagesUsingSelector(id p1, id p2, void *context)
{
NSLog(@"activeGSList viewWillAppear %@",self);
// Move files from Documents/Inbox to Documents (Items arriving through iOS "Open In"
NSLog(@"Moving files from Documents/Inbox to Documents so they're visible");
//Turn every file inside the directory into an array
// Note to self: remember to actually put files in the Documents folder. Use the code in the apparopriately marked file
NSArray *path = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
//strings to actually get the directories
NSString *appFolderPath = [path objectAtIndex:0];
NSString *inboxAppFolderPath = [appFolderPath stringByAppendingString:@"/Inbox"]; //add ".plist" to the end of the recipe name
NSString *documentsDirectory = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0];
NSArray *inboxContents = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:[NSString stringWithFormat:inboxAppFolderPath, documentsDirectory] error:nil];
//move all the files over
for (int i = 0; i != [inboxContents count]; i++) {
NSString *oldPath = [NSString stringWithFormat:@"%@/%@", inboxAppFolderPath, [inboxContents objectAtIndex:i]];
NSString *newPath = [NSString stringWithFormat:@"%@/%@", appFolderPath, [inboxContents objectAtIndex:i]];
[[NSFileManager defaultManager] moveItemAtPath:oldPath toPath:newPath error:nil];
}
if (self.sourceName)
{
#ifndef ACTIVEGS_BACKGROUNDIMAGE
@ -592,6 +612,7 @@ static NSInteger compareImagesUsingSelector(id p1, id p2, void *context)
[super viewDidLoad];
// IOS8 ISSUE !!!!! DefaultRawHeight = UITableViewAutomaticDimension
CGFloat h = 44 * [pManager resolutionRatio];
@ -690,7 +711,7 @@ static NSInteger compareImagesUsingSelector(id p1, id p2, void *context)
AsyncImageView* asyncImage = [AsyncImageView alloc];
AsyncImageView* asyncImage = [[AsyncImageView alloc] init];
float s = [pManager resolutionRatio]*[pManager dpiRatio];
[asyncImage initImage:ic->element->thumb.c_str() target:cell.imageView width:64*s height:40*s];
// [asyncImage performSelectorOnMainThread:@selector(loadImage:) withObject:nil waitUntilDone:NO];

View File

@ -153,7 +153,7 @@
self.tabView.delegate = self;
NSString *imgSource;
self.l0 = [activegsList alloc];
self.l0 = [[activegsList alloc] init];
//imgSource = [[NSBundle mainBundle] pathForResource:@ACTIVEGS_FIRSTTABLIST ofType:@"activegsxml"] ;
self.l0->listPath = pManager->firstTabXML.c_str();
self.l0->filter= ALL_NO_INDEX ;
@ -165,14 +165,14 @@
[self.l0.view setFrame:r];
[self.view addSubview:self.l0.view];
#else
activegsList* l3 = [activegsList alloc];
activegsList* l3 = [[activegsList alloc] init];
l3->listPath = "http://www.freetoolsassociation.com/xml/list.activegsxml";
l3->versionPath = "http://www.freetoolsassociation.com/xml/version.dat";
l3->filter= ALL;
l3.tabBarItem = [[UITabBarItem alloc] initWithTitle:@"FTA Website" image:[UIImage imageWithContentsOfFile: imgSource] tag:0]; ;
l3->trackerName = "FTA";
activegsList* l1 = [activegsList alloc];
activegsList* l1 = [[activegsList alloc] init];
l1->listPath = "http://www.virtualapple.org/xmlfiles/list.zip";
l1->versionPath = "http://www.virtualapple.org/xmlfiles/version.dat";
l1->filter = ONLY_APPLE2 ;
@ -180,7 +180,7 @@
/*NSString */imgSource = [[NSBundle mainBundle] pathForResource:@"Tab][" ofType:@"png"];
l1.tabBarItem = [[UITabBarItem alloc] initWithTitle:@"Apple II" image:[UIImage imageWithContentsOfFile: imgSource] tag:0];
activegsList* l2 = [activegsList alloc];
activegsList* l2 = [[activegsList alloc] init];
l2->listPath = "http://www.virtualapple.org/xmlfiles/list.zip";;
// l2.title = @"Apple IIGS";
l2->filter = ONLY_2GS;
@ -191,7 +191,7 @@
#ifndef ACTIVEGS_ENABLE_DOCUMENT
self.docList= nil;
#else
self.docList = [activegsList alloc];
self.docList = [[activegsList alloc] init];
self.docList->listPath.Empty();
self.docList->filter = (int)(ALL_NO_INDEX|DOC_LIST);
self.docList->trackerName = "My2GS";

View File

@ -84,15 +84,15 @@
self.screenShot2.image = nil;
self.screenShot3.image = nil;
AsyncImageView* asyncImage1 = [AsyncImageView alloc] ;
AsyncImageView* asyncImage1 = [[AsyncImageView alloc] init];
[asyncImage1 initImage:self->diskSelected->screenShots[0].c_str() target:self.screenShot1 width:128 height:80];
[asyncImage1 loadImage:nil];
AsyncImageView* asyncImage2 = [AsyncImageView alloc];
AsyncImageView* asyncImage2 = [[AsyncImageView alloc] init];
[asyncImage2 initImage:self->diskSelected->screenShots[1].c_str() target:self.screenShot2 width:128 height:80];
[asyncImage2 loadImage:nil];
AsyncImageView* asyncImage3 = [AsyncImageView alloc] ;
AsyncImageView* asyncImage3 = [[AsyncImageView alloc] init] ;
[asyncImage3 initImage:self->diskSelected->screenShots[2].c_str() target:self.screenShot3 width:128 height:80];
[asyncImage3 loadImage:nil];