From 03e3c01771cd7c1b502f5b79b902123fbee96d02 Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Tue, 25 Jun 2013 22:50:14 +0000 Subject: Implement creating and selecting memory cards in the memory card manager. Get rid of imageFromMcd:index: and move the code to imagesFromMcd:. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85555 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- macosx/English.lproj/MemCardManager.xib | 1629 ++++++++++++++++++++++++++++++- 1 file changed, 1595 insertions(+), 34 deletions(-) (limited to 'macosx/English.lproj/MemCardManager.xib') diff --git a/macosx/English.lproj/MemCardManager.xib b/macosx/English.lproj/MemCardManager.xib index 9b690aae..1ac73c77 100644 --- a/macosx/English.lproj/MemCardManager.xib +++ b/macosx/English.lproj/MemCardManager.xib @@ -2,15 +2,16 @@ 1070 - 12C60 - 2844 - 1187.34 - 625.00 + 12E55 + 3084 + 1187.39 + 626.00 com.apple.InterfaceBuilder.CocoaPlugin - 2844 + 3084 + IBNSLayoutConstraint NSArrayController NSBox NSButton @@ -47,14 +48,14 @@ 15 2 - {{196, 240}, {469, 316}} + {{196, 240}, {469, 351}} 544735232 Memory Card Manager NSWindow - {469, 316} - {469, 316} + {469, 351} + {469, 351} 256 @@ -62,7 +63,7 @@ 269 - {{203, 215}, {63, 32}} + {{203, 216}, {63, 32}} @@ -92,7 +93,7 @@ 293 - {{203, 81}, {63, 32}} + {{203, 82}, {63, 32}} @@ -194,7 +195,7 @@ 0.63157892227172852 - {{268, 48}, {181, 248}} + {{268, 49}, {181, 248}} @@ -264,7 +265,7 @@ {{1, 144}, {233, 15}} - + _NS:3374 NO 1 @@ -273,7 +274,7 @@ 0.63157892227172852 - {{20, 48}, {181, 248}} + {{20, 49}, {181, 248}} @@ -289,7 +290,7 @@ 289 - {{262, 12}, {98, 32}} + {{262, 13}, {98, 32}} @@ -315,7 +316,7 @@ 292 - {{14, 12}, {98, 32}} + {{14, 13}, {98, 32}} @@ -341,7 +342,7 @@ 292 - {{114, 12}, {93, 32}} + {{114, 13}, {93, 32}} @@ -367,7 +368,7 @@ 289 - {{362, 12}, {93, 32}} + {{362, 13}, {93, 32}} _NS:687 @@ -389,20 +390,172 @@ NO + + + 268 + {{14, 296}, {80, 32}} + + + + _NS:9 + 1 + YES + + 67108864 + 134217728 + New… + + _NS:9 + + -2038284288 + 129 + + + 200 + 25 + + NO + + + + 268 + {{106, 296}, {101, 32}} + + + + _NS:9 + 1 + YES + + 67108864 + 134217728 + Change… + + _NS:9 + + -2038284288 + 129 + + + 200 + 25 + + NO + + + + 268 + {{17, 332}, {187, 17}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + Label + + _NS:1535 + + + + 6 + System + controlTextColor + + 3 + MAA + + + + NO + + + + 268 + {{262, 296}, {80, 32}} + + + _NS:9 + 2 + YES + + 67108864 + 134217728 + New… + + _NS:9 + + -2038284288 + 129 + + + 200 + 25 + + NO + + + + 268 + {{354, 296}, {101, 32}} + + + _NS:9 + 2 + YES + + 67108864 + 134217728 + Change… + + _NS:9 + + -2038284288 + 129 + + + 200 + 25 + + NO + + + + 268 + {{265, 332}, {187, 17}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + Label + + _NS:1535 + + + + + NO + - {469, 316} + {469, 351} - + - {{0, 0}, {1680, 1028}} - {469, 338} - {469, 338} + {{0, 0}, {1920, 1058}} + {469, 373} + {469, 373} YES - + 256 @@ -457,15 +610,7 @@ _NS:3944 - - 6 - System - controlTextColor - - 3 - MAA - - + NO @@ -560,6 +705,7 @@ {179, 115} + @@ -667,6 +813,46 @@ 77 + + + memCard1Label + + + + 196 + + + + memCard2Label + + + + 197 + + + + newMemCard: + + + + 203 + + + + newMemCard: + + + + 204 + + + + changeMemCard: + + + + 206 + itemPrototype @@ -882,10 +1068,576 @@ + - + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 4 + 0 + + 4 + 1 + + 89 + + 1000 + + 3 + 9 + 3 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 3 + 1 + + 2 + + 1000 + + 3 + 9 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 3 + 0 + + 3 + 1 + + 107 + + 1000 + + 3 + 9 + 3 + + + + 9 + 0 + + 9 + 1 + + 0.0 + + 1000 + + 5 + 22 + 2 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 54 + + 1000 + + 3 + 9 + 3 + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 4 + 0 + + 4 + 1 + + 49 + + 1000 + + 3 + 9 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + + + @@ -894,6 +1646,22 @@ + + + 7 + 0 + + 0 + 1 + + 51 + + 1000 + + 3 + 9 + 1 + @@ -951,6 +1719,70 @@ + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 1 + + 1000 + + 3 + 9 + 3 + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + MemCardObjectView @@ -1001,6 +1833,166 @@ + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 3 + 0 + + 3 + 1 + + 3 + + 1000 + + 3 + 9 + 3 + + + + 9 + 0 + + 9 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 3 + + 1000 + + 3 + 9 + 3 + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + @@ -1009,6 +2001,38 @@ + + + 7 + 0 + + 0 + 1 + + 32 + + 1000 + + 3 + 9 + 1 + + + + 8 + 0 + + 0 + 1 + + 32 + + 1000 + + 3 + 9 + 1 + @@ -1022,6 +2046,22 @@ + + + 7 + 0 + + 0 + 1 + + 171 + + 1000 + + 3 + 9 + 1 + @@ -1108,6 +2148,349 @@ + + 131 + + + + + + + + 132 + + + + + 133 + + + + + + + + 134 + + + + + 135 + + + + + + + + 136 + + + + + 137 + + + + + + + + 138 + + + + + + + + 139 + + + + + + + + 140 + + + + + 141 + + + + + 142 + + + + + 143 + + + + + 144 + + + + + 145 + + + + + 146 + + + + + 148 + + + + + 149 + + + + + 150 + + + + + 151 + + + + + 152 + + + + + 153 + + + + + 154 + + + + + 155 + + + + + 156 + + + + + 157 + + + + + 158 + + + + + 161 + + + + + 162 + + + + + 163 + + + + + 164 + + + + + 165 + + + + + 166 + + + + + 167 + + + + + 168 + + + + + 169 + + + + + 170 + + + + + 171 + + + + + 172 + + + + + 173 + + + + + 174 + + + + + 176 + + + + + 177 + + + + + 178 + + + + + 179 + + + + + 180 + + + + + 181 + + + + + 182 + + + + + 183 + + + + + 184 + + + + + 185 + + + + + 186 + + + + + 187 + + + + + 188 + + + + + 189 + + + + + 190 + + + + + 191 + + + + + 192 + + + + + 193 + + + + + 194 + + + + + 195 + + + + + 198 + + + + + 200 + + + + + 201 + + + + + 202 + + + @@ -1118,45 +2501,194 @@ {{357, 418}, {480, 270}} com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - 91 + 206 @@ -1181,15 +2713,29 @@ ./Classes/NSCollectionViewItem.h + + NSLayoutConstraint + NSObject + + IBProjectSource + ./Classes/NSLayoutConstraint.h + + PcsxrMemCardController NSWindowController + id id id id + id + + changeMemCard: + id + deleteMemoryObject: id @@ -1202,16 +2748,30 @@ moveBlock: id + + newMemCard: + id + + NSTextField NSCollectionView + NSTextField NSCollectionView + + memCard1Label + NSTextField + memCard1view NSCollectionView + + memCard2Label + NSTextField + memCard2view NSCollectionView @@ -1232,5 +2792,6 @@ YES 3 + YES -- cgit v1.2.3