From 0fee86bc3cb789f189f6c440b22183ec8c40eac1 Mon Sep 17 00:00:00 2001 From: jvernet Date: Sat, 2 Jan 2016 22:29:17 +0100 Subject: [PATCH] Added ReadOnly Switchs for disks --- Apple2Mac/Apple2Mac/Base.lproj/MainMenu.xib | 4 +- .../Disks.imageset/Contents.json | 10 ++--- .../Disks.imageset/floppy32.png | Bin 0 -> 1901 bytes .../Disks.imageset/floppy64.png | Bin 0 -> 4959 bytes .../Run.imageset/Contents.json | 8 +--- Apple2Mac/Apple2Mac/disksViewController.h | 2 + Apple2Mac/Apple2Mac/disksViewController.m | 29 ++++++++++++-- Apple2Mac/Apple2Mac/en.lproj/MainMenu.xib | 6 +-- Apple2Mac/Apple2Mac/fr.lproj/MainMenu.xib | 4 +- .../Assets.xcassets/Disk.imageset/floppy.png | Bin 643 -> 638 bytes .../Apple2iOS/Base.lproj/Main.storyboard | 36 ++++++++++++++---- 11 files changed, 69 insertions(+), 30 deletions(-) create mode 100644 Apple2Mac/Apple2Mac/Images.xcassets/Disks.imageset/floppy32.png create mode 100644 Apple2Mac/Apple2Mac/Images.xcassets/Disks.imageset/floppy64.png diff --git a/Apple2Mac/Apple2Mac/Base.lproj/MainMenu.xib b/Apple2Mac/Apple2Mac/Base.lproj/MainMenu.xib index a9ce772c..71f1e3e5 100644 --- a/Apple2Mac/Apple2Mac/Base.lproj/MainMenu.xib +++ b/Apple2Mac/Apple2Mac/Base.lproj/MainMenu.xib @@ -391,7 +391,7 @@ CA - + @@ -1023,8 +1023,8 @@ DQ + - diff --git a/Apple2Mac/Apple2Mac/Images.xcassets/Disks.imageset/Contents.json b/Apple2Mac/Apple2Mac/Images.xcassets/Disks.imageset/Contents.json index f8f827e4..3e1071d4 100644 --- a/Apple2Mac/Apple2Mac/Images.xcassets/Disks.imageset/Contents.json +++ b/Apple2Mac/Apple2Mac/Images.xcassets/Disks.imageset/Contents.json @@ -1,16 +1,14 @@ { "images" : [ { - "idiom" : "universal", + "idiom" : "mac", + "filename" : "floppy32.png", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "mac", + "filename" : "floppy64.png", "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" } ], "info" : { diff --git a/Apple2Mac/Apple2Mac/Images.xcassets/Disks.imageset/floppy32.png b/Apple2Mac/Apple2Mac/Images.xcassets/Disks.imageset/floppy32.png new file mode 100644 index 0000000000000000000000000000000000000000..52c1bb20b6c7ef634188394047de51a6f280f6d0 GIT binary patch literal 1901 zcmV-z2a@=SP)b-v1{bFVu%YGUsQQS>dlZ_))1ccDW zj8R!%hGAschSfx85z0FZ>IO&MRqIGa$DvM9V^BcBiWOvFjRr(<*_S&7bX^>2fBT^Y z+R`%hCjZ>$dHOu({O>vcbDqZ3)YLp$vEn0T<;rAb<*MZ1_sW_1s^ry5a`La0RmrQB zRjXF}_JqUA)w9lqn}4|CBc-OM=26VLk5k4o(|*f^#&R0Z6w!F5h)dQIzOfe5c)Ezj z(?wkTx|j=Ria39|h;Pr8(sZtjriM!FwkqrmRoELUvD+&6=4=VJQ-7Ye(|G1kz<351 z8q4^^w2qJ0r;Nv}PuZZ$I;QB|^+vtJcaYxx7!#RVKLFQnmQ zDGh(MaMSS@n7E5~ydCd&8;rG2j{||Xi(_?v#IPaNN1&qkQ}DVNY~R7POUZONe#ecb z-_Y~@A-pd;;pHv((Fw2b!|Ps{=!J>zVWJ=Y*9ZUYgIB%q@*a%c4sjX^1*igcK!F&Tg*6G7&7v9l3 zVN&3C`l3CUz?Xgk>r*x=brqlcs(^cpdwTHD%?s}X__328o?Zd&0WLhFZ4C4@^7k$q zPx~&@=d{5@H%vZ&H@z^~4W4@;ig)1|YvpmzIsP@!1aF)`Kd0*VVKAgBF{zupx5iMSS&ak%{UwmEEWs;q$C7E@SXKz`m8*2UX~>!Sw;{#GumM4s!&U$UF@S&|3PFyh9S5u>BqX5M>v{O_ zAuTN}w6(P{G&IE1r%!2XYvcO$>-6{cqfbgAAt52ep){L-5JVs{>!~!T)oKnLJV-}J z2Q4ivcsw4a9*@T}P3pjb1E|&NSvErLilHfx<_MQ0$!N7&PM$nTLqh}4o;@S<86Fer3M~@z*wx)*n-hZE@ zq$G5@#nEX%6oru7OF`8j%QEp|Jb8I}96o#)hr=<8Ky!05RaI5w?8u?GxR~ndYU1PL z!#J1xf}V>&7~v!)CZgBtIez>&X0sW)-Ok9!2qPmST)upn{QP|C>+4y*`~#LQUCOd$ z%a9gFjzBPhkkXMN2uG{cux8B~>gwt+o6Y3s=aZkGPeDNewY9aZUAq>oR*O!jBT=V& zn=+hRgh3=UT9z-@vwg>Q%w{uYvzhJNx1-nV(Q36mJ0T@JtHkHjz?_i$>CmCkXi%xt zs8lL68ckT$OVLIkd?%FVB$JSsNNQ>-85tSqbULJ;*dJd}z z{5_%|Mr>fwT}D#48kWL_G(KKKT6!8+uU_TawQHD6rU-pM3Js*CrH#kN#v%wpbWp2N zsp8NrUQA9-4!d{nX33Hz#Kpy-R;#176B`>#T3Xt8jMZv=l%Afh7>y>yWHKoxqe(Ft zjf%-+^vz8s|JbNxWo0QAi$%%J%~dipGnLJoH&0{l-p`do#fOxvtgPw%CZow`*KgZs nG$}@t&whG(x?;6jAN_v-15AywjB$yB00000NkvXXu0mjfYFeF1 literal 0 HcmV?d00001 diff --git a/Apple2Mac/Apple2Mac/Images.xcassets/Disks.imageset/floppy64.png b/Apple2Mac/Apple2Mac/Images.xcassets/Disks.imageset/floppy64.png new file mode 100644 index 0000000000000000000000000000000000000000..ae2e81830f0ffd3e203586faa53286a311102a88 GIT binary patch literal 4959 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 literal 0 HcmV?d00001 diff --git a/Apple2Mac/Apple2Mac/Images.xcassets/Run.imageset/Contents.json b/Apple2Mac/Apple2Mac/Images.xcassets/Run.imageset/Contents.json index 8d226a5d..8e103777 100644 --- a/Apple2Mac/Apple2Mac/Images.xcassets/Run.imageset/Contents.json +++ b/Apple2Mac/Apple2Mac/Images.xcassets/Run.imageset/Contents.json @@ -1,17 +1,13 @@ { "images" : [ { - "idiom" : "universal", + "idiom" : "mac", "filename" : "StepForwardNormalBlue.png", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "mac", "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" } ], "info" : { diff --git a/Apple2Mac/Apple2Mac/disksViewController.h b/Apple2Mac/Apple2Mac/disksViewController.h index 9e8fdcf9..46ae3f40 100644 --- a/Apple2Mac/Apple2Mac/disksViewController.h +++ b/Apple2Mac/Apple2Mac/disksViewController.h @@ -11,6 +11,8 @@ @interface disksViewController : UIViewController @property (retain, nonatomic) IBOutlet UIPickerView *disk1Picker; @property (retain, nonatomic) IBOutlet UIPickerView *disk2Picker; +@property (retain, nonatomic) IBOutlet UISwitch *diskAProtection; +@property (retain, nonatomic) IBOutlet UISwitch *diskBProtection; @property (strong,nonatomic) NSArray *_disks; @property (retain,nonatomic) NSString *path; diff --git a/Apple2Mac/Apple2Mac/disksViewController.m b/Apple2Mac/Apple2Mac/disksViewController.m index 7a804461..1c2e52ec 100644 --- a/Apple2Mac/Apple2Mac/disksViewController.m +++ b/Apple2Mac/Apple2Mac/disksViewController.m @@ -20,7 +20,9 @@ NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); - self.path = [[paths objectAtIndex:0] stringByAppendingPathComponent:@"Disks"]; + //self.path = [[paths objectAtIndex:0] stringByAppendingPathComponent:@"Disks"]; + self.path = [paths objectAtIndex:0]; + NSLog(@"Path:%@",self.path); self._disks=[[NSFileManager defaultManager] contentsOfDirectoryAtPath:self.path error:NULL]; // Connect data @@ -54,9 +56,23 @@ { // This method is triggered whenever the user makes a change to the picker selection. // The parameter named row and component represents what was selected. - NSLog(@"Selected Row %d %@", row,(NSString*)[self._disks objectAtIndex:row]); - disk6_eject(0); - const char *errMsg = disk6_insert(0, [[self.path stringByAppendingPathComponent:[self._disks objectAtIndex:row]] UTF8String], YES); + int drive=0; + BOOL ro=YES; + + if(pickerView==self.disk1Picker) + { + drive=0; + ro=self.diskAProtection.on; + } + if(pickerView==self.disk2Picker) + { + drive=1; + ro=self.diskBProtection.on; + } + + NSLog(@"Selected Row %d %@ %c", row,(NSString*)[self._disks objectAtIndex:row],ro); + disk6_eject(drive); + const char *errMsg = disk6_insert(drive, [[self.path stringByAppendingPathComponent:[self._disks objectAtIndex:row]] UTF8String], ro); } - (IBAction)unwindToMainViewController:(UIStoryboardSegue*)sender @@ -68,5 +84,10 @@ cpu_resume(); } +- (void)dealloc { + [_diskAProtection release]; + [_diskBProtection release]; + [super dealloc]; +} @end diff --git a/Apple2Mac/Apple2Mac/en.lproj/MainMenu.xib b/Apple2Mac/Apple2Mac/en.lproj/MainMenu.xib index 48ee495d..d9ff21a2 100644 --- a/Apple2Mac/Apple2Mac/en.lproj/MainMenu.xib +++ b/Apple2Mac/Apple2Mac/en.lproj/MainMenu.xib @@ -391,7 +391,7 @@ CA - + @@ -811,7 +811,7 @@ DQ - + @@ -1023,8 +1023,8 @@ DQ + - diff --git a/Apple2Mac/Apple2Mac/fr.lproj/MainMenu.xib b/Apple2Mac/Apple2Mac/fr.lproj/MainMenu.xib index 3da041b7..5a6af8b1 100644 --- a/Apple2Mac/Apple2Mac/fr.lproj/MainMenu.xib +++ b/Apple2Mac/Apple2Mac/fr.lproj/MainMenu.xib @@ -399,7 +399,7 @@ CA - + @@ -1054,8 +1054,8 @@ DQ + - diff --git a/Apple2Mac/Apple2iOS/Assets.xcassets/Disk.imageset/floppy.png b/Apple2Mac/Apple2iOS/Assets.xcassets/Disk.imageset/floppy.png index 8f7b8023d8dc35af2640bc57037ae5ae1544ad9d..8edadee9fb9acb43bc11e93da32cb7b772c94927 100644 GIT binary patch delta 548 zcmV+<0^9wA1^xt(Wq$-oL_t(|+U%LVOT$1Ihl>?OEeb(Ppeofxh~lPF>F7tPASlI( zQ$bXOf*)W(kYcBRlmA3PsJoMs=%7LoN3kFlp+(R|!4LR394F>tYShaY&GbM>?!9|1 zdGEc8$5SJS08q75UhsITi<$zgni1Ox_k{}-e-de(wV|IXn&fX{h#OLNm0AONrRsaBBb4OGyqFhqGIgSyK$*=>D z%_LG^lP$}utAD~W07!kIh+4$KfkOn)SN{2lw%Zx(_g5M?%Y6QFNc+#b|O1Avp`(+fQ!WO=tqJ%8}xtun{(ss{`cAW4Le548Oj zAt(YsHoIRB0OivC5&#sgZw3G$y)9?8lV5z+n1aagLWpKeett%HbVQg=YZX2Y7hs>w5O)E5wxu>Y5V2<97M=^Z0$c&E09Sx3z`($j&m4dH mH)uk?%pLvdY1VW4`7r<%S%MZ>)aZ@?0000TWq%1tL_t(|+U%LlO9DX{#+Qnsk^-?Sq6f`TBVJuP(VpAdq&ck(29=mUw4k`P5;1O9zv-8gU zX6BuDW;m|S%>zKqs`LZL)t0IPFl$6C2jKsX0OCfjYW~#9vwv2@0B9Zws{&x-sD=S( zZioZG9DhF_Di<(*7cdQg-S%-dG0E^mi06rhLPXz&6S^w-6OYqF6ryL0Jz$E!b%YLW$DbZ4FExq zcRVs5+X8^+=YN-TRIp;Pv(v182d08b0GnGD2hi0m2S9_J zR-;SB?diW&0*FLdB~CgA!AyqMTi@up1Au()7 zJ<|Hy-Mu^jq|--D0B~P^SOI|2)%6Gfq;|!$dhm-b=#voXo(R#XO-E4cnSkyhv6xL0 zA-TF-L=y?=zJ7K}G@B)wN~tA2HV0sx!w_=-Y>uTCx)3p^<0jq - + - @@ -232,11 +252,13 @@ + + - +