[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[707] trunk/fuse
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[707] trunk/fuse
|
From: <fr...@us...> - 2012-11-23 11:26:35
|
Revision: 707
http://sourceforge.net/p/fuse-for-macosx/code/707
Author: fredm
Date: 2012-11-23 11:26:32 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Start of hi-res icon (thanks, Paul van der Laan)
Add POK flie dialog
Modified Paths:
--------------
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/controllers/FuseController.h
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/fusepb/xibs/MainMenu.xib
trunk/fuse/fusepb/xibs/PokeFinder.xib
trunk/fuse/ui/cocoa/cocoaui.m
Added Paths:
-----------
trunk/fuse/fusepb/Fuse.iconset/
trunk/fuse/fusepb/Fuse.iconset/icon_128x128.png
trunk/fuse/fusepb/Fuse.iconset/ico...@2x...g
trunk/fuse/fusepb/Fuse.iconset/icon_16x16.png
trunk/fuse/fusepb/Fuse.iconset/ico...@2x...g
trunk/fuse/fusepb/Fuse.iconset/icon_256x256.png
trunk/fuse/fusepb/Fuse.iconset/ico...@2x...g
trunk/fuse/fusepb/Fuse.iconset/icon_32x32.png
trunk/fuse/fusepb/Fuse.iconset/ico...@2x...g
trunk/fuse/fusepb/Fuse.iconset/icon_512x512.png
trunk/fuse/fusepb/Fuse.iconset/ico...@2x...g
trunk/fuse/fusepb/controllers/PokeMemoryController.h
trunk/fuse/fusepb/controllers/PokeMemoryController.m
trunk/fuse/fusepb/xibs/PokeMemory.xib
Removed Paths:
-------------
trunk/fuse/fusepb/resources/Fuse.icns
Added: trunk/fuse/fusepb/Fuse.iconset/icon_128x128.png
===================================================================
(Binary files differ)
Property changes on: trunk/fuse/fusepb/Fuse.iconset/icon_128x128.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/fuse/fusepb/Fuse.iconset/ico...@2x...g
===================================================================
(Binary files differ)
Property changes on: trunk/fuse/fusepb/Fuse.iconset/ico...@2x...g
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/fuse/fusepb/Fuse.iconset/icon_16x16.png
===================================================================
(Binary files differ)
Property changes on: trunk/fuse/fusepb/Fuse.iconset/icon_16x16.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/fuse/fusepb/Fuse.iconset/ico...@2x...g
===================================================================
(Binary files differ)
Property changes on: trunk/fuse/fusepb/Fuse.iconset/ico...@2x...g
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/fuse/fusepb/Fuse.iconset/icon_256x256.png
===================================================================
(Binary files differ)
Property changes on: trunk/fuse/fusepb/Fuse.iconset/icon_256x256.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/fuse/fusepb/Fuse.iconset/ico...@2x...g
===================================================================
(Binary files differ)
Property changes on: trunk/fuse/fusepb/Fuse.iconset/ico...@2x...g
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/fuse/fusepb/Fuse.iconset/icon_32x32.png
===================================================================
(Binary files differ)
Property changes on: trunk/fuse/fusepb/Fuse.iconset/icon_32x32.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/fuse/fusepb/Fuse.iconset/ico...@2x...g
===================================================================
(Binary files differ)
Property changes on: trunk/fuse/fusepb/Fuse.iconset/ico...@2x...g
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/fuse/fusepb/Fuse.iconset/icon_512x512.png
===================================================================
(Binary files differ)
Property changes on: trunk/fuse/fusepb/Fuse.iconset/icon_512x512.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/fuse/fusepb/Fuse.iconset/ico...@2x...g
===================================================================
(Binary files differ)
Property changes on: trunk/fuse/fusepb/Fuse.iconset/ico...@2x...g
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2012-11-23 11:18:15 UTC (rev 706)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2012-11-23 11:26:32 UTC (rev 707)
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ B6013812164692F5005FD3AE /* Fuse.iconset in Resources */ = {isa = PBXBuildFile; fileRef = B6013811164692F5005FD3AE /* Fuse.iconset */; };
B604B21B0DC182BE00981CC7 /* FuseGenerator.qlgenerator in CopyFiles */ = {isa = PBXBuildFile; fileRef = B61EEB950D1A917D006FEA80 /* FuseGenerator.qlgenerator */; };
B61159BF0EEE99D50029FEA3 /* Graphics_Filter.png in Resources */ = {isa = PBXBuildFile; fileRef = B61159BE0EEE99D50029FEA3 /* Graphics_Filter.png */; };
B61159C10EEE99E20029FEA3 /* Machine.png in Resources */ = {isa = PBXBuildFile; fileRef = B61159C00EEE99E20029FEA3 /* Machine.png */; };
@@ -16,6 +17,8 @@
B61159C90EEE9A140029FEA3 /* Select_ROMs.png in Resources */ = {isa = PBXBuildFile; fileRef = B61159C80EEE9A140029FEA3 /* Select_ROMs.png */; };
B61159CB0EEE9A1E0029FEA3 /* Sound.png in Resources */ = {isa = PBXBuildFile; fileRef = B61159CA0EEE9A1E0029FEA3 /* Sound.png */; };
B615BFE80B4261E50082D535 /* HIDJoysticks.m in Sources */ = {isa = PBXBuildFile; fileRef = B615BFE60B4261E50082D535 /* HIDJoysticks.m */; };
+ B61700F4163EAF8D00142336 /* PokeMemory.xib in Resources */ = {isa = PBXBuildFile; fileRef = B61700F3163EAF8D00142336 /* PokeMemory.xib */; };
+ B61700F7163EAFC600142336 /* PokeMemoryController.m in Sources */ = {isa = PBXBuildFile; fileRef = B61700F6163EAFC600142336 /* PokeMemoryController.m */; };
B61F459309121DF100C8096C /* Fuse Help in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6F905ED05CDA24300C2F10D /* Fuse Help */; };
B61F459409121DF100C8096C /* disk_plus3.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B650C3F2076596C700DE7E81 /* disk_plus3.szx */; };
B61F459509121DF100C8096C /* tape_16.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B650C3F4076596FD00DE7E81 /* tape_16.szx */; };
@@ -50,7 +53,6 @@
B61F462509121DF100C8096C /* tc2068-1.rom in Resources */ = {isa = PBXBuildFile; fileRef = B6FEA44C0444C2CC0013916D /* tc2068-1.rom */; };
B61F462909121DF100C8096C /* 48k.png in Resources */ = {isa = PBXBuildFile; fileRef = F56B6A6203A628A901CA65B5 /* 48k.png */; };
B61F462A09121DF100C8096C /* ts2068.png in Resources */ = {isa = PBXBuildFile; fileRef = B6C3479F044B091100E1BBA7 /* ts2068.png */; };
- B61F462B09121DF100C8096C /* Fuse.icns in Resources */ = {isa = PBXBuildFile; fileRef = F5F4333103903ED801E7A043 /* Fuse.icns */; };
B61F462C09121DF100C8096C /* dsk.icns in Resources */ = {isa = PBXBuildFile; fileRef = B643BB8D0403A0FD00A864FD /* dsk.icns */; };
B61F462D09121DF100C8096C /* scr.icns in Resources */ = {isa = PBXBuildFile; fileRef = B643BB900403A11B00A864FD /* scr.icns */; };
B61F462E09121DF100C8096C /* sna.icns in Resources */ = {isa = PBXBuildFile; fileRef = B643BB910403A11B00A864FD /* sna.icns */; };
@@ -378,6 +380,7 @@
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
+ B6013811164692F5005FD3AE /* Fuse.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; name = Fuse.iconset; path = ../Fuse.iconset; sourceTree = "<group>"; };
B6018479065A586900B0BE59 /* zxatasp.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = zxatasp.c; sourceTree = "<group>"; };
B601847A065A586900B0BE59 /* zxatasp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = zxatasp.h; sourceTree = "<group>"; };
B601847B065A586900B0BE59 /* zxcf.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = zxcf.c; sourceTree = "<group>"; };
@@ -396,6 +399,9 @@
B61159CA0EEE9A1E0029FEA3 /* Sound.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Sound.png; sourceTree = "<group>"; };
B615BFE50B4261E50082D535 /* HIDJoysticks.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = HIDJoysticks.h; path = content_arrays/HIDJoysticks.h; sourceTree = "<group>"; };
B615BFE60B4261E50082D535 /* HIDJoysticks.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = HIDJoysticks.m; path = content_arrays/HIDJoysticks.m; sourceTree = "<group>"; };
+ B61700F3163EAF8D00142336 /* PokeMemory.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PokeMemory.xib; sourceTree = "<group>"; };
+ B61700F5163EAFC600142336 /* PokeMemoryController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PokeMemoryController.h; path = controllers/PokeMemoryController.h; sourceTree = "<group>"; };
+ B61700F6163EAFC600142336 /* PokeMemoryController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PokeMemoryController.m; path = controllers/PokeMemoryController.m; sourceTree = "<group>"; };
B61EEB950D1A917D006FEA80 /* FuseGenerator.qlgenerator */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.bundle"; name = FuseGenerator.qlgenerator; path = ../../FuseGenerator/build/Release/FuseGenerator.qlgenerator; sourceTree = SOURCE_ROOT; };
B61F46A909121DF100C8096C /* Info-Fuse.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Fuse.plist"; sourceTree = "<group>"; };
B61F46AA09121DF200C8096C /* Fuse.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Fuse.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -754,7 +760,6 @@
F59B558F039FD8F901A804BA /* TapeBrowserController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TapeBrowserController.h; path = controllers/TapeBrowserController.h; sourceTree = SOURCE_ROOT; };
F59B5590039FD8F901A804BA /* TapeBrowserController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = TapeBrowserController.m; path = controllers/TapeBrowserController.m; sourceTree = SOURCE_ROOT; };
F5F291060396932B01730B00 /* Credits.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = Credits.html; sourceTree = "<group>"; };
- F5F4333103903ED801E7A043 /* Fuse.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Fuse.icns; sourceTree = "<group>"; };
F5F876370399540D011FA3A4 /* FuseController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FuseController.h; path = controllers/FuseController.h; sourceTree = SOURCE_ROOT; };
F5F876380399540D011FA3A4 /* FuseController.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; name = FuseController.m; path = controllers/FuseController.m; sourceTree = SOURCE_ROOT; tabWidth = 2; };
/* End PBXFileReference section */
@@ -950,6 +955,8 @@
B6D2989205B061CB00C2AA14 /* MemoryBrowserController.m */,
B62F3BCE059F5BF300A7009A /* PokeFinderController.h */,
B62F3BCF059F5BF300A7009A /* PokeFinderController.m */,
+ B61700F5163EAFC600142336 /* PokeMemoryController.h */,
+ B61700F6163EAFC600142336 /* PokeMemoryController.m */,
B650F73E07E7CD3F00E4F3AF /* PreferencesController.h */,
B650F73F07E7CD3F00E4F3AF /* PreferencesController.m */,
B63F9949077182B4004D6DFA /* RollbackController.h */,
@@ -971,7 +978,7 @@
B639B7670A6BAFCF00927E24 /* csw.icns */,
B6F0480E0952B597006D8005 /* dck.icns */,
B643BB8D0403A0FD00A864FD /* dsk.icns */,
- F5F4333103903ED801E7A043 /* Fuse.icns */,
+ B6013811164692F5005FD3AE /* Fuse.iconset */,
B61159BE0EEE99D50029FEA3 /* Graphics_Filter.png */,
B650986A09366C8F003AF1BF /* hdf.icns */,
B61159C00EEE99E20029FEA3 /* Machine.png */,
@@ -1041,6 +1048,7 @@
B665EE0F1052A3BD00FCFED8 /* LoadBinary.xib */,
B665EE121052A3DC00FCFED8 /* MemoryBrowser.xib */,
B665EE151052A40000FCFED8 /* PokeFinder.xib */,
+ B61700F3163EAF8D00142336 /* PokeMemory.xib */,
B665EE181052A41F00FCFED8 /* Preferences.xib */,
B665EE1B1052A43900FCFED8 /* Rollback.xib */,
B665EE1E1052A45200FCFED8 /* SaveBinary.xib */,
@@ -1541,7 +1549,6 @@
B61F462509121DF100C8096C /* tc2068-1.rom in Resources */,
B61F462909121DF100C8096C /* 48k.png in Resources */,
B61F462A09121DF100C8096C /* ts2068.png in Resources */,
- B61F462B09121DF100C8096C /* Fuse.icns in Resources */,
B61F463309121DF100C8096C /* blank.icns in Resources */,
B639B7680A6BAFCF00927E24 /* csw.icns in Resources */,
B6F0480F0952B597006D8005 /* dck.icns in Resources */,
@@ -1589,6 +1596,8 @@
B665EE251052A51B00FCFED8 /* TapeBrowser.xib in Resources */,
B665EE281052A53C00FCFED8 /* SavePanelAccessoryView.xib in Resources */,
B629532E114FB265007808E0 /* libspectrum.h.in in Resources */,
+ B61700F4163EAF8D00142336 /* PokeMemory.xib in Resources */,
+ B6013812164692F5005FD3AE /* Fuse.iconset in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1779,6 +1788,7 @@
B6E1F1B114F6555400600EB0 /* disciple.c in Sources */,
B6E1F1B414F6560500600EB0 /* tuntap.c in Sources */,
B6E1F24414F7A14200600EB0 /* enc28j60.c in Sources */,
+ B61700F7163EAFC600142336 /* PokeMemoryController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/fuse/fusepb/Info-Fuse.plist
===================================================================
--- trunk/fuse/fusepb/Info-Fuse.plist 2012-11-23 11:18:15 UTC (rev 706)
+++ trunk/fuse/fusepb/Info-Fuse.plist 2012-11-23 11:26:32 UTC (rev 707)
@@ -511,6 +511,23 @@
<string>net.sourceforge.projects.fuse-emulator.opu</string>
</array>
</dict>
+ <dict>
+ <key>CFBundleTypeExtensions</key>
+ <array>
+ <string>pok</string>
+ <string>POK</string>
+ </array>
+ <key>CFBundleTypeIconFile</key>
+ <string>blank</string>
+ <key>CFBundleTypeName</key>
+ <string>ZX Spectrum Poke File</string>
+ <key>CFBundleTypeRole</key>
+ <string>Viewer</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>net.sourceforge.projects.fuse-emulator.pok</string>
+ </array>
+ </dict>
</array>
<key>CFBundleExecutable</key>
<string>Fuse</string>
Modified: trunk/fuse/fusepb/controllers/FuseController.h
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.h 2012-11-23 11:18:15 UTC (rev 706)
+++ trunk/fuse/fusepb/controllers/FuseController.h 2012-11-23 11:26:32 UTC (rev 707)
@@ -33,6 +33,7 @@
@class MemoryBrowserController;
@class PreferencesController;
@class PokeFinderController;
+@class PokeMemoryController;
@class RollbackController;
@class SaveBinaryController;
@class TapeBrowserController;
@@ -67,6 +68,7 @@
MemoryBrowserController *memoryBrowserController;
PreferencesController *preferencesController;
PokeFinderController *pokeFinderController;
+ PokeMemoryController *pokeMemoryController;
RollbackController *rollbackController;
SaveBinaryController *saveBinaryController;
TapeBrowserController *tapeBrowserController;
@@ -143,6 +145,7 @@ |
